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

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 )
@@ -886,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 )
 
 
@@ -895,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 ##################
@@ -937,7 +937,7 @@ add_subdirectory( tdeui )
 add_subdirectory( tdesu )
 add_subdirectory( kjs )
 add_subdirectory( tdewallet )
-add_subdirectory( kio )
+add_subdirectory( tdeio )
 add_subdirectory( kded )
 
 # FIXME this directory/target doesn't exists
@@ -962,11 +962,11 @@ if( XRANDR_FOUND )
   add_subdirectory( tderandr )
 endif( XRANDR_FOUND )
 add_subdirectory( tdehtml )
-add_subdirectory( kcmshell )
+add_subdirectory( tdecmshell )
-add_subdirectory( kconf_update )
+add_subdirectory( tdeconf_update )
 add_subdirectory( kdewidgets )
 add_subdirectory( kimgio )
-add_subdirectory( kioslave )
+add_subdirectory( tdeioslave )
 add_subdirectory( kstyles )
 add_subdirectory( libtdemid )
 add_subdirectory( libtdescreensaver )
@@ -977,7 +977,7 @@ add_subdirectory( licenses )
 add_subdirectory( dnssd )
 add_subdirectory( pics )
 add_subdirectory( mimetypes )
-add_subdirectory( kfile-plugins )
+add_subdirectory( tdefile-plugins )
 
 
 ##### install import cmake modules ###############

KDE2PORTING.html

@@ -205,7 +205,7 @@ must have created a TDEApplication object before the methods can be used.<P>
   <TD COLSPAN="2">
     <PRE>
       #include &lt;kglobal.h&gt;
-      #include &lt;kconfig.h&gt;      // Needed to use TDEConfig
+      #include &lt;tdeconfig.h&gt;      // Needed to use TDEConfig
       #include &lt;klocale.h&gt;      // Needed to use KLocale
       #include &lt;kiconloader.h&gt;  // Needed to use KIconLoader
     </PRE>
@@ -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; TDEIO::NetAccess::download (tdelibs/kio/netaccess.h)</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::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/kio/krun.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 kio/job.h)<BR>
+<TR><TD>KFM::copy, KFM::move  </TD><TD>-&gt; TDEIO::Job (async, see tdeio/job.h)<BR>
-                            or TDEIO::NetAccess (sync, see kio/netaccess.h)</TD></TR>
+                            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>
 

KDE3PORTING.html

@@ -23,7 +23,7 @@ or <a href="http://doc.trolltech.com/3.0/porting.html">this page online</a>.<P>
 <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 KHTML</A></LI>
-<LI><A HREF="#kfile">Changes in kfile</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>
@@ -214,7 +214,7 @@ The preferred means of defining a shortcut, however, is to use <b>KAction</b>.
 <H4>KIconLoader, KIconTheme</H4>
 Methods now use KIcon::Group and KIcon::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 KIconLoader, KIconTheme and (in kio and tdefile) KMimeType, KService, KIconDialog, KIconButton,
 KURLBar and KURLBarItem.
 
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
@@ -416,7 +416,7 @@ 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, libtdesycoca, 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>
@@ -520,14 +520,14 @@ disable this use a #define KDE_NO_COMPAT.
 </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>
+<H3><A NAME="tdefile">Changes in tdefile</A></H3>
-The kfile-library, as used by the KFileDialog provides classes for directory browsing widgets.
+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
+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_KFILE instead of hardcoding -lkfile).
+library (there's no need to modify Makefiles which use $LIB_KFILE 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>

Mainpage.dox

@@ -20,8 +20,8 @@
 	* - <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="tdeio/html/index.html"><b>kio</b></a>
-        *   (<a target="_top" href="kio/kio/html/classes.html">classes</a>)\n
+        *   (<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="tdeparts/html/index.html"><b>tdeparts</b></a>

Makefile.am.in

@@ -27,7 +27,7 @@ COMPILE_BEFORE_kabc = kab tderesources
 COMPILE_BEFORE_kate = interfaces tdeutils
 COMPILE_BEFORE_tdemdi = tdeutils
 COMPILE_BEFORE_tdespell2 = tdeutils
-COMPILE_BEFORE_kcmshell = tdeutils
+COMPILE_BEFORE_tdecmshell = tdeutils
 COMPILE_BEFORE_kdewidgets = kabc tdehtml
 COMPILE_BEFORE_interfaces = arts kabc
 

README

@@ -42,7 +42,7 @@ Here is an alphabetical list:
 * tdecert
     Personal certification manager.
 
-* kconf_update
+* tdeconf_update
     Auto-Updater for config files.
 
 * tdecore
@@ -89,7 +89,7 @@ Here is an alphabetical list:
     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

TODO

@@ -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 libtdewalletclient part of libkio and get rid of libtdewalletclient.
+- 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
@@ -215,7 +215,7 @@ an alternative help->contents action)
 - 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

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}/tdeio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${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}
 )

arts/kde/kioinputstream_impl.cpp

@@ -31,9 +31,9 @@
 
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
-#include <kio/kmimetype.h>
+#include <tdeio/kmimetype.h>
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 #include <tqtimer.h>
 #include <tqdatastream.h>
 #include "artsversion.h"

arts/kde/kioinputstream_impl.h

@@ -24,7 +24,7 @@
 
 #include <tqobject.h>
 #include <tqcstring.h>
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 #include <kurl.h>
 #include "artskde.h"
 #include "stdsynthmodule.h" 

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"

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;
 

arts/knotify/knotify.cpp

@@ -50,7 +50,7 @@
 #include <kartsserver.h>
 #endif
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>

configure.in.in

@@ -252,9 +252,9 @@ AC_SUBST(LIB_KAB, '$(top_builddir)/kab/libkab.la')
 AC_SUBST(LIB_KABC, '$(top_builddir)/kabc/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_KIO, '$(top_builddir)/tdeio/libtdeio.la')
-AC_SUBST(LIB_KFILE, '$(top_builddir)/kio/libkio.la')
+AC_SUBST(LIB_KFILE, '$(top_builddir)/tdeio/libtdeio.la')
-AC_SUBST(LIB_KSYCOCA, '$(top_builddir)/kio/libkio.la')
+AC_SUBST(LIB_KSYCOCA, '$(top_builddir)/tdeio/libtdeio.la')
 AC_SUBST(LIB_KHTML, '$(top_builddir)/tdehtml/libtdehtml.la')
 AC_SUBST(LIB_TDEPRINT, '$(top_builddir)/tdeprint/libtdeprint.la')
 AC_SUBST(LIB_KPARTS, '$(top_builddir)/tdeparts/libtdeparts.la')
@@ -308,7 +308,7 @@ 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(KCONFIG_COMPILER, '$(top_builddir)/tdecore/tdeconfig_compiler/tdeconfig_compiler')
 
 ac_save_LIBS="$LIBS"
 LIBS="$LIBS $X_LDFLAGS -lICE"

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"

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;

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 {

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/;
 		}

dnssd/CMakeLists.txt

@@ -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}
 )

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>

interfaces/kio/CMakeLists.txt

@@ -13,5 +13,5 @@
 
 install( FILES
     http.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/kio )
+  DESTINATION ${INCLUDE_INSTALL_DIR}/tdeio )
 

interfaces/kio/Makefile.am

@@ -1,3 +1,3 @@
-kioincludedir = $(includedir)/kio
+kioincludedir = $(includedir)/tdeio
 kioinclude_HEADERS = http.h
 

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
 

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(
@@ -45,7 +45,7 @@ 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}
   DEPENDENCIES dcopidl
 )

interfaces/tdemediaplayer/CMakeLists.txt

@@ -10,7 +10,7 @@
 #################################################
 
 if( ARTS_FOUND )
-  add_subdirectory( kfileaudiopreview )
+  add_subdirectory( tdefileaudiopreview )
 endif( ARTS_FOUND )
 
 include_directories(

interfaces/tdemediaplayer/Makefile.am

@@ -1,8 +1,8 @@
 if include_ARTS
-kfileaudiopreview_subdir = kfileaudiopreview
+tdefileaudiopreview_subdir = tdefileaudiopreview
 endif
 
-SUBDIRS = . $(kfileaudiopreview_subdir)
+SUBDIRS = . $(tdefileaudiopreview_subdir)
 INCLUDES = -I$(srcdir)/.. $(all_includes)
 
 lib_LTLIBRARIES = libtdemediaplayer.la

interfaces/tdemediaplayer/kfileaudiopreview/Makefile.am

@@ -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/tdemediaplayer/libtdemediaplayer.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

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}/tdeio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
-  ${CMAKE_SOURCE_DIR}/kio/kfile
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
   ${CMAKE_SOURCE_DIR}/arts/kde
 )
 
@@ -31,12 +31,12 @@ link_directories(
 )
 
 
-##### kfileaudiopreview #########################
+##### tdefileaudiopreview #########################
 
-set( target kfileaudiopreview )
+set( target tdefileaudiopreview )
 
 set( ${target}_SRCS
-  kfileaudiopreview.cpp
+  tdefileaudiopreview.cpp
 )
 
 tde_add_kpart( ${target} AUTOMOC

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

interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp

@@ -1,4 +1,4 @@
-#include "kfileaudiopreview.h"
+#include "tdefileaudiopreview.h"
 
 #include <tqcheckbox.h>
 #include <tqhbox.h>
@@ -6,7 +6,7 @@
 #include <tqvgroupbox.h>
 
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klibloader.h>
 #include <klocale.h>
 #include <tdemediaplayer/player.h>
@@ -15,7 +15,7 @@
 
 #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 )
 {
-    TDEGlobal::locale()->insertCatalogue("kfileaudiopreview");    
+    TDEGlobal::locale()->insertCatalogue("tdefileaudiopreview");    
 
     TQStringList formats = KDE::PlayObjectFactory::mimeTypes();
     // ###
@@ -143,4 +143,4 @@ void KFileAudioPreview::toggleAuto( bool on )
 void KFileAudioPreview::virtual_hook( int, void* )
 {}
 
-#include "kfileaudiopreview.moc"
+#include "tdefileaudiopreview.moc"

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}/tdeio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
 )
 
 link_directories(
@@ -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}
 )

interfaces/tdescript/Makefile.am

@@ -1,6 +1,6 @@
 SUBDIRS = . sample
 
-INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir) -I$(srcdir) -I$(srcdir)/.. $(all_includes)
+INCLUDES = -I$(top_srcdir)/tdeio -I$(top_srcdir) -I$(srcdir) -I$(srcdir)/.. $(all_includes)
 
 #lib_LTLIBRARIES = libtdescriptloader.la libtdescript.la
 lib_LTLIBRARIES = libtdescript.la

interfaces/tdescript/sample/Makefile.am

@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir)/interfaces -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/interfaces/tdescript $(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
 

interfaces/tdescript/scriptloader.cpp

@@ -23,7 +23,7 @@
 #include <tdeparts/componentfactory.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdesktopfile.h>
 #include <kstandarsdirs.h>
 #include <kstdaccel.h>

interfaces/tdetexteditor/CMakeLists.txt

@@ -20,8 +20,8 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
   ${CMAKE_SOURCE_DIR}/kabc
   ${CMAKE_SOURCE_DIR}/interfaces
 )

interfaces/tdetexteditor/Makefile.am

@@ -1,4 +1,4 @@
-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)/kabc -I$(top_builddir)/kabc $(all_includes)
 
 lib_LTLIBRARIES = libtdetexteditor.la
 

interfaces/tdetexteditor/configinterface.h

@@ -57,7 +57,7 @@ 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 (TDEConfig *) = 0;

interfaces/tdetexteditor/editorchooser.cpp

@@ -3,7 +3,7 @@
 
 #include <tqcombobox.h>
 #include <ktrader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqstringlist.h>
 #include <kservice.h>
 #include <klocale.h>

kabc/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}/tdeio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
   ${CMAKE_SOURCE_DIR}/kab
 )
 
