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

10 years ago · de7e5867a6
1230 changed files with 1525 additions and 1542 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -22,7 +22,6 @@ set( VERSION "R14" )

 include( FindPkgConfig )
 include( CheckIncludeFile )
-include( CheckIncludeFiles )
 include( CheckCSourceRuns )
 include( CheckCXXSourceRuns )
 include( CheckCXXSourceCompiles )
@ -85,16 +84,15 @@ option( WITH_HAL "Enable HAL support" ${WITH_ALL_OPTIONS} )
 option( WITH_TDEHWLIB "Enable TDE hardware library support" OFF )
 option( WITH_UPOWER "Enable UPOWER support" ${WITH_ALL_OPTIONS} )
 option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
-option( WITH_KDESKTOP_LOCK_BACKTRACE "Enable backtrace in kdesktop_lock exception handler"  ${WITH_ALL_OPTIONS} )

 ##### options comments ##########################

-# WITH_SASL         affects kioslaves(kio_ldap kio_smtp kio_pop3)
-# WITH_LDAP         affects kioslaves(kio_ldap)
-# WITH_SAMBA        affects kioslaves(kio_samba) kcontrol
-# WITH_OPENEXR      affects kioslaves(thumbnail)
+# WITH_SASL         affects tdeioslaves(kio_ldap kio_smtp kio_pop3)
+# WITH_LDAP         affects tdeioslaves(kio_ldap)
+# WITH_SAMBA        affects tdeioslaves(kio_samba) kcontrol
+# WITH_OPENEXR      affects tdeioslaves(thumbnail)
 # WITH_XCOMPOSITE   affects twin kicker(taskmanager) tdm
-# WITH_XCURSOR      affects kioslaves(thumbnail), kcontrol(input), kdesktop
+# WITH_XCURSOR      affects tdeioslaves(thumbnail), kcontrol(input), kdesktop
 # WITH_XFIXES       affects twin klipper kicker(taskmanager)
 # WITH_XDAMAGE      affects <nothing>
 # WITH_XEXT         affects <nothing>