@@ -58,7 +58,7 @@ install( FILES
 
 ##### other data ################################
 
-install( FILES kab2kabc.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
+install( FILES tdeab2tdeabc.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
 install( FILES kabc_manager.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources )
 install( FILES countrytransl.map DESTINATION ${DATA_INSTALL_DIR}/kabc )
 
@@ -102,18 +102,18 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 1.2.0
-  LINK vcards-static vcard-shared kio-shared tderesources-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}

kabc/Makefile.am

@@ -50,13 +50,13 @@ 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) -ltdetexteditor
+tdeab2tdeabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kab2kabc_LDADD = libkabc.la ../kab/libkab.la
+tdeab2tdeabc_LDADD = libkabc.la ../kab/libkab.la
-kab2kabc_SOURCES = kab2kabc.cpp
+tdeab2tdeabc_SOURCES = tdeab2tdeabc.cpp
 
-autostart_DATA = kab2kabc.desktop
+autostart_DATA = tdeab2tdeabc.desktop
 autostartdir = $(datadir)/autostart
 
 manager_DATA = kabc_manager.desktop

kabc/addresseehelper.cpp

@@ -19,7 +19,7 @@
 
 #include <tqapplication.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 
 #include "addresseehelper.h"

kabc/addresslineedit.cpp

@@ -33,7 +33,7 @@
 #include <tqdragobject.h>
 
 #include <kcompletionbox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcursor.h>
 #include <kstandarddirs.h>
 #include <kstaticdeleter.h>

kabc/formatfactory.h

@@ -24,7 +24,7 @@
 #include <tqdict.h>
 #include <tqstring.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klibloader.h>
 
 #include "formatplugin.h"

kabc/formats/CMakeLists.txt

@@ -18,8 +18,8 @@ include_directories(
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
-  ${CMAKE_SOURCE_DIR}/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
 )
 
 link_directories(

kabc/ldapclient.cpp

@@ -30,7 +30,7 @@
 #include <tqurl.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kmdcodec.h>
 #include <kprotocolinfo.h>

kabc/ldapclient.h

@@ -31,7 +31,7 @@
 #include <tqguardedptr.h>
 #include <tqtimer.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 namespace KABC {
 

kabc/ldapconfigwidget.h

@@ -27,7 +27,7 @@
 
 #include <kabc/ldapurl.h>
 #include <kabc/ldif.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 class TQGridLayout;
 class TQSpinBox;

kabc/plugins/dir/CMakeLists.txt

@@ -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}/tdeio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
-  ${CMAKE_SOURCE_DIR}/kio/kfile
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
 )
 
 link_directories(

kabc/plugins/dir/resourcedir.cpp

@@ -29,7 +29,7 @@
 #include <tqwidget.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <kglobal.h>

kabc/plugins/dir/resourcedir.h

@@ -21,7 +21,7 @@
 #ifndef KABC_RESOURCEDIR_H
 #define KABC_RESOURCEDIR_H
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdirwatch.h>
 
 #include <sys/types.h>

kabc/plugins/file/CMakeLists.txt

@@ -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}/tdeio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
-  ${CMAKE_SOURCE_DIR}/kio/kfile
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
 )
 
 link_directories(

kabc/plugins/file/resourcefile.cpp

@@ -30,9 +30,9 @@
 #include <tqtimer.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <kio/scheduler.h>
+#include <tdeio/scheduler.h>
 #include <klocale.h>
 #include <ksavefile.h>
 #include <kstandarddirs.h>

kabc/plugins/file/resourcefile.h

@@ -21,7 +21,7 @@
 #ifndef KABC_RESOURCEFILE_H
 #define KABC_RESOURCEFILE_H
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdirwatch.h>
 
 #include <sys/types.h>

kabc/plugins/ldapkio/CMakeLists.txt

@@ -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}/tdeio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
-  ${CMAKE_SOURCE_DIR}/kio/kfiles
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefiles
 )
 
 link_directories(
@@ -68,6 +68,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target}
   SOURCES ${${target}_SRCS}
-  LINK kabc_ldapkio-shared
+  LINK kabc_ldaptdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

kabc/plugins/ldapkio/resourceldapkio.cpp

@@ -29,12 +29,12 @@
 #include <kstandarddirs.h>
 #include <klineedit.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstringhandler.h>
 #include <ktempfile.h>
 
 #include <stdlib.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kabc/ldif.h>
 #include <kabc/ldapurl.h>
 

kabc/plugins/ldapkio/resourceldapkio.h

@@ -24,7 +24,7 @@
 
 #include <kabc/resource.h>
 #include <kabc/ldif.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 class TDEConfig;
 

kabc/plugins/ldapkio/resourceldapkioconfig.cpp

@@ -36,7 +36,7 @@
 #include <klocale.h>
 #include <klineedit.h>
 #include <kmessagebox.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include "resourceldapkio.h"
 

kabc/plugins/net/CMakeLists.txt

@@ -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}/tdeio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
-  ${CMAKE_SOURCE_DIR}/kio/kfile
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
 )
 
 link_directories(

kabc/plugins/net/resourcenet.cpp

@@ -21,8 +21,8 @@
 #include <tqfile.h>
 
 #include <kdebug.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
-#include <kio/scheduler.h>
+#include <tdeio/scheduler.h>
 #include <klocale.h>
 #include <ksavefile.h>
 #include <ktempfile.h>

kabc/plugins/net/resourcenet.h

@@ -21,7 +21,7 @@
 #ifndef KABC_RESOURCENET_H
 #define KABC_RESOURCENET_H
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <sys/types.h>
 

kabc/plugins/sql/resourcesql.h

@@ -21,7 +21,7 @@
 #ifndef KABC_RESOURCESQL_H
 #define KABC_RESOURCESQL_H
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "addressbook.h"
 #include "resource.h"

kabc/scripts/field.src.cpp

@@ -19,7 +19,7 @@
 */
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 
 #include "field.h"

kabc/tdeab2tdeabc.cpp

@@ -25,7 +25,7 @@
 #include <kaboutdata.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
@@ -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,7 +432,7 @@ void importKab( KABC::AddressBook *ab, bool override, bool quiet )
 
 int main( int argc, char **argv )
 {
-  TDEAboutData 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" );
 
   TDECmdLineArgs::init( argc, argv, &aboutData );

kabc/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
+Name[zu]=i-tdeab2tdeabc
-Exec=kab2kabc --disable-autostart --quiet
+Exec=tdeab2tdeabc --disable-autostart --quiet
 Icon=misc
 Type=Application
 Comment=libkab to libkabc conversion tool.
@@ -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;

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>

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>

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>

kate/interfaces/katecmd.cpp

@@ -118,7 +118,7 @@ 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>
 */

kate/part/CMakeLists.txt

@@ -21,9 +21,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdefx
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
-  ${CMAKE_SOURCE_DIR}/kio/kfile
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
   ${CMAKE_SOURCE_DIR}/kjs
   ${CMAKE_SOURCE_DIR}/tdeutils
   ${CMAKE_SOURCE_DIR}/tdeprint

kate/part/kateconfig.cpp

@@ -28,7 +28,7 @@
 #include <math.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobalsettings.h>
 #include <kcharsets.h>
 #include <klocale.h>

kate/part/katedialogs.cpp

@@ -38,9 +38,9 @@
 #include <tdetexteditor/configinterfaceextension.h>
 #include <tdetexteditor/plugin.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <kaccel.h>
 #include <kapplication.h>
@@ -50,7 +50,7 @@
 #include <kcolorcombo.h>
 #include <kcolordialog.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kfontdialog.h>
 #include <kglobal.h>

kate/part/katedocument.cpp

@@ -42,9 +42,9 @@
 #include "katetemplatehandler.h"
 #include <tdetexteditor/plugin.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
-#include <kio/kfileitem.h>
+#include <tdeio/tdefileitem.h>
 
 
 #include <tdeparts/event.h>
@@ -53,8 +53,8 @@
 #include <kglobal.h>
 #include <kapplication.h>
 #include <kpopupmenu.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <kstdaction.h>
 #include <kiconloader.h>
@@ -1924,13 +1924,13 @@ void KateDocument::writeConfig()
   config->sync();
 }
 
-void KateDocument::readSessionConfig(TDEConfig *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(TDEConfig *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(TDEConfig *kconfig)
+void KateDocument::writeSessionConfig(TDEConfig *tdeconfig)
 {
   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(TDEConfig *kconfig)
        ++it )
      marks << it.current()->line;
 
-  kconfig->writeEntry( "Bookmarks", marks );
+  tdeconfig->writeEntry( "Bookmarks", marks );
 }
 
 void KateDocument::configDialog()

kate/part/katefiletype.cpp

@@ -25,7 +25,7 @@
 #include "kateview.h"
 #include "katefactory.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmimemagic.h>
 #include <kmimetype.h>
 #include <kmimetypechooser.h>

kate/part/katehighlight.cpp

@@ -32,7 +32,7 @@
 #include "kateschema.h"
 #include "kateconfig.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kinstance.h>
 #include <kmimetype.h>

kate/part/katehighlight.h

@@ -26,7 +26,7 @@
 
 #include "../interfaces/document.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqptrlist.h>
 #include <tqvaluelist.h>

kate/part/katejscript.cpp

@@ -37,7 +37,7 @@
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <kjs/function_object.h>
 #include <kjs/interpreter.h>
@@ -688,7 +688,7 @@ void KateJScriptManager::collectScripts (bool force)
         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())
         {

kate/part/kateluaindentscript.cpp

@@ -31,7 +31,7 @@
 #include <tqfileinfo.h>
 #include <kstandarddirs.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
 

kate/part/kateschema.h

@@ -29,7 +29,7 @@
 #include <tqlistview.h>
 #include <tqfont.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kaction.h>
 
 class KateView;
@@ -53,7 +53,7 @@ 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
      */
     TDEConfig *schema (uint number);
 

kate/part/katesyntaxdocument.cpp

@@ -27,7 +27,7 @@
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqfile.h>
 

kate/part/kateview.cpp

@@ -50,9 +50,9 @@
 
 #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>

kate/part/test_regression.cpp

@@ -42,7 +42,7 @@
 #include <kaction.h>
 #include <kcmdlineargs.h>
 #include "katefactory.h"
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kmainwindow.h>
 #include <ksimpleconfig.h>
 #include <kglobalsettings.h>

kate/plugins/autobookmarker/autobookmarker.cpp

@@ -30,7 +30,7 @@
 
 #include <kaction.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kgenericfactory.h>
 #include <kiconloader.h>
 #include <klistview.h>

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}/tdeio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
-  ${CMAKE_SOURCE_DIR}/kio/kfile
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
   ${CMAKE_SOURCE_DIR}/interfaces
 )
 

kate/plugins/insertfile/insertfileplugin.cpp

@@ -24,9 +24,9 @@
 #include <tdetexteditor/editinterface.h>
 
 #include <assert.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kaction.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kgenericfactory.h>
 #include <klocale.h>
 #include <kmessagebox.h>

kate/plugins/isearch/ISearchPlugin.cpp

@@ -24,7 +24,7 @@
 #include <klocale.h>
 #include <kaction.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include "ISearchPlugin.h"

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}/tdeio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
   ${CMAKE_SOURCE_DIR}/interfaces
 )
 

kate/plugins/wordcompletion/docwordcompletion.cpp

@@ -34,7 +34,7 @@
 #include <tdetexteditor/variableinterface.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 #include <kgenericfactory.h>
 #include <klocale.h>

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}/tdeio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${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}
 )

kded/DESIGN

@@ -6,9 +6,9 @@ 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

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
+tdebuildsycoca_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kbuildsycoca_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE)
+tdebuildsycoca_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE)
-kbuildsycoca_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp \
+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) -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) -ltdetexteditor
+tdemimelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kmimelist_LDADD = ../kio/libkio.la
+tdemimelist_LDADD = ../tdeio/libtdeio.la
-kmimelist_SOURCES = kmimelist.cpp
+tdemimelist_SOURCES = tdemimelist.cpp
 
 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
 

kded/README.kded

@@ -7,19 +7,19 @@ Some of these tasks are built in, others are started on demand.
 Built in tasks
 ==============
 *) Checking for newly installed software and updating tdesycoca when new
-software is detected. Updating of tdesycoca is done by the program kbuildsycoca
+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 tdesycoca 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 
+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 kconf_update to
+new update file. When kded is first started it always runs tdeconf_update to
-ensure that it has not missed any update files. kconf_update keeps track
+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
@@ -42,12 +42,12 @@ and has a default of 5000 (5 seconds).
 CheckSycoca: This option can be used to disable checking for new software.
 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 kbuildsycoca program.
+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".
 

kded/kded.cpp

@@ -45,7 +45,7 @@
 #include <kdirwatch.h>
 #include <kstandarddirs.h>
 #include <kdatastream.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kservicetype.h>
 
 #ifdef Q_WS_X11
@@ -65,27 +65,27 @@ static void runBuildSycoca(TQObject *callBackObj=0, const char *callBackSlot=0)
    if(checkStamps)
       args.append("--checkstamps");
    if(delayedCheck)
-      args.append("--nocheckfiles");
+      args.append("--nochectdefiles");
    else
       checkStamps = false; // useful only during kded startup
    if (callBackObj)
    {
       TQByteArray data;
       TQDataStream dataStream( data, IO_WriteOnly );
-      dataStream << TQString("kbuildsycoca") << args;
+      dataStream << TQString("tdebuildsycoca") << args;
       TQCString _launcher = TDEApplication::launcher();
 
       kapp->dcopClient()->callAsync(_launcher, _launcher, "tdeinit_exec_wait(TQString,TQStringList)", data, callBackObj, callBackSlot);
    }
    else
    {
-      TDEApplication::tdeinitExecWait( "kbuildsycoca", args );
+      TDEApplication::tdeinitExecWait( "tdebuildsycoca", args );
    }
 }
 
 static void runKonfUpdate()
 {
-   TDEApplication::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)
@@ -97,7 +97,7 @@ static void runDontChangeHostname(const TQCString &oldName, const TQCString &new
 }
 
 Kded::Kded(bool checkUpdates, bool new_startup)
-  : DCOPObject("kbuildsycoca"), DCOPObjectProxy(),
+  : DCOPObject("tdebuildsycoca"), DCOPObjectProxy(),
     b_checkUpdates(checkUpdates),
     m_needDelayedCheck(false),
     m_newStartup( new_startup )
@@ -665,7 +665,7 @@ KUpdateD::KUpdateD()
     TQObject::connect( m_pDirWatch, TQT_SIGNAL(dirty(const TQString&)),
            this, TQT_SLOT(slotNewUpdateFile()));
 
-    TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "kconf_update");
+    TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "tdeconf_update");
     for( TQStringList::ConstIterator it = dirs.begin();
          it != dirs.end();
          ++it )
@@ -957,7 +957,7 @@ 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;

kded/kded.h

@@ -37,7 +37,7 @@
 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

kded/kdedmodule.cpp

@@ -24,7 +24,7 @@
 
 #include "kded.h"
 #include "kdedmodule.h"
-#include "kconfigdata.h"
+#include "tdeconfigdata.h"
 
 typedef TQMap<KEntryKey, KSharedPtr<KShared> > KDEDObjectMap;
 

kded/tde-menu.cpp

@@ -42,7 +42,7 @@ static KCmdLineOptions options[] = {
    KCmdLineLastOption
 };
 
-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);
 }
 
@@ -113,7 +113,7 @@ int main(int argc, char **argv)
    "The --highlight option can be used to visually indicate to the user where\n"
    "in the TDE menu a specific application is located.");
    
-   TDEAboutData d(appName, I18N_NOOP("kde-menu"), appVersion,
+   TDEAboutData d(appName, I18N_NOOP("tde-menu"), appVersion,
                 description,
                 TDEAboutData::License_GPL, "(c) 2003 Waldo Bastian");
    d.addAuthor("Waldo Bastian", I18N_NOOP("Author"), "bastian@kde.org");
@@ -146,11 +146,11 @@ int main(int argc, char **argv)
       TQStringList args;
       args.append("--incremental");
       args.append("--checkstamps");
-      TQString command = "kbuildsycoca";
+      TQString command = "tdebuildsycoca";
       TQCString _launcher = TDEApplication::launcher();
       if (!DCOPRef(_launcher, _launcher).call("tdeinit_exec_wait", command, args).isValid())
       {
-         tqWarning("Can't talk to klauncher!");
+         tqWarning("Can't talk to tdelauncher!");
          command = TDEGlobal::dirs()->findExe(command);
          command += " " + args.join(" ");
          system(command.local8Bit());

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"
 
@@ -53,7 +53,7 @@
 #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>
   bool silent;
@@ -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
@@ -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, "[tdebuildsycoca] ERROR writing database '%s'!\n", database->name().local8Bit().data());
-      fprintf(stderr, "[kbuildsycoca] Disk full?\n");
+      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;
     }
@@ -695,7 +695,7 @@ static KCmdLineOptions 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 },
-   { "nocheckfiles", I18N_NOOP("Disable checking files (dangerous)"), 0 },
+   { "nochectdefiles", I18N_NOOP("Disable checking files (dangerous)"), 0 },
    { "global", I18N_NOOP("Create global database"), 0 },
    { "menutest", I18N_NOOP("Perform menu generation test run only"), 0 },
    { "track <menu-id>", I18N_NOOP("Track menu id for debug purposes"), 0 },
@@ -706,7 +706,7 @@ static KCmdLineOptions options[] = {
    KCmdLineLastOption
 };
 
-static const char appName[] = "kbuildsycoca";
+static const char appName[] = "tdebuildsycoca";
 static const char appVersion[] = "1.1";
 
 class WaitForSignal : public QObject
@@ -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,12 +796,12 @@ 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");
+   bool chectdefiles = bGlobalDatabase || args->isSet("chectdefiles");
 
-   bool incremental = !bGlobalDatabase && args->isSet("incremental") && checkfiles;
+   bool incremental = !bGlobalDatabase && args->isSet("incremental") && chectdefiles;
-   if (incremental || !checkfiles)
+   if (incremental || !chectdefiles)
    {
      KSycoca::self()->disableAutoRebuild(); // Prevent deadlock
      TQString current_language = TDEGlobal::locale()->language();
@@ -814,14 +814,14 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
          (KSycoca::self()->timeStamp() == 0))
      {
         incremental = false;
-        checkfiles = true;
+        chectdefiles = true;
         delete KSycoca::self();
      }
    }
 
    g_changeList = new TQStringList;
 
-   bool checkstamps = incremental && args->isSet("checkstamps") && checkfiles;
+   bool checkstamps = incremental && args->isSet("checkstamps") && chectdefiles;
    TQ_UINT32 filestamp = 0;
    TQStringList oldresourcedirs;
    if( checkstamps && incremental )
@@ -861,7 +861,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
 
    newTimestamp = (TQ_UINT32) time(0);
 
-   if( checkfiles && ( !checkstamps || !KBuildSycoca::checkTimestamps( filestamp, oldresourcedirs )))
+   if( chectdefiles && ( !checkstamps || !KBuildSycoca::checkTimestamps( filestamp, oldresourcedirs )))
    {
       TQCString qSycocaPath = TQFile::encodeName(sycocaPath());
       cSycocaPath = qSycocaPath.data();
@@ -870,7 +870,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
       g_ctimeDict = 0;
       if (incremental)
       {
-         tqWarning("[kbuildsycoca] Reusing existing tdesycoca.");
+         tqWarning("[tdebuildsycoca] Reusing existing tdesycoca.");
          KSycoca *oldSycoca = KSycoca::self();
          KSycocaFactoryList *factories = new KSycocaFactoryList;
          g_allEntries = new KSycocaEntryListList;
@@ -950,10 +950,10 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
 #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"

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__
+#ifndef __tdebuildsycoca_h__
-#define __kbuildsycoca_h__ 
+#define __tdebuildsycoca_h__ 
 
 #include <sys/stat.h>
 
@@ -34,7 +34,7 @@
 
 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

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}/tdeio
-  ${CMAKE_SOURCE_DIR}/kio/kfile
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
 )
 
 link_directories(

kdewidgets/Makefile.am

@@ -21,7 +21,7 @@
 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

kdewidgets/makekdewidgets.cpp

@@ -2,7 +2,7 @@
 #include <kaboutdata.h>
 #include <kinstance.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmacroexpander.h>
 #include <kdebug.h>
 

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}/tdeio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
-  ${CMAKE_SOURCE_DIR}/kioslave
+  ${CMAKE_SOURCE_DIR}/tdeioslave
   ${LIBXML2_INCLUDE_DIRS}
   ${LIBXSLT_INCLUDE_DIRS}
 )
@@ -54,7 +54,7 @@ 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
 )
 
 
@@ -68,7 +68,7 @@ set( ${target}_SRCS
 
 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}
 )
 
@@ -83,7 +83,7 @@ set( ${target}_SRCS
 
 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}
 )

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
@@ -38,10 +38,10 @@ METASOURCES = AUTO
 
 update_DATA = kio_help.upd
 update_SCRIPTS = move_kio_help_cache.sh
-updatedir = $(kde_datadir)/kconf_update
+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
 

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

kdoctools/kio_help.h

@@ -15,8 +15,8 @@
 #include <tqvaluelist.h>
 
 
-#include <kio/global.h>
+#include <tdeio/global.h>
-#include <kio/slavebase.h>
+#include <tdeio/slavebase.h>
 
 class HelpProtocol : public TDEIO::SlaveBase
 {

kdoctools/kio_help.upd

@@ -1,3 +1,3 @@
-# Move kio_help cache from $TDEHOME/share/apps/kio_help/cache to $TDEHOME/cache-$HOST/kio_help
+# Move kio_help cache from $TDEHOME/share/apps/tdeio_help/cache to $TDEHOME/cache-$HOST/tdeio_help
 Id=trinity_2
 Script=move_kio_help_cache.sh,sh

kdoctools/move_kio_help_cache.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-bas=`tde-config --localprefix`share/apps/kio_help
+bas=`tde-config --localprefix`share/apps/tdeio_help
 mv "$bas/cache" "`tde-config --path cache`kio_help"
 rmdir "$bas"
 exit 0

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 \

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.

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}/tdeio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
   ${FREETYPE_INCLUDE_DIRS}
 )
 
@@ -94,34 +94,34 @@ tde_add_executable( ${target}
 )
 
 
-#### kioslave ###################################
+#### tdeioslave ###################################
 
-set( target kioslave )
+set( target tdeioslave )
 
 tde_add_executable( ${target} AUTOMOC
-  SOURCES kioslave.cpp
+  SOURCES tdeioslave.cpp
-  LINK ltdlc-static kio-shared
+  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
 )

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 \
+bin_PROGRAMS = tdeinit tdeinit_wrapper kshell tdeinit_shutdown lnusertemp kwrapper tdeioslave \
-               kstartupconfig kdostartupconfig start_tdeinit start_tdeinit_wrapper
+               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
+tdeioslave_SOURCES = tdeioslave.cpp
-kioslave_LDFLAGS = $(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) \
+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
+tdelauncher_la_LDFLAGS = $(all_libraries) -module -avoid-version
-klauncher_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
+tdelauncher_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_SOURCES = tdelauncher.cpp tdelauncher_main.cpp autostart.cpp
 
-kstartupconfig_SOURCES  = kstartupconfig.cpp
+tdestartupconfig_SOURCES  = tdestartupconfig.cpp
-kstartupconfig_LDADD  = $(top_builddir)/tdecore/libtdefakes.la $(LIB_QT)
+tdestartupconfig_LDADD  = $(top_builddir)/tdecore/libtdefakes.la $(LIB_QT)
-kdostartupconfig_SOURCES = kdostartupconfig.cpp
+tdedostartupconfig_SOURCES = tdedostartupconfig.cpp
-kdostartupconfig_LDFLAGS = $(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) \
+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
 

kinit/autostart.cpp

@@ -22,7 +22,7 @@
 
 #include "autostart.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdesktopfile.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>

kinit/kinit.cpp

@@ -55,7 +55,7 @@
 #include <kinstance.h>
 #include <kstandarddirs.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klibloader.h>
 #include <kapplication.h>
 #include <klocale.h>
@@ -74,7 +74,7 @@
 #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
@@ -169,9 +169,9 @@ int tdeinit_x_errhandler( Display *, XErrorEvent *err );
 /* 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 libkio even if 'smart' linker is used */
+/* These are to link libtdeio even if 'smart' linker is used */
-#include <kio/authinfo.h>
+#include <tdeio/authinfo.h>
-extern "C" TDEIO::AuthInfo* _kioslave_init_kio() { return new TDEIO::AuthInfo(); }
+extern "C" TDEIO::AuthInfo* _tdeioslave_init_kio() { return new TDEIO::AuthInfo(); }
 
 /*
  * Close fd's which are only useful for the parent process.
@@ -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) {
+  if (strcmp(_name, "tdelauncher") == 0) {
-     /* klauncher is launched in a special way:
+     /* 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))
@@ -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));
@@ -1090,7 +1090,7 @@ 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);
 #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)
+      if (strcmp(safe_argv[i], "--no-tdelauncher") == 0)
-         launch_klauncher = 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
    {
@@ -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);
 #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

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()
     {
-    TDEInstance inst( "kdostartupconfig" );
+    TDEInstance inst( "tdedostartupconfig" );
-    kdDebug() << "Running kdostartupconfig." << endl;
+    kdDebug() << "Running tdedostartupconfig." << endl;
     TQString keysname = locateLocal( "config", "startupconfigkeys" );
     TQFile keys( keysname );
     if( !keys.open( IO_ReadOnly ))

kinit/tdeioslave.cpp

@@ -47,15 +47,15 @@
 # endif
 #endif
 
-/* These are to link libkio even if 'smart' linker is used */
+/* These are to link libtdeio even if 'smart' linker is used */
-#include <kio/authinfo.h>
+#include <tdeio/authinfo.h>
-extern "C" TDEIO::AuthInfo* _kioslave_init_kio() { return new TDEIO::AuthInfo(); }
+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];     

kinit/tdelauncher.cpp

@@ -29,7 +29,7 @@
 
 #include <tqfile.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klibloader.h>
 #include <klocale.h>
@@ -45,12 +45,12 @@
 #endif
 
 
-#include "kio/global.h"
+#include "tdeio/global.h"
-#include "kio/connection.h"
+#include "tdeio/connection.h"
-#include "kio/slaveinterface.h"
+#include "tdeio/slaveinterface.h"
 
-#include "klauncher.h"
+#include "tdelauncher.h"
-#include "klauncher_cmds.h"
+#include "tdelauncher_cmds.h"
 
 //#if defined Q_WS_X11 && ! defined K_WS_QTONLY
 #ifdef Q_WS_X11
@@ -165,7 +165,7 @@ IdleSlave::age(time_t now)
 KLauncher::KLauncher(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("klauncher"),
+    DCOPObject("tdelauncher"),
     tdeinitSocket(_tdeinitSocket), mAutoStart( new_startup ),
     dontBlockReading(false), newStartup( new_startup )
 {
@@ -181,7 +181,7 @@ 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)
    {
@@ -218,7 +218,7 @@ 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));
@@ -410,7 +410,7 @@ 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;
+      tdelauncher_header request_header;
       request_header.cmd = LAUNCHER_TERMINATE_KDE;
       request_header.arg_length = 0;
       write(tdeinitSocket, &request_header, sizeof(request_header));
@@ -485,7 +485,7 @@ void KLauncher::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);
@@ -524,7 +524,7 @@ read_socket(int sock, char *buffer, int len)
 void
 KLauncher::slotKDEInitData(int)
 {
-   klauncher_header request_header;
+   tdelauncher_header request_header;
    TQByteArray requestData;
    if( dontBlockReading )
    {
@@ -792,7 +792,7 @@ KLauncher::requestStart(KLaunchRequest *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
@@ -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 ));
@@ -1295,7 +1295,7 @@ KLauncher::requestSlave(const TQString &protocol,
 //    kdDebug(7016) << "KLauncher: 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);
@@ -1418,4 +1418,4 @@ KLauncher::idleTimeout()
     }
 }
 