@ -113,8 +111,8 @@ option( WITH_KDESKTOP_LOCK_BACKTRACE "Enable backtrace in kdesktop_lock exceptio
 # WITH_XINERAMA     affects ksplashml
 # WITH_ARTS         affects libkonq khotkeys
 # WITH_I8K          affects ksysguard
-# WITH_HAL          affects kioslaves(media) ksmserver
-# WITH_TDEHWLIB     affects kioslaves(media), replaces WITH_HAL on systems without HAL
+# WITH_HAL          affects tdeioslaves(media) ksmserver
+# WITH_TDEHWLIB     affects tdeioslaves(media), replaces WITH_HAL on systems without HAL
 # WITH_LIBRAW1394   affects kcontrol(view1394)
 # WITH_PAM          affects tdm kdesktop kcheckpass
 # WITH_SHADOW       affects tdm kcheckpass
@ -145,7 +143,7 @@ option( BUILD_KCONTROL "Build kcontrol" ${BUILD_ALL} )
 option( BUILD_TWIN "Build twin" ${BUILD_ALL} )
 option( BUILD_KATE "Build kate" ${BUILD_ALL} )
 option( BUILD_KONQUEROR "Build konqueror" ${BUILD_ALL} )
-option( BUILD_KIOSLAVES "Build kioslaves" ${BUILD_ALL} )
+option( BUILD_KIOSLAVES "Build tdeioslaves" ${BUILD_ALL} )
 option( BUILD_KICKER "Build kicker" ${BUILD_ALL} )
 option( BUILD_KDESKTOP "Build kdesktop" ${BUILD_ALL} )
 option( BUILD_KONSOLE "Build konsole" ${BUILD_ALL} )
@ -223,7 +221,7 @@ add_subdirectory( kcontrol )
 tde_conditional_add_subdirectory( BUILD_TWIN twin )
 tde_conditional_add_subdirectory( BUILD_KATE kate )
 tde_conditional_add_subdirectory( BUILD_KONQUEROR konqueror )
-tde_conditional_add_subdirectory( BUILD_KIOSLAVES kioslave )
+tde_conditional_add_subdirectory( BUILD_KIOSLAVES tdeioslave )
 tde_conditional_add_subdirectory( BUILD_KICKER kicker )
 tde_conditional_add_subdirectory( BUILD_KDESKTOP kdesktop )
 tde_conditional_add_subdirectory( BUILD_KONSOLE konsole )
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@ -11,13 +11,13 @@

 tde_setup_architecture_flags( )

-# termios.h (tdm, kioslave)
+# termios.h (tdm, tdeioslave)
 if( BUILD_TDM OR BUILD_KIOSLAVES )
  check_include_file( termios.h HAVE_TERMIOS_H )
 endif( )


-# sys/ioctl.h (kioslave/fish, kcontrol/info)
+# sys/ioctl.h (tdeioslave/fish, kcontrol/info)
 if( BUILD_KIOSLAVES OR BUILD_KCONTROL )
  check_include_file( sys/ioctl.h HAVE_SYS_IOCTL_H )
 endif( )
@ -37,7 +37,7 @@ if( WITH_PAM AND (BUILD_KCHECKPASS OR BUILD_TDM) )
 endif( )


-# hal (ksmserver, kioslaves)
+# hal (ksmserver, tdeioslaves)
 if( WITH_HAL )
  pkg_search_module( HAL hal )
  if( NOT HAL_FOUND )
@ -80,7 +80,7 @@ if( WITH_XRENDER OR BUILD_KDESKTOP OR BUILD_KONSOLE OR BUILD_KCONTROL OR BUILD_K
 endif( )


-# xcursor (kioslave, kcontrol)
+# xcursor (tdeioslave, kcontrol)
 if( WITH_XCURSOR )
  pkg_search_module( XCURSOR xcursor )
  if( XCURSOR_FOUND )
@ -259,7 +259,7 @@ if( BUILD_TDM OR BUILD_KSMSERVER )
 endif( )


-# dbus-tqt (tdm, ksmserver, kioslaves(media))
+# dbus-tqt (tdm, ksmserver, tdeioslaves(media))
 if( BUILD_TDM OR BUILD_KSMSERVER OR (BUILD_KIOSLAVES AND WITH_HAL) )

  if( BUILD_KSMSERVER AND WITH_UPOWER )
--- a/2
+++ b/2
@ -78,7 +78,7 @@ libraries. Here is an overview of the directories:
 * kicker
    The panel at the botton with the K start button and the taskbar etc.

-* kioslave
+* tdeioslave
    Infrastructure that helps make every application internet enabled
    e.g. to directly save a file to ftp://place.org/dir/file.txt

--- a/applnk/compat/battery.desktop
+++ b/applnk/compat/battery.desktop
@ -69,6 +69,6 @@ Name[zu]=Ikhomputha ephathwayo eyisicaba
 X-TDE-ModuleType=Library
 X-TDE-Library=laptop
 X-TDE-FactoryName=battery
-Exec=kcmshell laptop
+Exec=tdecmshell laptop
 Icon=laptop_battery
 Type=Application
--- a/applnk/compat/bwarning.desktop
+++ b/applnk/compat/bwarning.desktop
@ -69,6 +69,6 @@ Name[zu]=Ikhomputha ephathwayo eyisicaba
 X-TDE-ModuleType=Library
 X-TDE-Library=laptop
 X-TDE-FactoryName=bwarning
-Exec=kcmshell laptop
+Exec=tdecmshell laptop
 Icon=laptop_battery
 Type=Application
--- a/applnk/compat/cwarning.desktop
+++ b/applnk/compat/cwarning.desktop
@ -69,6 +69,6 @@ Name[zu]=Ikhomputha ephathwayo eyisicaba
 X-TDE-ModuleType=Library
 X-TDE-Library=laptop
 X-TDE-FactoryName=cwarning
-Exec=kcmshell laptop
+Exec=tdecmshell laptop
 Icon=laptop_battery
 Type=Application
--- a/applnk/compat/email.desktop
+++ b/applnk/compat/email.desktop
@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=email
 Type=Application
-Exec=kcmshell kcm_useraccount
+Exec=tdecmshell kcm_useraccount
 DocPath=kcontrol/email/index.html
 X-TDE-ModuleType=Library
 X-TDE-Library=useraccount
--- a/applnk/compat/kcmkonq.desktop
+++ b/applnk/compat/kcmkonq.desktop
@ -88,4 +88,4 @@ X-TDE-Library=konq
 X-TDE-FactoryName=browser
 Type=Application
 Icon=kfm
-Exec=kcmshell filebrowser
+Exec=tdecmshell filebrowser
--- a/applnk/compat/kcmkxmlrpcd.desktop
+++ b/applnk/compat/kcmkxmlrpcd.desktop
@ -75,6 +75,6 @@ Name[zu]=TDE XML RPC Daemon
 X-TDE-ModuleType=Library
 X-TDE-Library=kded
 X-TDE-Factoryname=kded
-Exec=kcmshell kcmkded
+Exec=tdecmshell kcmkded
 Icon=kded
 Type=Application
--- a/applnk/compat/konqhtml.desktop
+++ b/applnk/compat/konqhtml.desktop
@ -77,7 +77,7 @@ Name[zh_CN]=Konqueror 浏览器
 Name[zh_TW]=Konqueror 網頁瀏覽器
 Type=Application
 Icon=fonts
-Exec=kcmshell tdehtml_fonts
+Exec=tdecmshell tdehtml_fonts
 X-TDE-ModuleType=Library
 X-TDE-Library=konqhtml
 X-TDE-FactoryName=tdehtml_fonts
--- a/applnk/compat/passwords.desktop
+++ b/applnk/compat/passwords.desktop
@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-Exec=kcmshell kcm_useraccount
+Exec=tdecmshell kcm_useraccount
 Icon=password
 DocPath=kcontrol/passwords/index.html
 NoDisplay=true
--- a/applnk/compat/power.desktop
+++ b/applnk/compat/power.desktop
@ -69,7 +69,7 @@ Name[zu]=Ikhomputha ephathwayo eyisicaba
 X-TDE-ModuleType=Library
 X-TDE-Library=laptop
 X-TDE-FactoryName=power
-Exec=kcmshell laptop
+Exec=tdecmshell laptop
 NoDisplay=true
 Icon=laptop_battery
 Type=Application
--- a/applnk/compat/socks.desktop
+++ b/applnk/compat/socks.desktop
@ -17,7 +17,7 @@ Name[ta]=துளைகள்
 Name[te]=సాక్స్
 Type=Application
 Icon=proxy
-Exec=kcmshell proxy
+Exec=tdecmshell proxy
 X-TDE-ModuleType=Library
 X-TDE-Library=kio
 X-TDE-FactoryName=proxy
--- a/applnk/compat/userinfo.desktop
+++ b/applnk/compat/userinfo.desktop
@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-Exec=kcmshell kcm_useraccount
+Exec=tdecmshell kcm_useraccount
 Icon=tdmconfig
 DocPath=kcontrol/userinfo/index.html

--- a/applnk/compat/virtualdesktops.desktop
+++ b/applnk/compat/virtualdesktops.desktop
@ -77,7 +77,7 @@ Name[zh_CN]=虚拟桌面
 Name[zh_TW]=多重桌面
 Type=Application
 Icon=desktop
-Exec=kcmshell desktop
+Exec=tdecmshell desktop
 X-TDE-ModuleType=Library
 X-TDE-Library=konq
 X-TDE-FactoryName=ddesktop
--- a/config.h.cmake
+++ b/config.h.cmake
@ -30,17 +30,17 @@
 // libart
 #cmakedefine HAVE_LIBART 1

-// tdm, kioslave
+// tdm, tdeioslave
 #cmakedefine HAVE_TERMIOS_H 1

-// kioslave/media
+// tdeioslave/media
 #cmakedefine WITH_HAL 1
 #ifdef WITH_HAL
 #define COMPILE_HALBACKEND
 #define COMPILE_LINUXCDPOLLING
 #endif

-// kioslave/media
+// tdeioslave/media
 #cmakedefine WITH_TDEHWLIB 1
 #ifdef WITH_TDEHWLIB
 // forcibly deactivate HAL support and substitute TDE hardware library support
@ -48,10 +48,10 @@
 #define COMPILE_TDEHARDWAREBACKEND
 #endif

-// kioslave/fish, kcontrol/info
+// tdeioslave/fish, kcontrol/info
 #cmakedefine HAVE_SYS_IOCTL_H 1

-// kioslave/smtp, kioslave/pop3
+// tdeioslave/smtp, tdeioslave/pop3
 #cmakedefine HAVE_LIBSASL2 1

 // tdm, kcontrol
@ -71,7 +71,7 @@
 // kio_smtp, ksysguard
 #cmakedefine kde_socklen_t @kde_socklen_t@

-// kfile_media
+// tdefile_media
 #cmakedefine HAVE_STATVFS

 // taskmanager
@ -121,7 +121,6 @@

 // kdesktop
 #cmakedefine KSCREENSAVER_PAM_SERVICE "@KSCREENSAVER_PAM_SERVICE@"
-#cmakedefine WITH_KDESKTOP_LOCK_BACKTRACE 1

 // tdm
 #cmakedefine XBINDIR "@XBINDIR@"
--- a/configure.in.in
+++ b/configure.in.in
@ -239,7 +239,7 @@ KDE_EXPAND_MAKEVAR(KDE_BINDIR, kde_bindir)
 AC_DEFINE_UNQUOTED(KDE_BINDIR, "$KDE_BINDIR", [KDE's binaries directory])
 AC_SUBST(KDE_BINDIR)

-dnl libart is used by tdm, kcontrol and thumbnails code in kioslaves
+dnl libart is used by tdm, kcontrol and thumbnails code in tdeioslaves
 KDE_FIND_PATH(libart2-config, LIBART_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
  AC_MSG_WARN([Could not find libart anywhere, check http://www.levien.com/libart/])
 ])
--- a/doc/faq/panel.docbook
+++ b/doc/faq/panel.docbook
@ -45,7 +45,7 @@ select Menus, then inside the TDE Menu grouping, select the TDE Menu button icon
 User modifications to the &kmenu; are stored in
 <filename>$<envar>HOME</envar>/.config/menus/applications-kmenuedit.menu</filename>.
 Try moving this file out of the way and then issuing the
-command <userinput><command>kbuildsycoca</command>
+command <userinput><command>tdebuildsycoca</command>
 <option>--noincremental</option></userinput>. This should restore you to the
 default system menus. If that is the case you'll have to recreate your customized menu.
 </para>
--- a/doc/glossary/index.docbook
+++ b/doc/glossary/index.docbook
@ -48,7 +48,7 @@ Slave</glossseealso>
 				configuration cache which, for example, guarantees fast access to the menu
 				entries.</para>
 				<glossseealso 
-otherterm="gloss-kbuildsycoca"><application>KBuildSycoca</application></glossseealso>
+otherterm="gloss-tdebuildsycoca"><application>KBuildSycoca</application></glossseealso>
 			</glossdef>
 		</glossentry>
 	</glossdiv>
@ -80,7 +80,7 @@ otherterm="gloss-kbuildsycoca"><application>KBuildSycoca</application></glosssee

 	<glossdiv id="glossdiv-applications">
 		<title>Applications</title>
-		<glossentry id="gloss-kbuildsycoca">
+		<glossentry id="gloss-tdebuildsycoca">
 			<glossterm><application>KBuildSycoca</application></glossterm>
 			<glossdef><para><application>KBuildSycoca</application> is a command line 
 program and regenerates the
--- a/doc/glossary/tdeprintingglossary.docbook
+++ b/doc/glossary/tdeprintingglossary.docbook
@ -1127,7 +1127,7 @@ now.
                        </glossdef>
                </glossentry>

-                <glossentry id="gloss-printkioslave">
+                <glossentry id="gloss-printtdeioslave">
                        <glossterm>print:/ KIO Slave</glossterm>
                        <glossdef><para>You can use a syntax of "print:/..." to get quick access
 				to TDEPrint resources. Typing "print:/manager" as a Konqueror URL
--- a/doc/kcontrol/filemanager/index.docbook
+++ b/doc/kcontrol/filemanager/index.docbook
@ -155,7 +155,7 @@ download.</para>
 <screenshot>
  <screeninfo>Download Dialog Box</screeninfo>
  <mediaobject>
-  <imageobject><imagedata fileref="kfileman2.png"
+  <imageobject><imagedata fileref="tdefileman2.png"
 format="PNG"/></imageobject>
  <textobject> <phrase>Download Dialog Box</phrase> </textobject>
  <caption>
@ -173,7 +173,7 @@ together under a single dialog box.</para>
 <screenshot>
  <screeninfo>Download Dialog Box</screeninfo>
  <mediaobject>
-  <imageobject><imagedata fileref="kfileman1.png"
+  <imageobject><imagedata fileref="tdefileman1.png"
 format="PNG"/></imageobject>
  <textobject><phrase>Download Dialog Box</phrase></textobject>
  <caption>
--- a/doc/kcontrol/filemanager/tdefileman1.png
+++ b/doc/kcontrol/filemanager/tdefileman1.png
--- a/doc/kcontrol/filemanager/tdefileman2.png
+++ b/doc/kcontrol/filemanager/tdefileman2.png
--- a/doc/kcontrol/index.docbook
+++ b/doc/kcontrol/index.docbook
@ -308,7 +308,7 @@ the control center.
 <title>Running Individual Modules</title>

 <para>
-You can run individual modules without running kcontrol using the command <command>kcmshell</command> from &konsole;. Type <userinput> <command>kcmshell</command><option> --list</option></userinput> to see a list of the available &kcontrolcenter; modules. You can also access individual &kcontrolcenter; modules through adding the <guilabel>Preferences</guilabel> button to either &kicker; or the &kmenu; through their respective configuration dialogs.
+You can run individual modules without running kcontrol using the command <command>tdecmshell</command> from &konsole;. Type <userinput> <command>tdecmshell</command><option> --list</option></userinput> to see a list of the available &kcontrolcenter; modules. You can also access individual &kcontrolcenter; modules through adding the <guilabel>Preferences</guilabel> button to either &kicker; or the &kmenu; through their respective configuration dialogs.
 </para>

 </sect1>
--- a/doc/kcontrol/proxy/index.docbook
+++ b/doc/kcontrol/proxy/index.docbook
@ -172,7 +172,7 @@ ask for a username or password if it needs to.</para>
 <para>The other option is <guilabel>Use automatic login</guilabel>.
 Select this option if you have already set up a login entry for your
 proxy server in the
-<filename>$<envar>TDEDIR</envar>/share/config/kionetrc</filename>
+<filename>$<envar>TDEDIR</envar>/share/config/tdeionetrc</filename>
 file.</para>

 </sect2>
--- a/doc/kicker/index.docbook
+++ b/doc/kicker/index.docbook
@ -2346,7 +2346,7 @@ Why is my <guisubmenu>Settings</guisubmenu> menu not working?
 <answer>
 <para>
 Your menu entries may be mixed up for some reason. Simply run
-<command>kbuildsycoca</command> on a commandline.
+<command>tdebuildsycoca</command> on a commandline.
 </para>
 </answer>
 </qandaentry>
--- a/doc/konqueror/browser.docbook
+++ b/doc/konqueror/browser.docbook
@ -446,15 +446,15 @@ just add a key line
 <screen><userinput>
 OverridenPorts=CommaSeparatedListOfAllowedPorts
 </userinput></screen>
-to <filename>$TDEDIR/share/config/kio_httprc
+to <filename>$TDEDIR/share/config/tdeio_httprc
 </filename> or 
-<filename>~/.trinity/share/config/kio_httprc</filename>.</para>
+<filename>~/.trinity/share/config/tdeio_httprc</filename>.</para>
 <para>For example
 <screen><userinput>OverridenPorts=23,15
 </userinput></screen> 
 (it should not include any embedded spaces).</para>
 <para>&konqueror; will reject the following ports (the list is hardcoded in 
-<filename>tdelibs/kio/kio/job.cpp</filename>):</para>
+<filename>tdelibs/tdeio/tdeio/job.cpp</filename>):</para>
 <para>
 1, 7, 9, 11, 13, 15, 17, 19,
 20, 21, 22, 23, 25, 37, 42, 43,
--- a/doc/ksplashml/index.docbook
+++ b/doc/ksplashml/index.docbook
@ -1084,7 +1084,7 @@ appropriate plugin.</para>
 #include &lt;qwidget.h&gt;

 #include &lt;kapplication.h&gt;
-#include &lt;kconfig.h&gt;
+#include &lt;tdeconfig.h&gt;
 #include &lt;kdebug.h&gt;
 #include &lt;kdialogbase.h&gt;
 #include &lt;kgenericfactory.h&gt;
--- a/doc/kxkb/index.docbook
+++ b/doc/kxkb/index.docbook
@ -83,7 +83,7 @@ list.</para>
 configuration by selecting <guimenuitem>Configure...</guimenuitem> or
 by opening <application>Control Center</application> and selecting
 Localization/Keyboard Layout. Alternatively, you can start it by
-typing <command>kcmshell keyboard_layout</command> in a
+typing <command>tdecmshell keyboard_layout</command> in a
 terminal.</para>

 </sect1>
--- a/doc/tdeioslave/CMakeLists.txt
+++ b/doc/tdeioslave/CMakeLists.txt
@ -9,4 +9,4 @@
 #
 #################################################

-tde_create_handbook( DESTINATION kioslave )
+tde_create_handbook( DESTINATION tdeioslave )
--- a/doc/tdeioslave/Makefile.am
+++ b/doc/tdeioslave/Makefile.am
--- a/doc/tdeioslave/bzip.docbook
+++ b/doc/tdeioslave/bzip.docbook
@ -11,19 +11,19 @@
 used today, having been replaced with bzip2, which offers much better
 compression.</para>

-<para>The bzip kioslave is not directly usable, and is intended for use
-as a filter.  For example, the tar kioslave can filter a file through
-the bzip kioslave, in order to display the contents of a <literal
+<para>The bzip tdeioslave is not directly usable, and is intended for use
+as a filter.  For example, the tar tdeioslave can filter a file through
+the bzip tdeioslave, in order to display the contents of a <literal
 role="extension">tar.bz</literal> file directly in a &konqueror;
 window.</para>

 <para>If you click on a file compressed with a <literal
-role="extension">bz</literal> extension in &konqueror;, this kioslave is
+role="extension">bz</literal> extension in &konqueror;, this tdeioslave is
 used to uncompress it and display it as a normal (uncompressed)
 file.</para>

 <para>If you are a developer, and would like to use the bzip filter,
-you can find documentation on using kioslaves at <ulink
+you can find documentation on using tdeioslaves at <ulink
 url="http://developer.kde.org">http://developer.kde.org</ulink></para>

 </article>
--- a/doc/tdeioslave/bzip2.docbook
+++ b/doc/tdeioslave/bzip2.docbook
@ -9,18 +9,18 @@

 <para>Bzip2 is a compression program</para>

-<para>The bzip2 kioslave is not directly usable, and is intended for use
-as a filter.  For example, the tar kioslave can filter a file through
-the bzip2 kioslave, in order to display the contents of a <literal
+<para>The bzip2 tdeioslave is not directly usable, and is intended for use
+as a filter.  For example, the tar tdeioslave can filter a file through
+the bzip2 tdeioslave, in order to display the contents of a <literal
 role="extension">tar.bz2</literal> file directly in a &konqueror;
 window.</para>

 <para>If you click on a file compressed with a <literal
-role="extension">.bz2</literal> in &konqueror;, this kioslave is used to
+role="extension">.bz2</literal> in &konqueror;, this tdeioslave is used to
 uncompress it and display it as a normal (uncompressed) file.</para>

 <para>If you are a developer, and would like to use the bzip2 filter,
-you can find documentation on using kioslaves at <ulink
+you can find documentation on using tdeioslaves at <ulink
 url="http://developer.kde.org">http://developer.kde.org</ulink></para>

 <para> See the manual: <ulink url="man:/bzip2">bzip2</ulink>.
--- a/doc/tdeioslave/cgi.docbook
+++ b/doc/tdeioslave/cgi.docbook
--- a/doc/tdeioslave/data.docbook
+++ b/doc/tdeioslave/data.docbook
--- a/doc/tdeioslave/file.docbook
+++ b/doc/tdeioslave/file.docbook
--- a/doc/tdeioslave/finger.docbook
+++ b/doc/tdeioslave/finger.docbook
@ -24,7 +24,7 @@ you may find that you get no useful answer for most people.</para>
 hold such information as <acronym>PGP</acronym> keys, the fact they are
 on vacation, and all sorts of information.</para>

-<para>Use the finger kioslave like this:
+<para>Use the finger tdeioslave like this:
 <userinput>finger://<replaceable>username</replaceable>@<replaceable>hostname</replaceable></userinput></para>

 <para> See the manual: <ulink url="man:/finger">finger</ulink>.
--- a/doc/tdeioslave/fish.docbook
+++ b/doc/tdeioslave/fish.docbook
@ -14,7 +14,7 @@

 <para>Allows you to access another computer's files using the SEcure Shell (<acronym>SSH</acronym>) protocol.  The remote computer needs to be running the <acronym>SSH</acronym> daemon, but the remainder of the protocol uses standard commandline tools as discussed below.</para>

-<para>You can use the fish kioslave like this:
+<para>You can use the fish tdeioslave like this:
 <userinput>fish://<replaceable>hostname</replaceable></userinput> or <userinput>fish://<replaceable>username</replaceable>@<replaceable>hostname</replaceable></userinput>.</para>

 <note><para>You need to use double forward slashes.</para></note>
--- a/doc/tdeioslave/floppy.docbook
+++ b/doc/tdeioslave/floppy.docbook
--- a/doc/tdeioslave/ftp.docbook
+++ b/doc/tdeioslave/ftp.docbook
--- a/doc/tdeioslave/gopher.docbook
+++ b/doc/tdeioslave/gopher.docbook
--- a/doc/tdeioslave/gzip.docbook
+++ b/doc/tdeioslave/gzip.docbook
@ -9,19 +9,19 @@

 <para><command>gzip</command> is a compression program</para>

-<para>The gzip kioslave is not directly usable, and is intended for use
-as a filter.  For example, the tar kioslave can filter a file through
-the gzip kioslave, in order to display the contents of a <literal
+<para>The gzip tdeioslave is not directly usable, and is intended for use
+as a filter.  For example, the tar tdeioslave can filter a file through
+the gzip tdeioslave, in order to display the contents of a <literal
 role="extension">tar.gz</literal> file directly in a &konqueror;
 window.</para>

 <para>If you click on a file compressed with a <literal
-role="extension">gz</literal> extension in &konqueror;, this kioslave is
+role="extension">gz</literal> extension in &konqueror;, this tdeioslave is
 used to uncompress it and display it as a normal (uncompressed)
 file.</para>

 <para>If you are a developer, and would like to use the gzip filter, you
-can find documentation on using kioslaves at <ulink
+can find documentation on using tdeioslaves at <ulink
 url="http://developer.kde.org">http://developer.kde.org</ulink></para>

 <para> See the manual: <ulink url="man:/gzip">gzip</ulink>.
--- a/doc/tdeioslave/help.docbook
+++ b/doc/tdeioslave/help.docbook
--- a/doc/tdeioslave/http.docbook
+++ b/doc/tdeioslave/http.docbook
@ -11,11 +11,11 @@
 <emphasis>H</emphasis>yper<emphasis>T</emphasis>ext
 <emphasis>T</emphasis>ransfer <emphasis>P</emphasis>rotocol.</para>

-<para>The http kioslave is used by all &tde; applications to handle
+<para>The http tdeioslave is used by all &tde; applications to handle
 connections to http servers, that is, web servers.  The most common
 usage is to view web pages in the &konqueror; web browser.</para>

-<para>You can use the http kioslave in &konqueror; by giving it a
+<para>You can use the http tdeioslave in &konqueror; by giving it a
 <acronym>URL</acronym>.  
 <userinput>http://<replaceable>www.kde.org</replaceable></userinput>.</para>

--- a/doc/tdeioslave/https.docbook
+++ b/doc/tdeioslave/https.docbook
@ -8,7 +8,7 @@
 </articleinfo>
 <para>
 HTTPS is 
-<ulink url="help:/kioslave/http.html">HTTP</ulink>
+<ulink url="help:/tdeioslave/http.html">HTTP</ulink>
 encapsulated in an SSL/TLS stream.
 </para>
 <para>
--- a/doc/tdeioslave/imap.docbook
+++ b/doc/tdeioslave/imap.docbook
@ -19,7 +19,7 @@ everywhere. Messages can be stored on the server, retrieved from there or
 moved between folders.</para>

 <para>This plugin is currently mainly used by KMail, but you can also use it
-in any other KDE application that uses kioslave plugins.</para>
+in any other KDE application that uses tdeioslave plugins.</para>

 <para>For example in &konqueror;, simply type
 <userinput>imap://username@your.mail.server/</userinput> to get your IMAP
--- a/doc/tdeioslave/imaps.docbook
+++ b/doc/tdeioslave/imaps.docbook
@ -11,7 +11,7 @@
 
 </articleinfo>

-<para>IMAPS is the <ulink url="help:/kioslave/imap.html">IMAP</ulink> protocol
+<para>IMAPS is the <ulink url="help:/tdeioslave/imap.html">IMAP</ulink> protocol
 encrypted via SSL.</para>

 </article>
--- a/doc/tdeioslave/index.docbook
+++ b/doc/tdeioslave/index.docbook
--- a/doc/tdeioslave/info.docbook
+++ b/doc/tdeioslave/info.docbook
--- a/doc/tdeioslave/lan.docbook
+++ b/doc/tdeioslave/lan.docbook
@ -12,7 +12,7 @@ This protocol is intended to provide a kind of <quote>network
 neighborhood</quote> but only relying on the TCP/IP protocol stack and with 
 the ability to use other protocols than just <acronym>SMB</acronym>.</para>

-<para>The lan kioslave can use &FTP;, &HTTP;, <acronym>SMB</acronym>, 
+<para>The lan tdeioslave can use &FTP;, &HTTP;, <acronym>SMB</acronym>, 
 <acronym>NFS</acronym>, and <acronym>FISH</acronym></para>

 <para>It must first be configured in &kcontrol;, 
--- a/doc/tdeioslave/ldap.docbook
+++ b/doc/tdeioslave/ldap.docbook
@ -11,7 +11,7 @@
 protocol.  It provides access to an X.500 directory, or to a stand-alone
 <acronym>LDAP</acronym> server.</para>

-<para>You can use the ldap kioslave as follows:</para>
+<para>You can use the ldap tdeioslave as follows:</para>

 <para><userinput>ldap://host:port/ou=People,o=where,c=de??sub</userinput>
 for a subtree-query</para>
--- a/doc/tdeioslave/mac.docbook
+++ b/doc/tdeioslave/mac.docbook
--- a/doc/tdeioslave/mailto.docbook
+++ b/doc/tdeioslave/mailto.docbook
@ -6,7 +6,7 @@
 <!-- TRANS:ROLES_OF_TRANSLATORS -->
 </authorgroup>
 </articleinfo>
-<para>The mailto kioslave is used when you click on a mailto link in an
+<para>The mailto tdeioslave is used when you click on a mailto link in an
 <acronym>HTML</acronym> page.  &konqueror; will open the preferred mail
 client you have configured, with a composer window.  Any information
 supplied in the <acronym>URL</acronym> will be filled in for you.</para>
--- a/doc/tdeioslave/man.docbook
+++ b/doc/tdeioslave/man.docbook
--- a/doc/tdeioslave/mrml.docbook
+++ b/doc/tdeioslave/mrml.docbook
--- a/doc/tdeioslave/news.docbook
+++ b/doc/tdeioslave/news.docbook
@ -8,7 +8,7 @@
 </articleinfo>


-<para>The news kioslave is used when you click on a news link on a web
+<para>The news tdeioslave is used when you click on a news link on a web
 page.  It will open &knode;, and if the group referred to in the news
 link is available from your server, it will subscribe you to the group, in
 the first available account you have configured in &knode;</para>
--- a/doc/tdeioslave/nfs.docbook
+++ b/doc/tdeioslave/nfs.docbook
--- a/doc/tdeioslave/nntp.docbook
+++ b/doc/tdeioslave/nntp.docbook
@ -6,10 +6,10 @@
 <!-- TRANS:ROLES_OF_TRANSLATORS -->
 </authorgroup>
 </articleinfo>
-<para>The nntp kioslave accesses <acronym>NNTP</acronym> servers
+<para>The nntp tdeioslave accesses <acronym>NNTP</acronym> servers
 directly.</para>

-<para>This kioslave can not be used with servers that do not implement
+<para>This tdeioslave can not be used with servers that do not implement
 the <command>GROUP</command> command, including some versions of the
 popular <application>INN</application> news server which is often used
 by <acronym>ISP</acronym>s.  It does work with
@ -17,7 +17,7 @@ by <acronym>ISP</acronym>s.  It does work with
 offline cache of news articles on their own hard drive or within their
 <acronym>LAN</acronym>.</para>

-<para>You can use the nntp kioslave by typing
+<para>You can use the nntp tdeioslave by typing
 <userinput>nntp://yourserver/groupname</userinput> into the &konqueror;
 <acronym>URL</acronym> bar.</para>

--- a/doc/tdeioslave/pop3.docbook
+++ b/doc/tdeioslave/pop3.docbook
--- a/doc/tdeioslave/pop3s.docbook
+++ b/doc/tdeioslave/pop3s.docbook
--- a/doc/tdeioslave/print.docbook
+++ b/doc/tdeioslave/print.docbook
@ -54,7 +54,7 @@ and a short explanation of what they represent:</para>

 <varlistentry>
 <term><userinput>print:/ </userinput> (&ie; the root of 
-print-kioslave)</term>
+print-tdeioslave)</term>
 <listitem>
 <para>  virtual root for browsing your print subsystem.
        It displays subfolders <quote>Classes</quote>,
--- a/doc/tdeioslave/rlan.docbook
+++ b/doc/tdeioslave/rlan.docbook
--- a/doc/tdeioslave/rlogin.docbook
+++ b/doc/tdeioslave/rlogin.docbook
@ -9,14 +9,14 @@
 <para>Using &konqueror; you can start up an <command>rlogin</command>
 session with a server hosting the rlogin service.</para>

-<para>To use this kioslave feature, in the &konqueror;
+<para>To use this tdeioslave feature, in the &konqueror;
 <acronym>URL</acronym> bar, type
 <userinput>rlogin:/host_to_connect_to</userinput></para>

 <para>This will initialize &konsole; with an <command>rlogin</command>
 session, prompting you for your password.</para>

-<para>The <command>rlogin</command> kioslave uses the username of the
+<para>The <command>rlogin</command> tdeioslave uses the username of the
 account you are currently using in &tde;.</para>

 <para>After you have successfully entered your password, you can begin
--- a/doc/tdeioslave/sftp.docbook
+++ b/doc/tdeioslave/sftp.docbook
--- a/doc/tdeioslave/smb.docbook
+++ b/doc/tdeioslave/smb.docbook
@ -41,7 +41,7 @@ You can set your default user name and password in the &kcontrol; in
 <menuchoice><guisubmenu>Network</guisubmenu><guimenuitem>Windows
 Shares</guimenuitem></menuchoice>.  This is especially useful if you are a
 member of a &Windows; <acronym>NT</acronym> domain. There you can also set your
-workgroup name, but in most cases this is not required.  The kioslave will ask for your username and password if a default is not set.
+workgroup name, but in most cases this is not required.  The tdeioslave will ask for your username and password if a default is not set.
 </para>

 <para>
--- a/doc/tdeioslave/smtp.docbook
+++ b/doc/tdeioslave/smtp.docbook
--- a/doc/tdeioslave/tar.docbook
+++ b/doc/tdeioslave/tar.docbook
--- a/doc/tdeioslave/telnet.docbook
+++ b/doc/tdeioslave/telnet.docbook
--- a/doc/tdeioslave/thumbnail.docbook
+++ b/doc/tdeioslave/thumbnail.docbook
@ -6,23 +6,23 @@
 <!-- TRANS:ROLES_OF_TRANSLATORS -->
 </authorgroup>
 </articleinfo>
-<para>The thumbnail kioslave is used by &tde; for network transparent
+<para>The thumbnail tdeioslave is used by &tde; for network transparent
 and persistent generation of thumbnails.</para>

-<para>The thumbnail kioslave uses plugins to generate the actual
+<para>The thumbnail tdeioslave uses plugins to generate the actual
 thumbnails.  You can enable viewing of these thumbnails from the
 <menuchoice><guimenu>View</guimenu>
 <guisubmenu>Preview</guisubmenu></menuchoice> submenu, available in
 &konqueror; in file manager mode.</para>

-<para>The thumbnail kioslave is not directly useful to a user, but if
+<para>The thumbnail tdeioslave is not directly useful to a user, but if
 you are a developer, you can use it within your own applications to
 create file previews.</para>

 <para>See the documentation in the sources for more information.  You
 will find these at
-<filename>$<envar>TDEDIR</envar>/include/kio/thumbcreator.h</filename> or
+<filename>$<envar>TDEDIR</envar>/include/tdeio/thumbcreator.h</filename> or
 in the source folder <filename
-class="directory">tdebase/kioslave/thumbnail</filename></para>
+class="directory">tdebase/tdeioslave/thumbnail</filename></para>

 </article>
--- a/doc/tdeioslave/webdav.docbook
+++ b/doc/tdeioslave/webdav.docbook
@ -13,7 +13,7 @@
 <emphasis>A</emphasis>uthoring and <emphasis>V</emphasis>ersioning
 protocol for the World Wide Web. It allows for easy management of
 documents and scripts on a <ulink
-url="help:/kioslave/webdav.html">http</ulink> server, and has
+url="help:/tdeioslave/webdav.html">http</ulink> server, and has
 additional features designed to simplify version management amongst
 multiple authors.</para>

@ -60,6 +60,6 @@ such as the author.</para>
 <para>To take advantage of these additional capabilities, you will need an
 application which supports them. No application currently supports them 
 through
-this kioslave.</para>
+this tdeioslave.</para>

 </article>
--- a/doc/tdeioslave/webdavs.docbook
+++ b/doc/tdeioslave/webdavs.docbook
@ -11,7 +11,7 @@

 </articleinfo>

-<para>WebDAVS is the <ulink url="help:/kioslave/webdav.html">WebDAV</ulink> protocol
+<para>WebDAVS is the <ulink url="help:/tdeioslave/webdav.html">WebDAV</ulink> protocol
 encrypted via SSL.</para>

 </article>
--- a/doc/tdeprint/highlights.docbook
+++ b/doc/tdeprint/highlights.docbook
@ -369,7 +369,7 @@ functions that were provided by <application>qtcups</application> and
 <para>Instead of <command>qtcups</command> you can now use the
 <command>kprinter</command> command.  And in place of
 <command>kups</command> you will probably use
-<command>kcmshell printers</command> from now on.
+<command>tdecmshell printers</command> from now on.
 </para>

 <para>The &tdeprint; module for &CUPS; also lets you fully administer
--- a/doc/tdeprint/tech-overview.docbook
+++ b/doc/tdeprint/tech-overview.docbook
@ -220,7 +220,7 @@ you switch to other parts of the &kcontrol;</para></listitem>

 <listitem><para>from a command line (&konsole; or
 mini-<acronym>CLI</acronym>) type <userinput>
-<command>kcmshell</command> <option>printers</option></userinput>.
+<command>tdecmshell</command> <option>printers</option></userinput>.
 This opens just the &tdeprint; part of &kcontrol; to change your settings
 </para></listitem>
 </itemizedlist>
--- a/doc/userguide/groupware-kontact.docbook
+++ b/doc/userguide/groupware-kontact.docbook
@ -335,7 +335,7 @@ slow data updates.</para>

 <para>Now we have to tell &kontact; to use <acronym>IMAP</acronym> as the
 data source for it's various components. From the &kmenu;, choose
-<guimenuitem>Run command</guimenuitem>, run <userinput><command>kcmshell
+<guimenuitem>Run command</guimenuitem>, run <userinput><command>tdecmshell
 tderesources</command></userinput>. In the combo box select
 <guilabel>Contacts</guilabel>, then press the <guibutton>Add...</guibutton>
 button, and choose <guilabel>Addressbook on IMAP Server via KMail</guilabel>. Then select that new line and
--- a/doc/userguide/tde-for-admins.docbook
+++ b/doc/userguide/tde-for-admins.docbook
@ -830,7 +830,7 @@ Running...</computeroutput>. The arguments after <command>tdeinit</command>
 are the names of additional processes to be started.  The <token>+</token>
 indicates that <command>tdeinit</command> needs to wait till the process has
 finished.  <command>tdeinit</command> also starts
-<command>dcopserver</command>, <command>klauncher</command> and
+<command>dcopserver</command>, <command>tdelauncher</command> and
 <command>kded</command>.</para>

 <para>The second of the two lines asks <command>tdeinit</command> to start
@ -871,11 +871,11 @@ needed</para>
 </varlistentry>

 <varlistentry>
-<term><command>klauncher</command></term>
+<term><command>tdelauncher</command></term>
 <listitem><para>Program launch (this is <emphasis>not</emphasis> the
 <keycombo action="simul">&Alt;<keycap>F2</keycap>
 </keycombo>dialog!)</para>
-<para>See <xref linkend="klauncher"/> for more information.</para>
+<para>See <xref linkend="tdelauncher"/> for more information.</para>
 </listitem>
 </varlistentry>

@ -916,7 +916,7 @@ to see the actual program name:</para>
 <computeroutput>
 waba     23184  0.2  2.1 23428 11124 ?	S    21:41   0:00 tdeinit: Running...
 waba     23187  0.1  2.1 23200 11124 ?	S    21:41   0:00 tdeinit: dcopserver --nosid
-waba     23189  0.2  2.4 25136 12496 ?	S    21:41   0:00 tdeinit: klauncher
+waba     23189  0.2  2.4 25136 12496 ?	S    21:41   0:00 tdeinit: tdelauncher
 waba     23192  0.7  2.8 25596 14772 ?	S    21:41   0:00 tdeinit: kded
 waba     23203  0.8  3.4 31516 17892 ?	S    21:41   0:00 tdeinit:
 knotify
@ -928,7 +928,7 @@ master <command>tdeinit</command> process. The other processes listed are
 programs started as <acronym>KLM</acronym>s.</para>

 <para>When <command>tdeinit</command> starts for the first time it will
-launch <command>dcopserver</command>, <command>klauncher</command>, and
+launch <command>dcopserver</command>, <command>tdelauncher</command>, and
 <command>kded</command>, as well as any additional programs specified on its
 command line in the <command>starttde</command> script, normally
 <command>kcminit</command> and <command>knotify</command>.</para>
@ -980,7 +980,7 @@ applications or services via the <varname>X-TDE-Init</varname> line:</para>
 <programlisting>
 [Desktop Entry]
 Encoding=UTF-8
-Exec=kcmshell energy
+Exec=tdecmshell energy