-#include "klauncher.moc"
+#include "tdelauncher.moc"

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>

kinit/tdelauncher_cmds.h

@@ -24,7 +24,7 @@ typedef struct
 {
    long cmd;
    long arg_length;
-} klauncher_header;
+} tdelauncher_header;
 
 /* Launcher commands: */
 

kinit/tdelauncher_main.cpp

@@ -23,7 +23,7 @@
 #include <fcntl.h>
 
 #include "kapplication.h"
-#include "klauncher.h"
+#include "tdelauncher.h"
 #include "kcmdlineargs.h"
 #include "kcrash.h"
 #include "kdebug.h"
@@ -33,14 +33,14 @@
 #include <tqcstring.h>
 #include <klocale.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);
+   fprintf(stderr, "[tdelauncher] Exiting on signal %d\n", sig_num);
    KLauncher::destruct(255);
 }
 
@@ -55,8 +55,8 @@ 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"
+      fprintf(stderr, "%s", i18n("[tdelauncher] This program is not supposed to be started manually.\n"
-                                 "[klauncher] It is started automatically by tdeinit.\n").local8Bit().data());
+                                 "[tdelauncher] It is started automatically by tdeinit.\n").local8Bit().data());
       return 1;
    }
 
@@ -82,7 +82,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char**argv )
       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,12 +90,12 @@ 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...

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
+When a tdeconf_update script is used to update such option, tdestartupconfig is run
-before kconf_update and therefore cannot see the change in time. To avoid this
+before tdeconf_update and therefore cannot see the change in time. To avoid this
-problem, together with the kconf_update script also the matching global config
+problem, together with the tdeconf_update script also the matching global config
-file should be updated (any change, kstartupconfig will see the timestamp change).
+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;

kinit/tests/Makefile.am

@@ -3,8 +3,8 @@
 INCLUDES=	-I$(srcdir)/../.. $(all_includes) 
 ####### Files
 
-check_PROGRAMS = klaunchertest
+check_PROGRAMS = tdelaunchertest
 
-klaunchertest_SOURCES = klaunchertest.cpp 
+tdelaunchertest_SOURCES = tdelaunchertest.cpp 
-klaunchertest_LDADD   = $(LIB_KIO)
+tdelaunchertest_LDADD   = $(LIB_KIO)
 

kinit/tests/tdelaunchertest.cpp

@@ -30,7 +30,7 @@ int main(int argc, char *argv[])
 {
    TDEApplication::tdeinitExec("konsole");
 
-   TDEApplication k(argc, argv, "klaunchertest");
+   TDEApplication k(argc, argv, "tdelaunchertest");
  
    kapp->dcopClient()->registerAs( kapp->name()) ;
 

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;

kio/data.protocol

@@ -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

kio/kioexec/Makefile.am

@@ -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) -ltdetexteditor
-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

kio/misc/kfile/Makefile.am

@@ -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) -ltdetexteditor
-kfile_LDADD = $(LIB_KIO)
-

kio/pics/Makefile.am

@@ -1,3 +0,0 @@
-kiouiservericonsdir = $(kde_datadir)/kio_uiserver/icons
-kiouiservericons_ICON = AUTO
-

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}/tdeio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
-  ${CMAKE_SOURCE_DIR}/kio/kfile
+  ${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

knewstuff/Makefile.am

@@ -10,11 +10,11 @@ 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) -ltdetexteditor
+tdehotnewstuff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-khotnewstuff_LDADD = libknewstuff.la
+tdehotnewstuff_LDADD = libknewstuff.la
-khotnewstuff_SOURCES = khotnewstuff.cpp
+tdehotnewstuff_SOURCES = tdehotnewstuff.cpp
 
 EXTRA_PROGRAMS = testnewstuff ghns
 
@@ -29,7 +29,7 @@ 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

knewstuff/downloaddialog.cpp

@@ -24,11 +24,11 @@
 #include <klocale.h>
 #include <klistview.h>
 #include <kdebug.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kmessagebox.h>
 #include <kurl.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kiconloader.h>
 

knewstuff/engine.cpp

@@ -24,7 +24,7 @@
 
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>

knewstuff/knewstuffgeneric.cpp

@@ -26,7 +26,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kprocess.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 #include <ktar.h>

knewstuff/knewstuffsecure.cpp

@@ -16,10 +16,10 @@
 #include <tqfileinfo.h>
 
 //kde includes
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>

knewstuff/provider.cpp

@@ -18,9 +18,9 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kglobal.h>
 #include <kmessagebox.h>
 #include <klocale.h>

knewstuff/tdehotnewstuff.cpp

@@ -35,7 +35,7 @@ static const KCmdLineOptions op[] =
 
 int main(int argc, char **argv)
 {
-	TDEAboutData about("khotnewstuff", "KHotNewStuff", "0.2");
+	TDEAboutData about("tdehotnewstuff", "KHotNewStuff", "0.2");
 	TDECmdLineArgs *args;
 
 	TDECmdLineArgs::init(argc, argv, &about);

knewstuff/uploaddialog.cpp

@@ -31,7 +31,7 @@
 #include <kdebug.h>
 #include <kurlrequester.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kuser.h>
 

kstyles/plastik/config/CMakeLists.txt

@@ -27,7 +27,7 @@ link_directories(
 set( target kstyle_plastik_config )
 
 set( ${target}_SRCS
-  plastikconf.cpp
+  plastitdeconf.cpp
 )
 
 tde_add_kpart( ${target} AUTOMOC

kstyles/plastik/config/Makefile.am

@@ -1,10 +1,10 @@
 INCLUDES = $(all_includes)
 
-noinst_HEADERS = plastikconf.h
+noinst_HEADERS = plastitdeconf.h
 kde_module_LTLIBRARIES = kstyle_plastik_config.la
 kstyle_plastik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 kstyle_plastik_config_la_LIBADD  = $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE)
-kstyle_plastik_config_la_SOURCES = plastikconf.cpp
+kstyle_plastik_config_la_SOURCES = plastitdeconf.cpp
 kstyle_plastik_config_la_METASOURCES = AUTO
 
 

kstyles/plastik/config/plastitdeconf.cpp

@@ -35,7 +35,7 @@ DEALINGS IN THE SOFTWARE.
 #include <kcolorbutton.h>
 #include <kdemacros.h>
 
-#include "plastikconf.h"
+#include "plastitdeconf.h"
 
 extern "C"
 {
@@ -220,4 +220,4 @@ void PlastikStyleConfig::updateChanged()
 		emit changed(true);
 }
 
-#include "plastikconf.moc"
+#include "plastitdeconf.moc"

libtdemid/deviceman.cc

@@ -68,7 +68,7 @@
 #if 1
 #include <kinstance.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #endif
 
 //#define DEVICEMANDEBUG

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}/tdeio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
-  ${CMAKE_SOURCE_DIR}/kio/kfile
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
-  ${CMAKE_SOURCE_DIR}/kio/kssl
+  ${CMAKE_SOURCE_DIR}/tdeio/kssl
 )
 
 link_directories(
@@ -45,6 +45,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kio-shared tdeparts-shared
+  LINK tdeio-shared tdeparts-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

tdecert/Makefile.am

@@ -1,4 +1,4 @@
-INCLUDES= -I$(top_srcdir)/kio/kssl -I$(top_builddir)/kio/kssl -I$(top_srcdir) $(SSL_INCLUDES) $(all_includes)
+INCLUDES= -I$(top_srcdir)/tdeio/kssl -I$(top_builddir)/tdeio/kssl -I$(top_srcdir) $(SSL_INCLUDES) $(all_includes)
 
 kde_module_LTLIBRARIES = libtdecertpart.la
 

tdecert/tdecertpart.cc

@@ -36,18 +36,18 @@
 #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 <tdeio/kmimemagic.h>
 #include <tqmultilineedit.h>
 #include <tqregexp.h>
 #include <kcombobox.h>
 #include <tdeparts/browserextension.h>
 #include <tdeparts/browserinterface.h>
-#include <kio/kservicetypefactory.h>
+#include <tdeio/kservicetypefactory.h>
 
 K_EXPORT_COMPONENT_FACTORY( libtdecertpart, KParts::GenericFactory<KCertPart> )
 
@@ -774,7 +774,7 @@ void KCertPart::slotDone() {
 
 void KCertPart::slotLaunch() {
 KShellProcess p;
-p << "kcmshell" << "crypto";
+p << "tdecmshell" << "crypto";
 p.start(TDEProcess::DontCare);
 }
 

tdecmshell/CMakeLists.txt

@@ -16,8 +16,8 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
   ${CMAKE_SOURCE_DIR}/tdeutils
 )
 
@@ -26,9 +26,9 @@ link_directories(
 )
 
 
-##### kcmshell ##################################
+##### tdecmshell ##################################
 
-set( target kcmshell )
+set( target tdecmshell )
 
 set( ${target}_SRCS
   main.cpp main.skel

tdecmshell/Makefile.am

@@ -23,16 +23,16 @@ METASOURCES = AUTO
 
 lib_LTLIBRARIES = 
 bin_PROGRAMS = 
-tdeinit_LTLIBRARIES = kcmshell.la
+tdeinit_LTLIBRARIES = tdecmshell.la
 
-kcmshell_la_SOURCES = main.cpp main.skel
+tdecmshell_la_SOURCES = main.cpp main.skel
-kcmshell_la_LIBADD = ../tdeutils/libtdeutils.la $(LIB_QT) $(LIB_TDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIB_KFILE)
+tdecmshell_la_LIBADD = ../tdeutils/libtdeutils.la $(LIB_QT) $(LIB_TDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIB_KFILE)
-kcmshell_la_LDFLAGS = $(all_libraries) -module -avoid-version
+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

tdecmshell/main.cpp

@@ -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
@@ -157,7 +157,7 @@ void KCMShellMultiDialog::activate( TQCString asn_id )
 
 void KCMShell::setDCOPName(const TQCString &dcopName, bool rootMode )
 {
-    m_dcopName = "kcmshell_";
+    m_dcopName = "tdecmshell_";
     if( rootMode )
         m_dcopName += "rootMode_";
 
@@ -198,7 +198,7 @@ static void setIcon(TQWidget *w, const TQString &iconName)
 
 extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[])
 {
-    TDEAboutData 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"),
                           TDEAboutData::License_GPL,
@@ -211,7 +211,7 @@ 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");
     
-    TDEGlobal::locale()->setMainCatalogue("kcmshell");
+    TDEGlobal::locale()->setMainCatalogue("tdecmshell");
 
     TDECmdLineArgs::init(_argc, _argv, &aboutData);
     TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
@@ -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.

tdecmshell/main.h

@@ -19,8 +19,8 @@
 
 */
 
-#ifndef __kcmshell_h__
+#ifndef __tdecmshell_h__
-#define __kcmshell_h__
+#define __tdecmshell_h__
 
 #include <dcopobject.h>
 
@@ -28,7 +28,7 @@
 #include <kcmultidialog.h>
 
 /**
- * The TDEApplication instance for kcmshell.
+ * The TDEApplication instance for tdecmshell.
  */
 class KCMShell : public TDEApplication
 {
@@ -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__

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

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.

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
+tdeconf_update_la_SOURCES = tdeconf_update.cpp
-kconf_update_la_LIBADD = $(LIB_TDECORE) $(LIB_QT)
+tdeconf_update_la_LIBADD = $(LIB_TDECORE) $(LIB_QT)
-kconf_update_la_LDFLAGS = $(all_libraries) -module -avoid-version
+tdeconf_update_la_LDFLAGS = $(all_libraries) -module -avoid-version
 
 METASOURCES = AUTO
 
 # Internal
-# noinst_HEADERS = kconf_update.h
+# noinst_HEADERS = tdeconf_update.h
 

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
+<script> should be installed into $(kde_datadir)/tdeconf_update, or
-kconf_update will not be able to find it. It is not portable to install
+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,
+to install tdeconf_update applications in $(kde_bindir)/tdeconf_update_bin,
-which opens the door to kconf_update applications that are written in C++
+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,kio_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" 
+The above update file extracts config information from the file "tdeioslaverc" 
 and stores it into the file "kio_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.
 
 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.
 
-Then it takes all keys in the "UserAgent" group of the file "kioslaverc" 
+Then it takes all keys in the "UserAgent" group of the file "tdeioslaverc" 
 and moves then to the "UserAgent" group in the "kio_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
+If you are developing a tdeconf_update script and want to test or debug it you
-need to make sure kconf_update runs again after each of your changes. There
+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
+in the traces tdeconf_update leaves behind: it adds a special config group
-'[$Version]' with a key 'update_info'. This key lists all kconf_update
+'[$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
+If you want to know what tdeconf_update has been up to lately, have a look
-at $TDEHOME/share/apps/kconf_update/update.log
+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". 
 
 

tdeconf_update/tdeconf_update.cpp

@@ -28,7 +28,7 @@
 #include <tqfile.h>
 #include <tqtextstream.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <klocale.h>
 #include <kcmdlineargs.h>
@@ -113,7 +113,7 @@ KonfUpdate::KonfUpdate()
    oldConfig2 = 0;
    newConfig = 0;
 
-   config = new TDEConfig("kconf_updaterc");
+   config = new TDEConfig("tdeconf_updaterc");
 
    TQStringList updateFiles;
    TDECmdLineArgs *args=TDECmdLineArgs::parsedArgs();
@@ -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());
@@ -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 = TDEGlobal::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)
@@ -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())
       {
@@ -940,7 +940,7 @@ void KonfUpdate::resetOptions()
 
 extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
 {
-   TDEAboutData 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"),
                         TDEAboutData::License_GPL,

tdecore/CMakeLists.txt

@@ -11,7 +11,7 @@
 
 add_subdirectory( malloc )
 add_subdirectory( network )
-add_subdirectory( kconfig_compiler )
+add_subdirectory( tdeconfig_compiler )
 add_subdirectory( hwlibdata )
 add_subdirectory( hwlibdaemons )
 
@@ -53,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}
@@ -69,9 +69,9 @@ link_directories(
 ##### headers ###################################
 
 install( FILES
-    kconfig.h kconfigskeleton.h kconfigdata.h ksimpleconfig.h
+    tdeconfig.h tdeconfigskeleton.h tdeconfigdata.h ksimpleconfig.h
-    kconfigdialogmanager.h kconfigbase.h kdesktopfile.h
+    tdeconfigdialogmanager.h tdeconfigbase.h kdesktopfile.h
-    kurl.h ksock.h kaboutdata.h kcmdlineargs.h kconfigbackend.h
+    kurl.h ksock.h kaboutdata.h kcmdlineargs.h tdeconfigbackend.h
     kapp.h kapplication.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
@@ -110,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 )
@@ -121,7 +121,7 @@ set( target tdecore )
 
 set( ${target}_SRCS
   libintl.cpp kapplication.cpp kdebug.cpp netwm.cpp
-  kconfigbase.cpp kconfig.cpp ksimpleconfig.cpp kconfigbackend.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 kiconloader.cpp
@@ -148,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}

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"
@@ -176,7 +176,7 @@ Class overview
  TDEConfigBackend  <-----> TDEConfig <------> TDEConfigSkeleton           /--< myapp.kcfg
        |                    |                    |                 /
        v                    v                    |*---------------<
-TDEConfigINIBackend      KSimpleConfig             |kconfig_compiler \
+TDEConfigINIBackend      KSimpleConfig             |tdeconfig_compiler \
                                                  |                  \--< myconfig.kcfg-codegen
                                                  v                                                    
                                              MyConfig <-----TDEConfigDialogManager----> MyConfigWidget *---< myconfigwidget.ui

tdecore/MAINTAINERS

@@ -20,9 +20,9 @@ kckey.cpp
 kcmdlineargs.cpp	Waldo Bastian <bastian@kde.org>
 kcompletion.cpp		Carsten Pfeiffer <pfeiffer@kde.org>
 kcompletionbase.cpp
-kconfig.cpp		Waldo Bastian <bastian@kde.org>
+tdeconfig.cpp		Waldo Bastian <bastian@kde.org>
-kconfigbackend.cpp	Waldo Bastian <bastian@kde.org>
+tdeconfigbackend.cpp	Waldo Bastian <bastian@kde.org>
-kconfigbase.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>
@@ -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
+tdeconfigdialogmanager.cpp
-kconfigskeleton.cpp
+tdeconfigskeleton.cpp
 kdebugdcopiface.cpp	Andreas Beckermann (b_mann@gmx.de) (copyright)
 tdeversion.cpp
 kglobalaccel_win.cpp	Ellis Whitehead <ellis@kde.org> (copyright)

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,10 +36,10 @@ 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 \
+include_HEADERS = tdeconfig.h tdeconfigskeleton.h \
-	kconfigdata.h ksimpleconfig.h kconfigdialogmanager.h \
+	tdeconfigdata.h ksimpleconfig.h tdeconfigdialogmanager.h \
-	kconfigbase.h kdesktopfile.h kurl.h ksock.h kaboutdata.h \
+	tdeconfigbase.h kdesktopfile.h kurl.h ksock.h kaboutdata.h \
-	kcmdlineargs.h kconfigbackend.h kapp.h kapplication.h kuniqueapp.h \
+	kcmdlineargs.h tdeconfigbackend.h kapp.h kapplication.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 \
@@ -90,8 +90,8 @@ noinst_HEADERS = kaccelaction.h kaccelbase.h kaccelprivate.h kckey.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 \
+	kdebug.cpp netwm.cpp tdeconfigbase.cpp tdeconfig.cpp  ksimpleconfig.cpp \
-	kconfigbackend.cpp kmanagerselection.cpp kdesktopfile.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 \
 	kiconloader.cpp twin.cpp twinmodule.cpp krootprop.cpp kcharsets.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

tdecore/README.kiosk

@@ -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.
 =======================================================

tdecore/README.kstartupinfo

@@ -173,7 +173,7 @@ 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',
 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
 to create a new one.

tdecore/kaccelaction.cpp

@@ -25,7 +25,7 @@
 
 #include <tqkeycode.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include "kckey.h"
 #include <kdebug.h>
 #include <kglobal.h>

tdecore/kaccelbase.cpp

@@ -26,7 +26,7 @@
 #include <tqlabel.h>
 #include <tqpopupmenu.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include "kckey.h"
 #include <kdebug.h>
 #include <kglobal.h>

tdecore/kappdcopiface.cpp

@@ -21,7 +21,7 @@
 #include <kapplication.h>
 #include <dcopclient.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 
 KAppDCOPInterface::KAppDCOPInterface(TDEApplication * theKApp)

tdecore/kapplication.cpp

@@ -68,7 +68,7 @@
 #include <kstyle.h>
 #include <kiconloader.h>
 #include <kclipboard.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <kcmdlineargs.h>
 #include <kaboutdata.h>
@@ -2970,7 +2970,7 @@ void TDEApplication::broadcastKeyCode(unsigned int keyCode)
 TQCString
 TDEApplication::launcher()
 {
-   return "klauncher";
+   return "tdelauncher";
 }
 
 static int

tdecore/kcharsets.cpp

@@ -24,7 +24,7 @@
 #include <kapplication.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqfontinfo.h>
 #include <tqstrlist.h>

tdecore/kcheckaccelerators.cpp

@@ -39,7 +39,7 @@
 #include <tqmetaobject.h>
 #include <tqcheckbox.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kshortcut.h>

tdecore/kclipboard.cpp

@@ -17,7 +17,7 @@
 */
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 
 #include "kclipboard.h"

tdecore/kconfig_compiler/Makefile.am

@@ -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) -ltdetexteditor
-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
-	  

tdecore/kcrash.cpp

@@ -51,7 +51,7 @@
 #include <kapplication.h>
 #include <dcopclient.h>
 
-#include <../kinit/klauncher_cmds.h>
+#include <../kinit/tdelauncher_cmds.h>
 
 #if defined Q_WS_X11
 #include <X11/Xlib.h>
@@ -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 ];

tdecore/kdebug.areas

@@ -29,7 +29,7 @@
 220        tdeui (KToolBar)
 230        tdeui (KCommand)
 240        tdeui (tdelibs)
-250        kfile (tdelibs)
+250        tdefile (tdelibs)
 264        tdecore (KIconLoader)
 265        tdecore (KIconEffect)
 270        tdeui (KRootPixmap)
@@ -58,7 +58,7 @@
 713        tdeutils (TDECModuleContainer)
 750        tdespell (tdelibs)
 760        tdemdi
-780        kcmshell (tdelibs)
+780        tdecmshell (tdelibs)
 790        tdeimproxy (tdelibs)
 800        kabapi (tdelibs)
 900        tdesu (tdelibs)
@@ -87,8 +87,8 @@
 1216        twin (client errors)
 1217        khotkeys
 1218        ksmserver
-1219        media kioslave
+1219        media tdeioslave
-1220        remote kioslave
+1220        remote tdeioslave
 
 1400        khelpcenter (tdebase)
 1401        kcmhelpcenter
@@ -220,7 +220,7 @@
 6201        tdehtml (caret table)
 6210        tdehtml (editor)
 
-# libkio
+# libtdeio
 7000        kio
 7001        kio (KDirWatch)
 7002        kio (Slave)
@@ -239,9 +239,9 @@
 7016        kio (KLauncher)
 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,7 +260,7 @@
 7042        KAr
 7043        kio (bookmarks)
 
-# 71xx      are for kioslaves
+# 71xx      are for tdeioslaves
 7101        kio_file
 7102        kio_ftp
 7103        kio_http
@@ -427,8 +427,8 @@
 20011        KDB (Connection)
 20012        KDB (plugin)
 
-#kfilereplace
+#tdefilereplace
-23000 	     KFileReplace (kfilereplacepart)
+23000 	     KFileReplace (tdefilereplacepart)
 
 #klinkstatus
 23100        KLinkStatus

tdecore/kdebug.cpp

@@ -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>
 

tdecore/kdesktopfile.cpp

@@ -30,7 +30,7 @@
 
 #include <kdebug.h>
 #include "kurl.h"
-#include "kconfigbackend.h"
+#include "tdeconfigbackend.h"
 #include "kapplication.h"
 #include "kstandarddirs.h"
 #include "kmountpoint.h"

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;

tdecore/kdetcompmgr.cpp

@@ -26,7 +26,7 @@
 #include <kcmdlineargs.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <pwd.h>
 #include <signal.h>

tdecore/kglobal.cpp

@@ -30,7 +30,7 @@
 #include <kapplication.h>
 #include <kaboutdata.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kcharsets.h>
 #include <kiconloader.h>

tdecore/kglobalsettings.cpp

@@ -23,7 +23,7 @@
 #include <tqfontdatabase.h>
 #include <tqcursor.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <kapplication.h>
 

tdecore/kiconeffect.cpp

@@ -30,7 +30,7 @@
 
 #include <kdebug.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobalsettings.h>
 #include <kicontheme.h>
 #include "kiconeffect.h"

tdecore/kiconloader.cpp

@@ -31,7 +31,7 @@
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <kinstance.h>
 

tdecore/kicontheme.cpp

@@ -31,7 +31,7 @@
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <kinstance.h>
 

tdecore/kinstance.cpp

@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "kconfig.h"
+#include "tdeconfig.h"
 #include "klocale.h"
 #include "kcharsets.h"
 #include "kiconloader.h"

tdecore/kkeyserver_x11.cpp

@@ -31,7 +31,7 @@
 #include "kkeynative.h"
 #include "kshortcut.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>

tdecore/klocale.cpp

@@ -37,7 +37,7 @@
 #include "kstandarddirs.h"
 #include "ksimpleconfig.h"
 #include "kinstance.h"
-#include "kconfig.h"
+#include "tdeconfig.h"
 #include "kdebug.h"
 #include "kcalendarsystem.h"
 #include "kcalendarsystemfactory.h"
@@ -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();

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"

tdecore/knotifyclient.cpp

@@ -26,7 +26,7 @@
 #include <kapplication.h>
 #include <kstandarddirs.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <dcopclient.h>
 #include <kdebug.h>
 #include <kstaticdeleter.h>

tdecore/kprotocolinfo_tdecore.cpp

@@ -30,7 +30,7 @@
 #include <kapplication.h>
 #include <kdebug.h>
 #include <ksimpleconfig.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstringhandler.h>
 
 class KProtocolInfo::KProtocolInfoPrivate
@@ -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 ); }

tdecore/kprotocolinfofactory.h

@@ -20,7 +20,7 @@
 #ifndef __kprotocolinfofactory_h__
 #define __kprotocolinfofactory_h__
 
-#include "../kio/kio/kprotocolinfo.h"
+#include "../tdeio/tdeio/kprotocolinfo.h"
 
 #include <tqmap.h>
 #include <tqstring.h>

tdecore/kshortcutlist.cpp

@@ -3,7 +3,7 @@
 
 #include <kaccel.h>
 #include "kaccelaction.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kglobalaccel.h>

tdecore/ksimpleconfig.cpp

@@ -33,7 +33,7 @@
 
 #include "kglobal.h"
 #include "kstandarddirs.h"
-#include "kconfigbackend.h"
+#include "tdeconfigbackend.h"
 
 #include "ksimpleconfig.h"
 

tdecore/ksimpleconfig.h

@@ -21,7 +21,7 @@
 #ifndef _KSIMPLECONFIG_H
 #define _KSIMPLECONFIG_H
 
-#include "kconfig.h"
+#include "tdeconfig.h"
 
 class KSimpleConfigPrivate;
 

tdecore/ksimpledirwatch.cpp

@@ -45,7 +45,7 @@
 
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.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

tdecore/ksocks.cpp

@@ -29,7 +29,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include "klibloader.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 
 #include <sys/types.h>

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"

tdecore/kstdaccel.cpp

@@ -23,7 +23,7 @@
 
 #include "kaccelaction.h"
 #include "kaccelbase.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>

tdecore/kuniqueapplication.cpp

@@ -43,7 +43,7 @@
 #include <kstartupinfo.h> 
 #endif
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include "kdebug.h"
 #include "kuniqueapplication.h"
 

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"
@@ -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;
-			TDEConfig* kconfig = new TDEConfig (service, true, true, "config");
+			TDEConfig* tdeconfig = new TDEConfig (service, true, true, "config");
-			kconfig->setGroup ("VPN Connection");
+			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;
 		}
 	}
 

tdecore/tdeconfig.cpp

@@ -33,9 +33,9 @@
 #include <tqfileinfo.h>
 
 #include <kapplication.h>
-#include "kconfigbackend.h"
+#include "tdeconfigbackend.h"
 
-#include "kconfig.h"
+#include "tdeconfig.h"
 #include "kglobal.h"
 #include "kstandarddirs.h"
 #include "kstaticdeleter.h"
@@ -294,7 +294,7 @@ void TDEConfig::checkUpdate(const TQString &id, const TQString &updateFile)
   {
      TQStringList args;
      args << "--check" << updateFile;
-     TDEApplication::tdeinitExecWait("kconf_update", args);
+     TDEApplication::tdeinitExecWait("tdeconf_update", args);
      reparseConfiguration();
   }
   setGroup(oldGroup);
@@ -364,4 +364,4 @@ KSharedConfig::~KSharedConfig()
     s_list->remove(this);
 }
 
-#include "kconfig.moc"
+#include "tdeconfig.moc"

tdecore/tdeconfig.h

@@ -26,7 +26,7 @@ class TQTimer;
 
 #include <tqvaluelist.h>
 
-#include "kconfigbase.h"
+#include "tdeconfigbase.h"
 #include "klockfile.h"
 
 class TDEConfigPrivate;
@@ -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

tdecore/tdeconfig_compiler/CMakeLists.txt

@@ -20,10 +20,10 @@ link_directories(
 )
 
 
-##### kconfig_compiler ##########################
+##### tdeconfig_compiler ##########################
 
-tde_add_executable( kconfig_compiler
+tde_add_executable( tdeconfig_compiler
-  SOURCES kconfig_compiler.cpp
+  SOURCES tdeconfig_compiler.cpp
   LINK tdecore-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )

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
+	  

tdecore/tdeconfig_compiler/README.dox

@@ -1,7 +1,7 @@
 /**
-\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 
 TDEConfigSkeleton and provides an API for the application to access its

tdecore/tdeconfig_compiler/checkkcfg.pl

@@ -15,21 +15,21 @@ $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;
 }
 
-checkfile( $file_h );
+chectdefile( $file_h );
-checkfile( $file_cpp );
+chectdefile( $file_cpp );
 
 exit 0;
 
-sub checkfile()
+sub chectdefile()
 {
   my $file = shift;
 

tdecore/tdeconfig_compiler/example/Makefile.am

@@ -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
+exampleprefs_base.cpp exampleprefs_base.h: $(srcdir)/example.kcfg ../tdeconfig_compiler $(srcdir)/exampleprefs_base.kcfgc
-	../kconfig_compiler $(srcdir)/example.kcfg $(srcdir)/exampleprefs_base.kcfgc
+	../tdeconfig_compiler $(srcdir)/example.kcfg $(srcdir)/exampleprefs_base.kcfgc
 
 METASOURCES = AUTO
 

tdecore/tdeconfig_compiler/example/autoexample.cpp

@@ -30,9 +30,9 @@
 #include <klocale.h>
 #include <kcmdlineargs.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 
 #include <tqlabel.h>
 

tdecore/tdeconfig_compiler/example/example.cpp

@@ -27,7 +27,7 @@
 #include <klocale.h>
 #include <kcmdlineargs.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 
 int main( int argc, char **argv )

tdecore/tdeconfig_compiler/example/exampleprefs_base.kcfgc

@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 ClassName=ExamplePrefsBase
 #
 # Singleton=false

tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp

@@ -33,7 +33,7 @@
 #include <klocale.h>
 #include <kcmdlineargs.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 
@@ -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
     }
 }
@@ -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
     }
 }
@@ -952,7 +952,7 @@ TQString indent(TQString text, int spaces)
 
 int main( int argc, char **argv )
 {
-  TDEAboutData aboutData( "kconfig_compiler", I18N_NOOP("TDE .kcfg compiler"), "0.3",
+  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" );
@@ -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() + "_" : "" )
@@ -1153,7 +1153,7 @@ int main( int argc, char **argv )
   if ( !singleton && cfgFileNameArg && parameters.isEmpty() )
     h << "#include <kglobal.h>" << endl;
 
-  h << "#include <kconfigskeleton.h>" << endl;
+  h << "#include <tdeconfigskeleton.h>" << endl;
   h << "#include <kdebug.h>" << endl << endl;
 
   // Includes
@@ -1416,7 +1416,7 @@ 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;

tdecore/tdeconfig_compiler/tests/Makefile.am

@@ -54,77 +54,77 @@ test_dpointer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDE
 test_dpointer_LDADD = $(LIB_TDECORE)
 test_dpointer_SOURCES = test_dpointer_main.cpp test_dpointer.cpp
 
-check_LTLIBRARIES = tdeunittest_kconfigcompiler_test.la
+check_LTLIBRARIES = tdeunittest_tdeconfigcompiler_test.la
 
-tdeunittest_kconfigcompiler_test_la_SOURCES = kconfigcompiler_test.cpp
+tdeunittest_tdeconfigcompiler_test_la_SOURCES = tdeconfigcompiler_test.cpp
-tdeunittest_kconfigcompiler_test_la_LIBADD = \
+tdeunittest_tdeconfigcompiler_test_la_LIBADD = \
 	$(top_builddir)/tdeunittest/libtdeunittest.la
-tdeunittest_kconfigcompiler_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) \
+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
+test1.cpp test1.h: $(srcdir)/test1.kcfg ../tdeconfig_compiler $(srcdir)/test1.kcfgc
-	../kconfig_compiler $(srcdir)/test1.kcfg $(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
+test2.cpp test2.h: $(srcdir)/test2.kcfg ../tdeconfig_compiler $(srcdir)/test2.kcfgc
-	../kconfig_compiler $(srcdir)/test2.kcfg $(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
+test3.cpp test3.h: $(srcdir)/test3.kcfg ../tdeconfig_compiler $(srcdir)/test3.kcfgc
-	../kconfig_compiler $(srcdir)/test3.kcfg $(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
+test4.cpp test4.h: $(srcdir)/test4.kcfg ../tdeconfig_compiler $(srcdir)/test4.kcfgc
-	../kconfig_compiler $(srcdir)/test4.kcfg $(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
+test5.cpp test5.h: $(srcdir)/test5.kcfg ../tdeconfig_compiler $(srcdir)/test5.kcfgc
-	../kconfig_compiler $(srcdir)/test5.kcfg $(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
+test6.cpp test6.h: $(srcdir)/test6.kcfg ../tdeconfig_compiler $(srcdir)/test6.kcfgc
-	../kconfig_compiler $(srcdir)/test6.kcfg $(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
+test7.cpp test7.h: $(srcdir)/test7.kcfg ../tdeconfig_compiler $(srcdir)/test7.kcfgc
-	../kconfig_compiler $(srcdir)/test7.kcfg $(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
+test8a.cpp test8a.h: $(srcdir)/test8a.kcfg ../tdeconfig_compiler $(srcdir)/test8a.kcfgc
-	../kconfig_compiler $(srcdir)/test8a.kcfg $(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
+test8b.cpp test8b.h: $(srcdir)/test8b.kcfg ../tdeconfig_compiler $(srcdir)/test8b.kcfgc
-	../kconfig_compiler $(srcdir)/test8b.kcfg $(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
+test9.cpp test9.h: $(srcdir)/test9.kcfg ../tdeconfig_compiler $(srcdir)/test9.kcfgc
-	../kconfig_compiler $(srcdir)/test9.kcfg $(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
+test_dpointer.cpp test_dpointer.h: $(srcdir)/test_dpointer.kcfg ../tdeconfig_compiler $(srcdir)/test_dpointer.kcfgc
-	../kconfig_compiler $(srcdir)/test_dpointer.kcfg $(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

tdecore/tdeconfig_compiler/tests/myprefs.h

@@ -1,4 +1,4 @@
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 
 class MyPrefs : public TDEConfigSkeleton
 {

tdecore/tdeconfig_compiler/tests/tdeconfigcompiler_test.cpp

@@ -17,11 +17,11 @@
 #include <tqstring.h>
 #include <kdebug.h>
 #include <tdeunittest/module.h>
-#include "kconfigcompiler_test.h"
+#include "tdeconfigcompiler_test.h"
 
 using namespace KUnitTest;
 
-KUNITTEST_MODULE( tdeunittest_kconfigcompiler_test, "TDEConfigXT")
+KUNITTEST_MODULE( tdeunittest_tdeconfigcompiler_test, "TDEConfigXT")
 KUNITTEST_MODULE_REGISTER_TESTER( TDEConfigCompiler_Test )
 
 typedef const char * CompilerTestSet[];

tdecore/tdeconfig_compiler/tests/test1.cpp.ref

@@ -1,4 +1,4 @@
-// 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.
 
 #include "test1.h"

tdecore/tdeconfig_compiler/tests/test1.h.ref

@@ -1,9 +1,9 @@
-// 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>

tdecore/tdeconfig_compiler/tests/test1.kcfgc

@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 ClassName=Test1
 #
 # Singleton=false

tdecore/tdeconfig_compiler/tests/test2.cpp.ref

@@ -1,4 +1,4 @@
-// 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"

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

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

tdecore/tdeconfig_compiler/tests/test3.cpp.ref

@@ -1,4 +1,4 @@
-// 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.
 
 #include "test3.h"

tdecore/tdeconfig_compiler/tests/test3.h.ref

@@ -1,9 +1,9 @@
-// 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 {

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

tdecore/tdeconfig_compiler/tests/test4.cpp.ref

@@ -1,4 +1,4 @@
-// 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.
 
 #include "test4.h"

tdecore/tdeconfig_compiler/tests/test4.h.ref

@@ -1,9 +1,9 @@
-// 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 TDEConfigSkeleton

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

tdecore/tdeconfig_compiler/tests/test5.cpp.ref

@@ -1,4 +1,4 @@
-// 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.
 
 #include "test5.h"

tdecore/tdeconfig_compiler/tests/test5.h.ref

@@ -1,9 +1,9 @@
-// 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 TDEConfigSkeleton

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

tdecore/tdeconfig_compiler/tests/test6.cpp.ref

@@ -1,4 +1,4 @@
-// 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.
 
 #include "test6.h"

tdecore/tdeconfig_compiler/tests/test6.h.ref

@@ -1,9 +1,9 @@
-// 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 TDEConfigSkeleton

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

tdecore/tdeconfig_compiler/tests/test7.cpp.ref

@@ -1,4 +1,4 @@
-// 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.
 
 #include "test7.h"

tdecore/tdeconfig_compiler/tests/test7.h.ref

@@ -1,9 +1,9 @@
-// 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 TDEConfigSkeleton

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

tdecore/tdeconfig_compiler/tests/test8a.cpp.ref

@@ -1,4 +1,4 @@
-// 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.
 
 #include "test8a.h"

tdecore/tdeconfig_compiler/tests/test8a.h.ref

@@ -1,10 +1,10 @@
-// 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 <tdeconfigskeleton.h>
 #include <kdebug.h>
 
 class Test8a : public TDEConfigSkeleton

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"

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

tdecore/tdeconfig_compiler/tests/test9.cpp.ref

@@ -1,4 +1,4 @@
-// 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"

tdecore/tdeconfig_compiler/tests/test9.h.ref

@@ -1,9 +1,9 @@
-// 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>

tdecore/tdeconfig_compiler/tests/test9.kcfgc

@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 ClassName=Test9
 #
 # Singleton=false

tdecore/tdeconfig_compiler/tests/test_dpointer.cpp.ref

@@ -1,4 +1,4 @@
-// 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"

tdecore/tdeconfig_compiler/tests/test_dpointer.h.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.
 #ifndef TESTDPOINTER_H
 #define TESTDPOINTER_H
 
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 #include <kdebug.h>
 
 class TestDPointerPrivate;

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

tdecore/tdeconfigbackend.cpp

@@ -39,8 +39,8 @@
 #include <tqtextcodec.h>
 #include <tqtextstream.h>
 
-#include "kconfigbackend.h"
+#include "tdeconfigbackend.h"
-#include "kconfigbase.h"
+#include "tdeconfigbase.h"
 #include <kapplication.h>
 #include <kglobal.h>
 #include <kprocess.h>

tdecore/tdeconfigbackend.h

@@ -22,8 +22,8 @@
 #ifndef _KCONFIGBACKEND_H
 #define _KCONFIGBACKEND_H
 
-#include "kconfigdata.h"
+#include "tdeconfigdata.h"
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include <klockfile.h>
 #include <klocale.h>
 #include "tdelibs_export.h"

tdecore/tdeconfigbase.cpp

@@ -32,8 +32,8 @@
 #include <klocale.h>
 #include <kcharsets.h>
 
-#include "kconfigbase.h"
+#include "tdeconfigbase.h"
-#include "kconfigbackend.h"
+#include "tdeconfigbackend.h"
 #include "kdebug.h"
 #include "kstandarddirs.h"
 #include "kstringhandler.h"
@@ -1934,4 +1934,4 @@ bool TDEConfigBase::checkConfigFilesWritable(bool warnUser)
     return false;
 }
 
-#include "kconfigbase.moc"
+#include "tdeconfigbase.moc"

tdecore/tdeconfigbase.h

@@ -32,7 +32,7 @@
 #include <tqvariant.h>
 #include <tqmap.h>
 
-#include "kconfigdata.h"
+#include "tdeconfigdata.h"
 #include "tdelibs_export.h"
 
 class TDEConfigBackEnd;

tdecore/tdeconfigdialogmanager.cpp

@@ -19,7 +19,7 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#include "kconfigdialogmanager.h"
+#include "tdeconfigdialogmanager.h"
 
 #include <tqbuttongroup.h>
 #include <tqcombobox.h>
@@ -31,7 +31,7 @@
 #include <tqwhatsthis.h>
 
 #include <kapplication.h>
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 #include <kdebug.h>
 #include <kglobal.h>
 
@@ -394,5 +394,5 @@ bool TDEConfigDialogManager::isDefault()
   return result;
 }
 
-#include "kconfigdialogmanager.moc"
+#include "tdeconfigdialogmanager.moc"
 

tdecore/tdeconfigskeleton.cpp

@@ -22,7 +22,7 @@
 #include <tqcolor.h>
 #include <tqvariant.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
@@ -30,7 +30,7 @@
 
 #include "kstringhandler.h"
 
-#include "kconfigskeleton.h"
+#include "tdeconfigskeleton.h"
 
 void TDEConfigSkeletonItem::readImmutability( TDEConfig *config )
 {

tdecore/tdeconfigskeleton.h

@@ -33,7 +33,7 @@
 #include <tqsize.h>
 #include <tqstringlist.h>
 #include <tqvariant.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobalsettings.h>
 
   /**
@@ -359,7 +359,7 @@ template < typename T > class TDEConfigSkeletonGenericItem:public TDEConfigSkele
    * for your own types and call the generic @ref addItem() to register them.
    *
    * In many cases you don't have to write the specific TDEConfigSkeleton
-   * subclasses yourself, but you can use \ref kconfig_compiler to automatically
+   * 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 TDEConfigSkeleton

tdecore/tdehardwaredevices.cpp

@@ -25,7 +25,7 @@
 
 #include <kglobal.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ktempfile.h>
 #include <ksimpledirwatch.h>
 #include <kstandarddirs.h>

tdecore/tdesycoca.cpp

@@ -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.");
    }
 }

tdecore/tdesycoca.h

@@ -124,7 +124,7 @@ public:
    virtual bool isBuilding() { return false; }
 
    /**
-    * @internal - disables launching of kbuildsycoca
+    * @internal - disables launching of tdebuildsycoca
     */
    void disableAutoRebuild();
 
@@ -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 &);
 

tdecore/tests/Makefile.am

@@ -21,7 +21,7 @@ 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 \
@@ -38,7 +38,7 @@ 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
@@ -79,8 +79,8 @@ kstdacceltest_SOURCES = kstdacceltest.cpp
 kglobaltest_SOURCES = kglobaltest.cpp
 ktimezonestest_SOURCES = ktimezonestest.cpp
 
-check_LTLIBRARIES = tdeunittest_kconfig.la
+check_LTLIBRARIES = tdeunittest_tdeconfig.la
 
-tdeunittest_kconfig_la_SOURCES = kconfigtest.cpp
+tdeunittest_tdeconfig_la_SOURCES = tdeconfigtest.cpp
-tdeunittest_kconfig_la_LIBADD = $(LIB_KUNITTEST)
+tdeunittest_tdeconfig_la_LIBADD = $(LIB_KUNITTEST)
-tdeunittest_kconfig_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN)
+tdeunittest_tdeconfig_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN)

tdecore/tests/ksimpleconfigtest.cpp

@@ -20,7 +20,7 @@
 
 int main( int argc, char **argv )
 {
-  TDEApplication  a( argc, argv, "kconfigtest" );
+  TDEApplication  a( argc, argv, "tdeconfigtest" );
 
   KSimpleConfig aConfig( _PATH_TMP"/simpleconfig.cfg" );
 

tdecore/tests/kstddirstest.cpp

@@ -2,7 +2,7 @@
 #include <kdebug.h>
 #include <kinstance.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 int main(int argc, char **argv)
 {

tdecore/tests/kurltest.cpp

@@ -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";
+  baseURL = "file:/usr/local/src/kde2/////tdelibs/tdeio";
-  check( "KURL::url()", baseURL.url(), "file:///usr/local/src/kde2/////tdelibs/kio" );
+  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");
+  carsten.setPath("/home/gis/src/kde/tdelibs/tdefile/.#tdefiledetailview.cpp.1.18");
-  check("KURL::path()", carsten.path(), "/home/gis/src/kde/tdelibs/kfile/.#kfiledetailview.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" );

tdecore/tests/tdeconfigtest.cpp

@@ -20,7 +20,7 @@
 #include <tdeunittest/tester.h>
 #include <tdeunittest/module.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 class TDEConfigTest : public KUnitTest::Tester
 {
@@ -31,7 +31,7 @@ private:
     void revertEntries();
 };
 
-KUNITTEST_MODULE( tdeunittest_kconfig, "TDEConfigTest" )
+KUNITTEST_MODULE( tdeunittest_tdeconfig, "TDEConfigTest" )
 KUNITTEST_MODULE_REGISTER_TESTER( TDEConfigTest )
 
 // test data
@@ -52,7 +52,7 @@ KUNITTEST_MODULE_REGISTER_TESTER( TDEConfigTest )
 
 void TDEConfigTest::writeConfigFile()
 {
-  TDEConfig sc( "kconfigtest" );
+  TDEConfig sc( "tdeconfigtest" );
 
   sc.setGroup("AAA");
   sc.writeEntry("stringEntry1", STRINGENTRY1, true, true);
@@ -89,7 +89,7 @@ void TDEConfigTest::writeConfigFile()
 void TDEConfigTest::revertEntries()
 {
   tqWarning("Reverting entries");
-  TDEConfig sc( "kconfigtest" );
+  TDEConfig sc( "tdeconfigtest" );
 
   sc.setGroup("Hello");
   sc.revertToDefault( "boolEntry1");
@@ -109,7 +109,7 @@ void TDEConfigTest::allTests()
 {
   writeConfigFile();
 
-  TDEConfig sc2( "kconfigtest" );
+  TDEConfig sc2( "tdeconfigtest" );
 
   TDEConfigGroup sc3( &sc2, "AAA");
   bool bImmutable = sc3.entryIsImmutable("stringEntry1");

tdecore/tests/tdeconfigtestgui.cpp

@@ -17,8 +17,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kconfigtestgui.h"
+#include "tdeconfigtestgui.h"
-#include "kconfigtestgui.moc"
+#include "tdeconfigtestgui.moc"
 
 //
 // configtest.cpp: libKDEcore example
@@ -45,7 +45,7 @@
 #include <tqpushbutton.h>
 
 // KDE includes
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #ifdef HAVE_PATHS_H
 #include <paths.h>

tdecore/tests/tdeconfigtestgui.h

@@ -33,7 +33,7 @@
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 //
 // TDEConfigTestView contains lots of Qt widgets.

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
+tde_add_kpart( tdefile_elf AUTOMOC
-  SOURCES kfile_elf.cpp
+  SOURCES tdefile_elf.cpp
   EMBED tdelficon-static
-  LINK kio-shared ${LIBR_LIBRARIES}
+  LINK tdeio-shared ${LIBR_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

tdefile-plugins/elf/tdefile_elf.cpp

@@ -18,7 +18,7 @@
  */
 
 #include <config.h>
-#include "kfile_elf.h"
+#include "tdefile_elf.h"
 
 #include <kprocess.h>
 #include <klocale.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"

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

tdefile-plugins/elf/tdefile_elf.h

@@ -20,7 +20,7 @@
 #ifndef __KFILE_BMP_H__
 #define __KFILE_BMP_H__
 
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 // Elven things
 extern "C" {

tdehtml/CMakeLists.txt

@@ -27,7 +27,7 @@ include_directories(
   ${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,10 +35,10 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdefx
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
-  ${CMAKE_SOURCE_DIR}/kio/kfile
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
-  ${CMAKE_SOURCE_DIR}/kio/kssl
+  ${CMAKE_SOURCE_DIR}/tdeio/kssl
   ${CMAKE_SOURCE_DIR}/tdeutils
   ${CMAKE_SOURCE_DIR}/tdewallet/client
   ${CMAKE_SOURCE_DIR}/tdeprint

tdehtml/Makefile.am

@@ -83,7 +83,7 @@ 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)/tdeio/kssl -I$(top_builddir)/tdeio/kssl \
 	-I$(top_srcdir)/tdeprint \
 	-I$(top_srcdir)/interfaces \
 	-I$(top_srcdir)/interfaces/kregexpeditor \

tdehtml/css/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}/tdeio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
   ${CMAKE_SOURCE_DIR}/tdewallet/client
   ${CMAKE_SOURCE_DIR}/tdeutils
 )

tdehtml/css/Makefile.am

@@ -36,7 +36,7 @@ noinst_HEADERS = \
 	cssstyleselector.h csshelper.h parser.h   \
 	css_renderstyledeclarationimpl.h
 
-INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio -I$(top_srcdir)/dcop \
+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)

tdehtml/css/cssstyleselector.cpp

@@ -58,7 +58,7 @@ using namespace DOM;
 #include <kstandarddirs.h>
 #include <kcharsets.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqfile.h>
 #include <tqvaluelist.h>
 #include <tqstring.h>

tdehtml/dom/CMakeLists.txt

@@ -18,7 +18,7 @@ include_directories(
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdehtml
   ${CMAKE_SOURCE_DIR}/tdecore
-  ${CMAKE_SOURCE_DIR}/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
 )
 
 

tdehtml/dom/Makefile.am

@@ -46,7 +46,7 @@ myinclude_HEADERS = \
 	dom2_views.h
 #	css_extensions.h
 
-INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio -I$(top_srcdir)/dcop \
+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/tdehtml

tdehtml/ecma/CMakeLists.txt

@@ -21,9 +21,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdefx
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
-  ${CMAKE_SOURCE_DIR}/kio/bookmarks
+  ${CMAKE_SOURCE_DIR}/tdeio/bookmarks
   ${CMAKE_SOURCE_DIR}/kjs
   ${CMAKE_SOURCE_DIR}/tdewallet/client
   ${CMAKE_SOURCE_DIR}/tdeutils

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)/tdehtml -I$(top_srcdir)/tdehtml/java -I$(top_srcdir)/tdewallet/client -I$(top_srcdir)/tdeutils -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)
 

tdehtml/ecma/kjs_debugwin.cpp

@@ -53,8 +53,8 @@
 #include <kactioncollection.h>
 #include <kglobalsettings.h>
 #include <kshortcut.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include <kapplication.h>
 #include <dcop/dcopclient.h>
 #include <kstringhandler.h> 

tdehtml/ecma/kjs_navigator.cpp

@@ -24,13 +24,13 @@
 #include <klocale.h>
 
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
-#include <kio/kprotocolmanager.h>
+#include <tdeio/kprotocolmanager.h>
-#include <kio/kmimetype.h>
+#include <tdeio/kmimetype.h>
-#include <kio/kservice.h>
+#include <tdeio/kservice.h>
-#include <kio/ktrader.h>
+#include <tdeio/ktrader.h>
 #include "kjs_navigator.h"
 #include "kjs/lookup.h"
 #include "kjs_binding.h"

tdehtml/ecma/xmlhttprequest.cpp

@@ -33,15 +33,15 @@
 #include "tdehtml_part.h"
 #include "tdehtmlview.h"
 
-#include <kio/scheduler.h>
+#include <tdeio/scheduler.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <tqobject.h>
 #include <kdebug.h>
 
 #ifdef APPLE_CHANGES
 #include "KWQLoader.h"
 #else
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 using TDEIO::NetAccess;
 #endif
 

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 {
 

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 {
 

tdehtml/html/CMakeLists.txt

@@ -19,10 +19,10 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
-  ${CMAKE_SOURCE_DIR}/kio/kfile
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
-  ${CMAKE_SOURCE_DIR}/kio/kssl
+  ${CMAKE_SOURCE_DIR}/tdeio/kssl
   ${CMAKE_SOURCE_DIR}/tdeutils
   ${CMAKE_SOURCE_DIR}/tdewallet/client
 )

tdehtml/html/Makefile.am

@@ -40,7 +40,7 @@ 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)/tdeio/kssl \
  -I$(top_srcdir)/kjs -I$(top_srcdir)/tdehtml -I$(top_srcdir) \
  -I$(top_srcdir)/tdewallet/client -I$(top_srcdir)/tdeutils \
  $(all_includes)

tdehtml/html/html_formimpl.cpp

@@ -57,7 +57,7 @@
 #include <tdewallet.h>
 #endif
 #include <netaccess.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <tqfile.h>
 #include <tqdir.h>
 #include <tqtextcodec.h>

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}/tdehtml
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
-  ${CMAKE_SOURCE_DIR}/kio/kssl
+  ${CMAKE_SOURCE_DIR}/tdeio/kssl
 )
 
 link_directories(

tdehtml/java/Makefile.am

@@ -15,7 +15,7 @@ libkjava_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined
 libkjava_la_LIBADD = $(LIB_KPARTS)
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tdehtml \
-	-I$(top_srcdir)/kio/kssl -I$(top_builddir)/kio/kssl \
+	-I$(top_srcdir)/tdeio/kssl -I$(top_builddir)/tdeio/kssl \
 	$(all_includes) 
 
 kjavadata_DATA = kjava.jar kjava.policy pluginsinfo

tdehtml/java/kjavaappletserver.cpp

@@ -26,14 +26,14 @@
 #include "kjavadownloader.h"
 
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <tdeparts/browserextension.h>
 #include <kapplication.h>
 #include <kstandarddirs.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
-#include <kio/kprotocolmanager.h>
+#include <tdeio/kprotocolmanager.h>
 #include <ksslcertificate.h>
 #include <ksslcertchain.h>
 #include <kssl.h>

tdehtml/java/kjavaappletviewer.cpp

@@ -37,8 +37,8 @@
 #include <kiconloader.h>
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
-#include <kio/authinfo.h>
+#include <tdeio/authinfo.h>
 #include <dcopclient.h>
 
 #include "kjavaappletwidget.h"

tdehtml/java/kjavadownloader.cpp

@@ -23,8 +23,8 @@
 #include "kjavaappletserver.h"
 
 #include <kurl.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 #include <kdebug.h>
 #include <tqfile.h>
 

tdehtml/java/kjavaprocess.cpp

@@ -22,7 +22,7 @@
 #include "kjavaprocess.h"
 
 #include <kdebug.h>
-#include <kio/kprotocolmanager.h>
+#include <tdeio/kprotocolmanager.h>
 
 #include <tqtextstream.h>
 #include <tqmap.h>

tdehtml/misc/CMakeLists.txt

@@ -19,10 +19,10 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
   ${CMAKE_SOURCE_DIR}/tdeutils
-  ${CMAKE_SOURCE_DIR}/kio/kfile
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
 )
 
 

tdehtml/misc/Makefile.am

@@ -31,7 +31,7 @@ noinst_HEADERS = \
 	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 \
+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/tdehtml

tdehtml/misc/helper.cpp

@@ -30,7 +30,7 @@
 #include <tqptrlist.h>
 #include <kstaticdeleter.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqtooltip.h>
 
 using namespace DOM;

tdehtml/misc/loader.cpp

@@ -57,8 +57,8 @@
 #include <tqwidget.h>
 
 #include <kapplication.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 #include <kglobal.h>
 #include <kimageio.h>
 #include <kcharsets.h>
@@ -70,7 +70,7 @@
 
 #ifdef IMAGE_TITLES
 #include <tqfile.h>
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 #include <ktempfile.h>
 #endif
 

tdehtml/misc/loader.h

@@ -49,7 +49,7 @@
 #include <tqtimer.h>
 
 #include <kurl.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 #include <tdehtml_settings.h>
 #include <dom/dom_string.h>

tdehtml/rendering/CMakeLists.txt

@@ -19,9 +19,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdehtml
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
-  ${CMAKE_SOURCE_DIR}/kio/kfile
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
   ${CMAKE_SOURCE_DIR}/tdeutils
 )
 

tdehtml/rendering/Makefile.am

@@ -41,8 +41,8 @@ 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 \
+INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/tdeio -I$(top_srcdir)/dcop \
- -I$(top_srcdir)/kfile -I$(top_srcdir)/tdehtml -I$(top_srcdir)/tdeutils -I$(top_srcdir) $(all_includes)
+ -I$(top_srcdir)/tdefile -I$(top_srcdir)/tdehtml -I$(top_srcdir)/tdeutils -I$(top_srcdir) $(all_includes)
 
 SRCDOC_DEST=$(kde_htmldir)/en/tdelibs/tdehtml
 

tdehtml/rendering/render_form.cpp

@@ -26,7 +26,7 @@
 #include <kcompletionbox.h>
 #include <kcursor.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kfind.h>
 #include <kfinddialog.h>
 #include <kiconloader.h>

tdehtml/tdehtml_ext.cpp

@@ -45,8 +45,8 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kprocess.h>
 #include <ktoolbarbutton.h>
 #include <ktoolbar.h>

tdehtml/tdehtml_ext.h

@@ -32,7 +32,7 @@
 #include <tqguardedptr.h>
 
 #include <kaction.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 /**
  * This is the BrowserExtension for a KHTMLPart document. Please see the KParts documentation for

tdehtml/tdehtml_iface.cc

@@ -22,7 +22,7 @@
 #include "tdehtml_part.h"
 #include "tdehtmlview.h"
 #include "tdehtml_ext.h"
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <tqapplication.h>
 #include <tqvariant.h>
 

tdehtml/tdehtml_part.cpp

@@ -75,9 +75,9 @@ using namespace DOM;
 #include <dcopref.h>
 #include <kstandarddirs.h>
 #include <kstringhandler.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kprotocolmanager.h>
 #include <kdebug.h>
 #include <kiconloader.h>
@@ -85,7 +85,7 @@ using namespace DOM;
 #include <kcharsets.h>
 #include <kmessagebox.h>
 #include <kstdaction.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <ktrader.h>
 #include <kdatastream.h>
 #include <ktempfile.h>
@@ -102,7 +102,7 @@ using namespace DOM;
 #include <ksslcertchain.h>
 #include <ksslinfodlg.h>
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kurifilter.h>
 #include <kstatusbar.h>
 #include <kurllabel.h>
@@ -1136,7 +1136,7 @@ void KHTMLPart::launchJSErrorDialog() {
 void KHTMLPart::launchJSConfigDialog() {
   TQStringList args;
   args << "tdehtml_java_js";
-  TDEApplication::tdeinitExec( "kcmshell", args );
+  TDEApplication::tdeinitExec( "tdecmshell", args );
 }
 
 TQVariant KHTMLPart::executeScript(const TQString& filename, int baseLine, const DOM::Node& n, const TQString& script)

tdehtml/tdehtml_run.cpp

@@ -22,7 +22,7 @@
  */
 #include "tdehtmlpart_p.h"
 #include "tdehtml_run.h"
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include "tdehtml_ext.h"

tdehtml/tdehtml_settings.cc

@@ -22,7 +22,7 @@
 #include "tdehtml_settings.h"
 #include "tdehtmldefaults.h"
 #include <kglobalsettings.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kdebug.h>

tdehtml/tdehtmlimage.cpp

@@ -29,7 +29,7 @@
 #include <tqvbox.h>
 #include <tqtimer.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kinstance.h>
 #include <kmimetype.h>
 #include <klocale.h>

tdehtml/tdemultipart/CMakeLists.txt

@@ -18,8 +18,8 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdehtml
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
   ${CMAKE_SOURCE_DIR}/tdeutils
 )
 

tdehtml/tdemultipart/Makefile.am

@@ -1,11 +1,11 @@
-INCLUDES = -I$(top_srcdir)/tdehtml -I$(top_srcdir)/kio/httpfilter -I$(top_srcdir)/tdeutils $(all_includes)
+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)/kio/httpfilter/libhttpfilter.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE) $(LIBZ)
+libtdemultipart_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/tdeio/httpfilter/libhttpfilter.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE) $(LIBZ)
 libtdemultipart_la_DEPENDENCIES = $(LIB_KPARTS)
 libtdemultipart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 

tdehtml/tdemultipart/tdemultipart.cpp

@@ -23,7 +23,7 @@
 #include <kinstance.h>
 #include <kmimetype.h>
 #include <klocale.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <tqfile.h>
 #include <ktempfile.h>
 #include <kmessagebox.h>

tdehtml/test_regression.cpp

@@ -62,7 +62,7 @@
 #include <kaction.h>
 #include <kcmdlineargs.h>
 #include "tdehtml_factory.h"
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kmainwindow.h>
 #include <ksimpleconfig.h>
 #include <kglobalsettings.h>

tdehtml/testtdehtml.cpp

@@ -30,7 +30,7 @@
 #include <kcmdlineargs.h>
 #include <kaction.h>
 #include "domtreeview.h"
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 static KCmdLineOptions options[] = { { "+file", "url to open", 0 } , KCmdLineLastOption };
 

tdehtml/xml/CMakeLists.txt

@@ -20,8 +20,8 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdehtml
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
   ${CMAKE_SOURCE_DIR}/tdewallet/client
   ${CMAKE_SOURCE_DIR}/tdeutils
 )

tdehtml/xml/Makefile.am

@@ -35,7 +35,7 @@ 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 \
+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)
 

tdehtml/xml/dom_docimpl.cpp

@@ -78,7 +78,7 @@
 #include "html/html_objectimpl.h"
 
 #include <kapplication.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include <stdlib.h>
 #include "dom_docimpl.h"

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 tdecmodule.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 tdesycoca-static kbookmarks-static kfile-static ${ELFICON_STATIC_LIB}
+  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}
 )

tdeio/DESIGN

@@ -1,8 +1,8 @@
 DESIGN:
 =======
 
-libkio uses kioslaves (separate processes) that handle a given protocol.
+libtdeio uses tdeioslaves (separate processes) that handle a given protocol.
-Launching those slaves is taken care of by the tdeinit/klauncher tandem,
+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

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.

tdeio/Makefile.am

@@ -20,16 +20,16 @@ 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 \
+libtdeio_la_LIBADD = kssl/libkssl.la tdeio/libtdeiocore.la \
-	kio/libtdesycoca.la bookmarks/libkbookmarks.la kfile/libkfile.la \
+	tdeio/libtdesycoca.la bookmarks/libkbookmarks.la tdefile/libtdefile.la \
 	../tdeui/libtdeui.la ../tdesu/libtdesu.la \
 	../tdewallet/client/libtdewalletclient.la \
 	$(LIBZ) $(LIBFAM) $(LIBVOLMGT) $(ACL_LIBS) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
@@ -37,13 +37,13 @@ libkio_la_LIBADD = kssl/libkssl.la kio/libkiocore.la \
 kde_mime_DATA = magic
 kde_servicetypes_DATA = application.desktop kurifilterplugin.desktop \
                         kcomprfilter.desktop kscan.desktop kdatatool.desktop \
-                        kfileplugin.desktop tdecmodule.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
+	$(EXTRACTRC) `find . ../tdeioslave -name "*.rc" -o -name "*.ui"` > rc.cpp
-	$(XGETTEXT) `find . ../kioslave -name "*.cpp" -o -name "*.cc" -o -name "*.h"` -o $(podir)/kio.pot
+	$(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

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}/tdeio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
-  ${CMAKE_SOURCE_DIR}/kio/kfile
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
 )
 
 

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
 

tdeio/bookmarks/kbookmarkbar.cc

@@ -31,7 +31,7 @@
 #include <ktoolbar.h>
 #include <ktoolbarbutton.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kpopupmenu.h>
 
 #include "kbookmarkdrag.h"

tdeio/bookmarks/kbookmarkimporter.cc

@@ -18,7 +18,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kstringhandler.h>
 #include <klocale.h>
 #include <kdebug.h>

tdeio/bookmarks/kbookmarkimporter_crash.cc

@@ -20,7 +20,7 @@
 
 #include "kbookmarkimporter_crash.h"
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kstringhandler.h>
 #include <klocale.h>
 #include <kdebug.h>

tdeio/bookmarks/kbookmarkimporter_ie.cc

@@ -18,7 +18,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kstringhandler.h>
 #include <klocale.h>
 #include <kdebug.h>

tdeio/bookmarks/kbookmarkimporter_kde1.cc

@@ -19,7 +19,7 @@
 */
 
 #include "kbookmarkimporter_kde1.h"
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kstringhandler.h>
 #include <klocale.h>
 #include <kdebug.h>

tdeio/bookmarks/kbookmarkimporter_ns.cc

@@ -23,7 +23,7 @@
 #include "kbookmarkimporter.h"
 #include "kbookmarkexporter.h"
 #include "kbookmarkmanager.h"
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kstringhandler.h>
 #include <klocale.h>
 #include <kdebug.h>

tdeio/bookmarks/kbookmarkimporter_opera.cc

@@ -18,7 +18,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kstringhandler.h>
 #include <klocale.h>
 #include <kdebug.h>

tdeio/bookmarks/kbookmarkmenu.cc

@@ -27,7 +27,7 @@
 #include "kbookmarkdrag.h"
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>

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

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
 )
 
 

tdeio/httpfilter/httpfilter.cc

@@ -17,7 +17,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 #include <klocale.h>
 

tdeio/kpasswdserver/CMakeLists.txt

@@ -19,7 +19,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
   ${CMAKE_SOURCE_DIR}/tdewallet/client
-  ${CMAKE_SOURCE_DIR}/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
 )
 
 link_directories(

tdeio/kpasswdserver/Makefile.am

@@ -1,5 +1,5 @@
 # $Id$
-# Makefile.am of tdebase/kioslave/http
+# Makefile.am of tdebase/tdeioslave/http
 
 INCLUDES= -I$(top_srcdir)/tdewallet/client $(all_includes)
 

tdeio/kpasswdserver/kpasswdserver.cpp

@@ -33,7 +33,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
-#include <kio/passdlg.h>
+#include <tdeio/passdlg.h>
 #include <tdewallet.h>
 
 #include "config.h"

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 {

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])

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>

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'.
 
 

tdeio/kssl/ksslinfodlg.cc

@@ -128,7 +128,7 @@ KSSLInfoDlg::~KSSLInfoDlg() {
 
 void KSSLInfoDlg::launchConfig() {
     TDEProcess p;
-    p << "kcmshell" << "crypto";
+    p << "tdecmshell" << "crypto";
     p.start(TDEProcess::DontCare);
 }
 

tdeio/kssl/ksslkeygen.cc

@@ -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);