200 files changed, 409 insertions, 409 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8f41314b..88808fd4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,7 +51,7 @@ tde_setup_paths( )
 ##### user requested modules ####################
 
 option( BUILD_ALL "Build all" OFF )
-option( BUILD_KFILEREPLACE "Build kfilereplace" ${BUILD_ALL} )
+option( BUILD_KFILEREPLACE "Build tdefilereplace" ${BUILD_ALL} )
 option( BUILD_QUANTA "Build quanta" ${BUILD_ALL} )
 
 
@@ -78,7 +78,7 @@ if( BUILD_QUANTA )
   add_subdirectory( lib )
 endif( )
 
-tde_conditional_add_subdirectory( BUILD_KFILEREPLACE kfilereplace )
+tde_conditional_add_subdirectory( BUILD_KFILEREPLACE tdefilereplace )
 tde_conditional_add_subdirectory( BUILD_QUANTA quanta )
 
 
diff --git a/doc/quanta/adv-quanta.docbook b/doc/quanta/adv-quanta.docbook
index 5aefad44..432bc81c 100644
--- a/doc/quanta/adv-quanta.docbook
+++ b/doc/quanta/adv-quanta.docbook
@@ -210,7 +210,7 @@ This application lacks flexibility. Sorry, we will do better next time.
 
 </sect1>
 
-<!-- <sect1 id="kfilereplace-3-2">
+<!-- <sect1 id="tdefilereplace-3-2">
 <title>KFileReplace</title>
 
 <para>
diff --git a/doc/kfilereplace/Makefile.am b/doc/tdefilereplace/Makefile.am
index e97402c7..e97402c7 100644
--- a/doc/kfilereplace/Makefile.am
+++ b/doc/tdefilereplace/Makefile.am
diff --git a/doc/kfilereplace/addstringsdialog_window.png b/doc/tdefilereplace/addstringsdialog_window.png
index 7d6aeee7..7d6aeee7 100644
--- a/doc/kfilereplace/addstringsdialog_window.png
+++ b/doc/tdefilereplace/addstringsdialog_window.png
diff --git a/doc/kfilereplace/backup_option.png b/doc/tdefilereplace/backup_option.png
index a0e1e02f..a0e1e02f 100644
--- a/doc/kfilereplace/backup_option.png
+++ b/doc/tdefilereplace/backup_option.png
diff --git a/doc/kfilereplace/casesensitive_option.png b/doc/tdefilereplace/casesensitive_option.png
index 6302c0f2..6302c0f2 100644
--- a/doc/kfilereplace/casesensitive_option.png
+++ b/doc/tdefilereplace/casesensitive_option.png
diff --git a/doc/kfilereplace/command_option.png b/doc/tdefilereplace/command_option.png
index 1da3688b..1da3688b 100644
--- a/doc/kfilereplace/command_option.png
+++ b/doc/tdefilereplace/command_option.png
diff --git a/doc/kfilereplace/edit.png b/doc/tdefilereplace/edit.png
index ce8b2267..ce8b2267 100644
--- a/doc/kfilereplace/edit.png
+++ b/doc/tdefilereplace/edit.png
diff --git a/doc/kfilereplace/edit_add.png b/doc/tdefilereplace/edit_add.png
index c46aed2b..c46aed2b 100644
--- a/doc/kfilereplace/edit_add.png
+++ b/doc/tdefilereplace/edit_add.png
diff --git a/doc/kfilereplace/edit_remove.png b/doc/tdefilereplace/edit_remove.png
index 1a2f87c5..1a2f87c5 100644
--- a/doc/kfilereplace/edit_remove.png
+++ b/doc/tdefilereplace/edit_remove.png
diff --git a/doc/kfilereplace/eraser.png b/doc/tdefilereplace/eraser.png
index 33775463..33775463 100644
--- a/doc/kfilereplace/eraser.png
+++ b/doc/tdefilereplace/eraser.png
diff --git a/doc/kfilereplace/filereplace.png b/doc/tdefilereplace/filereplace.png
index c3692e11..c3692e11 100644
--- a/doc/kfilereplace/filereplace.png
+++ b/doc/tdefilereplace/filereplace.png
diff --git a/doc/kfilereplace/filesearch.png b/doc/tdefilereplace/filesearch.png
index 1be59c49..1be59c49 100644
--- a/doc/kfilereplace/filesearch.png
+++ b/doc/tdefilereplace/filesearch.png
diff --git a/doc/kfilereplace/filesimulate.png b/doc/tdefilereplace/filesimulate.png
index 7cc5b284..7cc5b284 100644
--- a/doc/kfilereplace/filesimulate.png
+++ b/doc/tdefilereplace/filesimulate.png
diff --git a/doc/kfilereplace/index.docbook b/doc/tdefilereplace/index.docbook
index 9f769f32..021dc70e 100644
--- a/doc/kfilereplace/index.docbook
+++ b/doc/tdefilereplace/index.docbook
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kfilereplace "<application>KFileReplace</application>">
-  <!ENTITY kappname "&kfilereplace;">
+  <!ENTITY tdefilereplace "<application>KFileReplace</application>">
+  <!ENTITY kappname "&tdefilereplace;">
   <!ENTITY package "tdewebdev">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE">
@@ -12,7 +12,7 @@
 <book lang="&language;">
 
 <bookinfo>
-<title>The &kfilereplace; Handbook</title>
+<title>The &tdefilereplace; Handbook</title>
 
 <authorgroup>
 <author>
@@ -41,7 +41,7 @@
 
 <abstract>
 <para>
-&kfilereplace; is an utility to search and replace strings.
+&tdefilereplace; is an utility to search and replace strings.
 </para>
 </abstract>
 
@@ -57,34 +57,34 @@
 
 <chapter id="introduction">
  <title>Introduction</title>
-  <para>&kfilereplace; is an application used to search and replace a list of strings in a file tree. The strings may be literal or Qt-like regular expressions. There are also other options to tune your search.
+  <para>&tdefilereplace; is an application used to search and replace a list of strings in a file tree. The strings may be literal or Qt-like regular expressions. There are also other options to tune your search.
   </para>
 </chapter>
 
-<chapter id="using-kfilereplace">
-<title>Using &kfilereplace;</title>
+<chapter id="using-tdefilereplace">
+<title>Using &tdefilereplace;</title>
 
 <para>
  <screenshot>
-  <screeninfo>&kfilereplace; in its standalone incarnation</screeninfo>
+  <screeninfo>&tdefilereplace; in its standalone incarnation</screeninfo>
    <mediaobject>
     <imageobject>
      <imagedata fileref="kfr_standalone_main_window_1.png" format="PNG"/>
     </imageobject>
     <textobject>
-     <phrase>&kfilereplace; in its standalone incarnation</phrase>
+     <phrase>&tdefilereplace; in its standalone incarnation</phrase>
     </textobject>
    </mediaobject>
  </screenshot>
 </para>
 
 
-<sect1 id="kfilereplace-the-toolbar">
+<sect1 id="tdefilereplace-the-toolbar">
 <title>The Toolbar</title>
 
-<para>The &kfilereplace; toolbar should looks like this:
+<para>The &tdefilereplace; toolbar should looks like this:
  <screenshot>
-  <screeninfo>&kfilereplace;'s toolbar</screeninfo>
+  <screeninfo>&tdefilereplace;'s toolbar</screeninfo>
    <mediaobject>
     <imageobject>
      <imagedata fileref="toolbar.png" format="PNG"/>
@@ -93,7 +93,7 @@
      <imagedata fileref="toolbar.eps" format="EPS"/>
     </imageobject>
     <textobject>
-     <phrase>&kfilereplace;'s toolbar</phrase>
+     <phrase>&tdefilereplace;'s toolbar</phrase>
     </textobject>
    </mediaobject>
  </screenshot>
@@ -111,7 +111,7 @@
         </imageobject>
        </inlinemediaobject><guiicon>New session</guiicon></term>
     <listitem>
-     <para>This button shows a <link linkend="kfilereplace-the-project-dialog">session dialog</link> in which you can set several basic options; if &kfilereplace; run as standalone application you should click this button as first step.</para>
+     <para>This button shows a <link linkend="tdefilereplace-the-project-dialog">session dialog</link> in which you can set several basic options; if &tdefilereplace; run as standalone application you should click this button as first step.</para>
     </listitem>
    </varlistentry>
 
@@ -135,7 +135,7 @@
       </imageobject>
      </inlinemediaobject><guiicon>Replace</guiicon></term>
     <listitem>
-     <para>This button starts a search&amp;replace loop. When a string has been found, &kfilereplace; replaces it with another string.</para>
+     <para>This button starts a search&amp;replace loop. When a string has been found, &tdefilereplace; replaces it with another string.</para>
     </listitem>
    </varlistentry>
 
@@ -171,7 +171,7 @@
        </imageobject>
       </inlinemediaobject><guiicon>Add Strings</guiicon></term>
      <listitem>
-       <para>This button opens the <link linkend="kfilereplace-the-add-dialog">Add Strings</link> dialog in which you can edit your string list.</para>
+       <para>This button opens the <link linkend="tdefilereplace-the-add-dialog">Add Strings</link> dialog in which you can edit your string list.</para>
      </listitem>
    </varlistentry>
 
@@ -231,7 +231,7 @@
        </imageobject>
       </inlinemediaobject><guiicon>Load String List</guiicon></term>
      <listitem>
-       <para>This button loads a <link linkend="kfilereplace-the-kfr-file">string list</link> saved in a xml file with a <literal role="extension">kfr</literal> extension.</para>
+       <para>This button loads a <link linkend="tdefilereplace-the-kfr-file">string list</link> saved in a xml file with a <literal role="extension">kfr</literal> extension.</para>
      </listitem>
    </varlistentry>
 
@@ -255,7 +255,7 @@
        </imageobject>
       </inlinemediaobject><guiicon>Make Backup Files</guiicon></term>
      <listitem>
-       <para>This button enables generation of <link linkend="kfilereplace-backup-file">backup</link> files.</para>
+       <para>This button enables generation of <link linkend="tdefilereplace-backup-file">backup</link> files.</para>
      </listitem>
    </varlistentry>
 
@@ -279,7 +279,7 @@
        </imageobject>
       </inlinemediaobject><guiicon>Commands</guiicon></term>
      <listitem>
-       <para>This button enables commands capability. Commands are special strings. See <xref linkend="kfilereplace-commands"/>.</para>
+       <para>This button enables commands capability. Commands are special strings. See <xref linkend="tdefilereplace-commands"/>.</para>
      </listitem>
    </varlistentry>
 
@@ -291,7 +291,7 @@
        </imageobject>
       </inlinemediaobject><guiicon>Regular expressions</guiicon></term>
      <listitem>
-       <para>This button enables <link linkend="kfilereplace-QT-regexp">Qt-like regular expressions</link>.</para>
+       <para>This button enables <link linkend="tdefilereplace-QT-regexp">Qt-like regular expressions</link>.</para>
      </listitem>
    </varlistentry>
 
@@ -300,10 +300,10 @@
 
 </sect1>
 
-<sect1 id="kfilereplace-the-results-view">
+<sect1 id="tdefilereplace-the-results-view">
   <title>The Results List</title>
     <screenshot>
-      <screeninfo>&kfilereplace;'s Results view</screeninfo>
+      <screeninfo>&tdefilereplace;'s Results view</screeninfo>
       <mediaobject>
         <imageobject>
           <imagedata fileref="results_view.png" format="PNG"/>
@@ -312,7 +312,7 @@
           <imagedata fileref="results_view.eps" format="EPS"/>
         </imageobject>
         <textobject>
-          <phrase>&kfilereplace;'s Results view</phrase>
+          <phrase>&tdefilereplace;'s Results view</phrase>
         </textobject>
       </mediaobject>
     </screenshot>
@@ -320,18 +320,18 @@
 
 </sect1>
 
-<sect1 id="kfilereplace-the-strings-view">
+<sect1 id="tdefilereplace-the-strings-view">
   <title>The String List</title>
 
   <para>This is the <guilabel>Strings</guilabel> view:
     <screenshot>
-      <screeninfo>&kfilereplace;'s Strings view</screeninfo>
+      <screeninfo>&tdefilereplace;'s Strings view</screeninfo>
       <mediaobject>
         <imageobject>
           <imagedata fileref="strings_view.png" format="PNG"/>
         </imageobject>
         <textobject>
-          <phrase>&kfilereplace;'s Strings view</phrase>
+          <phrase>&tdefilereplace;'s Strings view</phrase>
         </textobject>
       </mediaobject>
     </screenshot>
@@ -341,53 +341,53 @@
 
 </sect1>
 
-<sect1 id="kfilereplace-the-project-dialog">
+<sect1 id="tdefilereplace-the-project-dialog">
  <title>The <guilabel>New Session</guilabel> Dialog</title>
- <para>The <guilabel>New Session</guilabel> dialog is used to setup the basic parameters needed by &kfilereplace; to work. It consists of two tabs, <guilabel>General</guilabel> and <guilabel>Advanced</guilabel>.
+ <para>The <guilabel>New Session</guilabel> dialog is used to setup the basic parameters needed by &tdefilereplace; to work. It consists of two tabs, <guilabel>General</guilabel> and <guilabel>Advanced</guilabel>.
  </para>
 
- <sect2 id="kfilereplace-the-project-dialog-general-page">
+ <sect2 id="tdefilereplace-the-project-dialog-general-page">
    <title>The <guilabel>General</guilabel> Tab</title>
     <screenshot>
-     <screeninfo>&kfilereplace; General tab</screeninfo>
+     <screeninfo>&tdefilereplace; General tab</screeninfo>
      <mediaobject>
       <imageobject>
        <imagedata fileref="projectdialog_main_window_1.png" format="PNG"/>
       </imageobject>
       <textobject>
-       <phrase>&kfilereplace; General tab</phrase>
+       <phrase>&tdefilereplace; General tab</phrase>
       </textobject>
      </mediaobject>
     </screenshot>
-   <para>When you want to begin a new session the first step is to click on the <link linkend="kfilereplace-the-toolbar"><guiicon>New Session</guiicon> button</link>. Then you must enter the base path and a sequence of shell-like wildcards to use as filter.</para>
+   <para>When you want to begin a new session the first step is to click on the <link linkend="tdefilereplace-the-toolbar"><guiicon>New Session</guiicon> button</link>. Then you must enter the base path and a sequence of shell-like wildcards to use as filter.</para>
    <para>Then you could set some useful options, like searching in all the subfolders, doing a case-sensitive search, enabling commands and/or regular expressions<footnote id="performancewarning"><para>Please note that regular expressions and commands could slow down the speed performances.</para></footnote>, doing a backup copy of each file before replacing.</para>
    <para>If you want to start searching, you can put a string in the search box and press <guibutton>Search Now</guibutton>, otherwise leave the search box empty and press <guibutton>Search Later</guibutton>.</para>
  </sect2>
 
- <sect2 id="kfilereplace-the-project-dialog-advanced-page">
+ <sect2 id="tdefilereplace-the-project-dialog-advanced-page">
    <title>The <guilabel>Advanced</guilabel> Tab</title>
      <screenshot>
-       <screeninfo>&kfilereplace; Advanced tab</screeninfo>
+       <screeninfo>&tdefilereplace; Advanced tab</screeninfo>
        <mediaobject>
          <imageobject>
            <imagedata fileref="projectdialog_main_window_2.png" format="PNG"/>
          </imageobject>
          <textobject>
-           <phrase>&kfilereplace; Advanced tab</phrase>
+           <phrase>&tdefilereplace; Advanced tab</phrase>
          </textobject>
        </mediaobject>
      </screenshot>
-   <para>The <guilabel>Advanced</guilabel> tab allows you to set up some useful options to restrict the search to a subset of your target file tree. If you want to run &kfilereplace; only over files that have a size in the range of 10KB - 100KB, then you could use the size options. There is also a date option that restricts the search in a temporal range, and a last option that allows you to only search for files owned (or not owned) by a particular user (this may be more useful to the system administrators).</para>
+   <para>The <guilabel>Advanced</guilabel> tab allows you to set up some useful options to restrict the search to a subset of your target file tree. If you want to run &tdefilereplace; only over files that have a size in the range of 10KB - 100KB, then you could use the size options. There is also a date option that restricts the search in a temporal range, and a last option that allows you to only search for files owned (or not owned) by a particular user (this may be more useful to the system administrators).</para>
  </sect2>
 </sect1>
 
-<sect1 id="kfilereplace-the-options-dialog">
+<sect1 id="tdefilereplace-the-options-dialog">
  <title>The <guilabel>Options</guilabel> Dialog</title>
  <para>This dialog contains options that are in the toolbar and extra options that may come in handy in some situations. You can invoke it selecting <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure KFileReplace...</guimenuitem></menuchoice> in the main menu.
  </para>
- <sect2 id="kfilereplace-the-options-dialog-general-page">
+ <sect2 id="tdefilereplace-the-options-dialog-general-page">
   <title>General options</title>
-  <para>These options have been presented in the <link linkend="kfilereplace-the-toolbar">Toolbar</link> section.
+  <para>These options have been presented in the <link linkend="tdefilereplace-the-toolbar">Toolbar</link> section.
    <screenshot>
        <screeninfo>The General tab of the Options window</screeninfo>
        <mediaobject>
@@ -401,7 +401,7 @@
      </screenshot>
   </para>
  </sect2>
- <sect2 id="kfilereplace-the-options-dialog-advanced-page">
+ <sect2 id="tdefilereplace-the-options-dialog-advanced-page">
   <title>Advanced options</title>
   <para>
     <screenshot>
@@ -422,7 +422,7 @@
        <segtitle>Ignore hidden files and directories</segtitle>
        <seglistitem>
 	 <seg>shows only the files that match some of your strings. This will speed up the search.</seg>
-	 <seg>&kfilereplace; will stop when it finds a matching string, and will continue to search for other strings or, if you search for only one string, it will continue with the next file.</seg>
+	 <seg>&tdefilereplace; will stop when it finds a matching string, and will continue to search for other strings or, if you search for only one string, it will continue with the next file.</seg>
 	 <seg>if a file is a link to another one, then search in the real file.</seg>
 	 <seg>if hidden files or folders are encountered, ignore them.</seg>
        </seglistitem>
@@ -430,16 +430,16 @@
   </para>
  </sect2>
 </sect1>
-<sect1 id="kfilereplace-the-add-dialog">
+<sect1 id="tdefilereplace-the-add-dialog">
  <title>The <guilabel>Add Strings</guilabel> Dialog</title>
     <screenshot>
-      <screeninfo>&kfilereplace;'s Add Strings dialog</screeninfo>
+      <screeninfo>&tdefilereplace;'s Add Strings dialog</screeninfo>
       <mediaobject>
 	<imageobject>
 	  <imagedata fileref="addstringsdialog_window.png" format="PNG"/>
 	</imageobject>
 	<textobject>
-	  <phrase>&kfilereplace;'s Add Strings dialog</phrase>
+	  <phrase>&tdefilereplace;'s Add Strings dialog</phrase>
 	</textobject>
       </mediaobject>
      </screenshot>
@@ -447,10 +447,10 @@
 </sect1>
 </chapter>
 
-<chapter id="kfilereplace-features">
- <title>&kfilereplace; features</title>
- <para>This chapter provides informations about some useful capabilities of &kfilereplace;.</para>
- <sect1 id="kfilereplace-the-kfr-file">
+<chapter id="tdefilereplace-features">
+ <title>&tdefilereplace; features</title>
+ <para>This chapter provides informations about some useful capabilities of &tdefilereplace;.</para>
+ <sect1 id="tdefilereplace-the-kfr-file">
   <title>How to save your string list</title>
   <para>When you want to reuse a list of strings you can save it in a <literal role="extension">xml</literal> file. To do this select from the menubar <menuchoice><guimenu>Search/Replace</guimenu><guisubmenu>Strings</guisubmenu><guimenuitem>Save Strings List to File</guimenuitem></menuchoice>. When you save a list, a simple <literal role="extension">xml</literal> file with extension <literal role="extension">kfr</literal> is created. To load a <literal role="extension">kfr</literal> file select from menubar <menuchoice><guimenu>Search/Replace</guimenu><guisubmenu>Strings</guisubmenu><guimenuitem>Load Strings List from File</guimenuitem></menuchoice>. The actual file looks like this:</para>
   <screen>
@@ -474,14 +474,14 @@
 
 &lt;/kfr></screen>
 
-  <para>If you are using a previous format, you can update by hand your file by simply modifying it according to the above scheme. Alternatively, you can load the file written in the old format and save it again with &kfilereplace; in the way explained before.</para>
+  <para>If you are using a previous format, you can update by hand your file by simply modifying it according to the above scheme. Alternatively, you can load the file written in the old format and save it again with &tdefilereplace; in the way explained before.</para>
 </sect1>
 
-<sect1 id="kfilereplace-the-report-file">
+<sect1 id="tdefilereplace-the-report-file">
   <title>How to Create a Simple Report</title>
   <para>You can create a report by choosing <menuchoice><guimenu>Search/Replace</guimenu><guisubmenu>Results</guisubmenu><guimenuitem>Create Report File</guimenuitem></menuchoice> from the main menu. A report is a folder containing an <literal role="extension">xml</literal> and a <literal role="extension">css</literal> file. Reports may be useful to maintain a simple log of your operations.
     <screenshot>
-      <screeninfo>&kfilereplace;'s Report feature</screeninfo>
+      <screeninfo>&tdefilereplace;'s Report feature</screeninfo>
       <mediaobject>
 	<imageobject>
 	  <imagedata fileref="report_example.png" format="PNG"/>
@@ -490,44 +490,44 @@
 	  <imagedata fileref="report_example.eps" format="EPS"/>
 	</imageobject>
 	<textobject>
-	  <phrase>&kfilereplace;'s Report feature</phrase>
+	  <phrase>&tdefilereplace;'s Report feature</phrase>
 	</textobject>
       </mediaobject>
     </screenshot>
   </para>
 </sect1>
 
-<sect1 id="kfilereplace-QT-regexp">
+<sect1 id="tdefilereplace-QT-regexp">
  <title>How to use Regular Expressions</title>
   <para>
-    If you want search for every string that starts with <quote>x</quote>, <quote>ht</quote> or <quote>u</quote> and ends with <quote>ml</quote>, you can write a regular expression like this: <userinput>(x|ht|u)ml</userinput>. Insert this expression in the search editor, click <guibutton>OK</guibutton>, and enable regular expressions by toggling the <link linkend="kfilereplace-the-toolbar"><guibutton>Regular Expression</guibutton> button</link>. Please note that using regular expressions lets you to make very complicated searches, but the cost could be a performance degradation. Regular expression can be very tricky, and it is often the case that <quote>if you want to solve a problem with a regular expression, you have two problems</quote>.</para>
+    If you want search for every string that starts with <quote>x</quote>, <quote>ht</quote> or <quote>u</quote> and ends with <quote>ml</quote>, you can write a regular expression like this: <userinput>(x|ht|u)ml</userinput>. Insert this expression in the search editor, click <guibutton>OK</guibutton>, and enable regular expressions by toggling the <link linkend="tdefilereplace-the-toolbar"><guibutton>Regular Expression</guibutton> button</link>. Please note that using regular expressions lets you to make very complicated searches, but the cost could be a performance degradation. Regular expression can be very tricky, and it is often the case that <quote>if you want to solve a problem with a regular expression, you have two problems</quote>.</para>
 </sect1>
 
-<sect1 id="kfilereplace-backup-file">
+<sect1 id="tdefilereplace-backup-file">
   <title>How to Protect Original Files</title>
-  <para>If you do not want to lose your original files, you can make a copy of them before replacing the strings. After inserting your strings, and before starting the replacement process, you have just to toggle the <link linkend="kfilereplace-the-toolbar"><guiicon>Backup</guiicon> button</link>. If you want to customize the extension of the backup files open the <link linkend="kfilereplace-the-options-dialog"><guilabel>Options</guilabel> dialog</link>.
+  <para>If you do not want to lose your original files, you can make a copy of them before replacing the strings. After inserting your strings, and before starting the replacement process, you have just to toggle the <link linkend="tdefilereplace-the-toolbar"><guiicon>Backup</guiicon> button</link>. If you want to customize the extension of the backup files open the <link linkend="tdefilereplace-the-options-dialog"><guilabel>Options</guilabel> dialog</link>.
   </para>
 </sect1>
 
-<sect1 id="kfilereplace-open-file">
+<sect1 id="tdefilereplace-open-file">
   <title>How to Open a File</title>
-  <para>If you want to open a file that matches some of your strings, you have to select a line in the result view and click on it with the &RMB;. A context menu will appear from which you can open the file. If you use &kfilereplace; embedded in &quantaplus;, you can open the file directly in it at the specified line and column.</para>
+  <para>If you want to open a file that matches some of your strings, you have to select a line in the result view and click on it with the &RMB;. A context menu will appear from which you can open the file. If you use &tdefilereplace; embedded in &quantaplus;, you can open the file directly in it at the specified line and column.</para>
 </sect1>
 
-<sect1 id="kfilereplace-commands">
+<sect1 id="tdefilereplace-commands">
  <title>Commands</title>
-  <para>Suppose you want replace the phrase <quote>Alice's adventures in Wonderland</quote> with the <ulink url="http://www.textlibrary.com/download/alice-wo.txt">entire file that contains Carroll's novel</ulink>. Probably you don't want to do this by hand, what you need is a command that will do it for you. Click the <link linkend="kfilereplace-the-toolbar"><guiicon>Add</guiicon></link> button, select <guilabel>Search and Replace Mode</guilabel> and insert the following strings: <userinput>Alice's adventure in Wonderland</userinput> in the search mini-editor and the string <userinput>[$loadfile:<replaceable>/the-path-to-my-folder/my-folder/my-file</replaceable>$]</userinput> in the replacement mini-editor. Click <guibutton>OK</guibutton>. When you come back to the &kfilereplace; main window, toggle the <link linkend="kfilereplace-the-toolbar">Command action</link> button that enables the commands, and start the replacement process. There are also other commands, see <xref linkend="available-commands"/> for a list of all of them.</para>
+  <para>Suppose you want replace the phrase <quote>Alice's adventures in Wonderland</quote> with the <ulink url="http://www.textlibrary.com/download/alice-wo.txt">entire file that contains Carroll's novel</ulink>. Probably you don't want to do this by hand, what you need is a command that will do it for you. Click the <link linkend="tdefilereplace-the-toolbar"><guiicon>Add</guiicon></link> button, select <guilabel>Search and Replace Mode</guilabel> and insert the following strings: <userinput>Alice's adventure in Wonderland</userinput> in the search mini-editor and the string <userinput>[$loadfile:<replaceable>/the-path-to-my-folder/my-folder/my-file</replaceable>$]</userinput> in the replacement mini-editor. Click <guibutton>OK</guibutton>. When you come back to the &tdefilereplace; main window, toggle the <link linkend="tdefilereplace-the-toolbar">Command action</link> button that enables the commands, and start the replacement process. There are also other commands, see <xref linkend="available-commands"/> for a list of all of them.</para>
 </sect1>
 </chapter>
 
 <chapter id="credits">
 <title>Credits and License</title>
 
-<para>&kfilereplace;. Program copyright 1999 by François Dupoux <email>dupoux&#64;dupoux&#46;com</email>, 2003 Andras Mantia <email>amantia&#64;kde&#46;org</email>, 2004 Emiliano Gulmini <email>emi_barbarossa&#64;yahoo&#46;it</email>
+<para>&tdefilereplace;. Program copyright 1999 by François Dupoux <email>dupoux&#64;dupoux&#46;com</email>, 2003 Andras Mantia <email>amantia&#64;kde&#46;org</email>, 2004 Emiliano Gulmini <email>emi_barbarossa&#64;yahoo&#46;it</email>
 </para>
 
 <variablelist>
-  <title>The &kfilereplace; authors and maintainers:</title>
+  <title>The &tdefilereplace; authors and maintainers:</title>
   <varlistentry>
     <term>François Dupoux <email>dupoux&#64;dupoux&#46;com</email></term>
     <listitem><para>Original author</para></listitem>
@@ -556,10 +556,10 @@ Documentation Copyright &copy; 2004 Emiliano Gulmini <email>emi_barbarossa&#64;y
 <appendix id="installation">
 <title>Installation</title>
 
-<sect1 id="getting-kfilereplace">
-<title>How to install &kfilereplace;</title>
+<sect1 id="getting-tdefilereplace">
+<title>How to install &tdefilereplace;</title>
 <para>
-&kfilereplace; is currently part of &tdewebdev; package, so, in order to install it, you have to get a copy of &tdewebdev;. Note that if you are using a &kde; installation provided by your OS vendor, probably you already have &tdewebdev; installed; in this case, you can use &kfilereplace; either by opening &quantaplus; Web editor, or by calling it directly (unless you have an old &kde; version). Else you can download the &tdewebdev; package from the Internet: please refer to <ulink url="http://tdewebdev.org">&tdewebdev; home site</ulink> for more information.
+&tdefilereplace; is currently part of &tdewebdev; package, so, in order to install it, you have to get a copy of &tdewebdev;. Note that if you are using a &kde; installation provided by your OS vendor, probably you already have &tdewebdev; installed; in this case, you can use &tdefilereplace; either by opening &quantaplus; Web editor, or by calling it directly (unless you have an old &kde; version). Else you can download the &tdewebdev; package from the Internet: please refer to <ulink url="http://tdewebdev.org">&tdewebdev; home site</ulink> for more information.
 <!--&install.intro.documentation;-->
 </para>
 
@@ -573,7 +573,7 @@ Documentation Copyright &copy; 2004 Emiliano Gulmini <email>emi_barbarossa&#64;y
 </appendix>
 
 <appendix id="available-commands">
- <title>&kfilereplace; commands</title>
+ <title>&tdefilereplace; commands</title>
  <para>
    <segmentedlist>
      <segtitle>[$datetime:iso$]</segtitle>
diff --git a/doc/kfilereplace/invert.png b/doc/tdefilereplace/invert.png
index f3ab8be6..f3ab8be6 100644
--- a/doc/kfilereplace/invert.png
+++ b/doc/tdefilereplace/invert.png
diff --git a/doc/kfilereplace/kfr_standalone_main_window_1.png b/doc/tdefilereplace/kfr_standalone_main_window_1.png
index 3e4f85db..3e4f85db 100644
--- a/doc/kfilereplace/kfr_standalone_main_window_1.png
+++ b/doc/tdefilereplace/kfr_standalone_main_window_1.png
diff --git a/doc/kfilereplace/optionsdialog_main_window_1.png b/doc/tdefilereplace/optionsdialog_main_window_1.png
index 959c3977..959c3977 100644
--- a/doc/kfilereplace/optionsdialog_main_window_1.png
+++ b/doc/tdefilereplace/optionsdialog_main_window_1.png
diff --git a/doc/kfilereplace/optionsdialog_main_window_2.png b/doc/tdefilereplace/optionsdialog_main_window_2.png
index 3213b6ff..3213b6ff 100644
--- a/doc/kfilereplace/optionsdialog_main_window_2.png
+++ b/doc/tdefilereplace/optionsdialog_main_window_2.png
diff --git a/doc/kfilereplace/project.png b/doc/tdefilereplace/project.png
index 607e6aa8..607e6aa8 100644
--- a/doc/kfilereplace/project.png
+++ b/doc/tdefilereplace/project.png
diff --git a/doc/kfilereplace/projectdialog_main_window_1.png b/doc/tdefilereplace/projectdialog_main_window_1.png
index 58c622f0..58c622f0 100644
--- a/doc/kfilereplace/projectdialog_main_window_1.png
+++ b/doc/tdefilereplace/projectdialog_main_window_1.png
diff --git a/doc/kfilereplace/projectdialog_main_window_2.png b/doc/tdefilereplace/projectdialog_main_window_2.png
index 6fe2cb98..6fe2cb98 100644
--- a/doc/kfilereplace/projectdialog_main_window_2.png
+++ b/doc/tdefilereplace/projectdialog_main_window_2.png
diff --git a/doc/kfilereplace/recursive_option.png b/doc/tdefilereplace/recursive_option.png
index bc98df90..bc98df90 100644
--- a/doc/kfilereplace/recursive_option.png
+++ b/doc/tdefilereplace/recursive_option.png
diff --git a/doc/kfilereplace/regularexpression_option.png b/doc/tdefilereplace/regularexpression_option.png
index f74c7b56..f74c7b56 100644
--- a/doc/kfilereplace/regularexpression_option.png
+++ b/doc/tdefilereplace/regularexpression_option.png
diff --git a/doc/kfilereplace/report_example.png b/doc/tdefilereplace/report_example.png
index 359de5ab..359de5ab 100644
--- a/doc/kfilereplace/report_example.png
+++ b/doc/tdefilereplace/report_example.png
diff --git a/doc/kfilereplace/results_view.png b/doc/tdefilereplace/results_view.png
index 8f91469d..8f91469d 100644
--- a/doc/kfilereplace/results_view.png
+++ b/doc/tdefilereplace/results_view.png
diff --git a/doc/kfilereplace/stop.png b/doc/tdefilereplace/stop.png
index 73b27d9f..73b27d9f 100644
--- a/doc/kfilereplace/stop.png
+++ b/doc/tdefilereplace/stop.png
diff --git a/doc/kfilereplace/strings_view.png b/doc/tdefilereplace/strings_view.png
index 7396e53c..7396e53c 100644
--- a/doc/kfilereplace/strings_view.png
+++ b/doc/tdefilereplace/strings_view.png
diff --git a/doc/kfilereplace/toolbar.png b/doc/tdefilereplace/toolbar.png
index 84e699eb..84e699eb 100644
--- a/doc/kfilereplace/toolbar.png
+++ b/doc/tdefilereplace/toolbar.png
diff --git a/doc/kfilereplace/unsortedList.png b/doc/tdefilereplace/unsortedList.png
index bed281f1..bed281f1 100644
--- a/doc/kfilereplace/unsortedList.png
+++ b/doc/tdefilereplace/unsortedList.png
diff --git a/kfilereplace/CMakeLists.txt b/kfilereplace/CMakeLists.txt
deleted file mode 100644
index 2ca35794..00000000
--- a/kfilereplace/CMakeLists.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-#################################################
-#
-#  (C) 2010-2011 Serghei Amelian
-#  serghei (DOT) amelian (AT) gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
-
-add_subdirectory( toolbar )
-
-include_directories(
-  ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_BINARY_DIR}
-  ${TDE_INCLUDE_DIR}
-  ${TQT_INCLUDE_DIRS}
-)
-
-link_directories(
-  ${TQT_LIBRARY_DIRS}
-)
-
-
-##### other data ################################
-
-tde_install_icons( )
-install( FILES kfilereplace.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
-install( FILES kfilereplacepart.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kfilereplacepartui.rc DESTINATION ${DATA_INSTALL_DIR}/kfilereplacepart )
-install( FILES kfilereplaceui.rc DESTINATION ${DATA_INSTALL_DIR}/kfilereplace )
-
-
-##### libkfilereplacepart (module) ##############
-
-tde_add_kpart( libkfilereplacepart AUTOMOC
-  SOURCES
-    commandengine.cpp configurationclasses.cpp
-    kfilereplacepart.cpp kfilereplaceview.cpp
-    kfilereplaceviewwdg.ui kaddstringdlg.cpp kaddstringdlgs.ui
-    knewprojectdlg.cpp knewprojectdlgs.ui koptionsdlg.cpp
-    koptionsdlgs.ui kfilereplacelib.cpp report.cpp
-  LINK kio-shared tdeparts-shared
-  DESTINATION ${PLUGIN_INSTALL_DIR}
-)
-
-
-##### kfilereplace (executable) #################
-
-tde_add_executable( kfilereplace AUTOMOC
-  SOURCES
-    kfilereplace.cpp main.cpp
-  LINK kio-shared tdeparts-shared
-  DESTINATION ${BIN_INSTALL_DIR}
-)
diff --git a/kfilereplace/Makefile.am b/kfilereplace/Makefile.am
deleted file mode 100644
index 4e0d8ed1..00000000
--- a/kfilereplace/Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
-## Makefile.am for kfilereplace
-
-# set the include path for X, qt and KDE
-INCLUDES  = $(all_includes)
-
-# this has all of the subdirectories that make will recurse into.  if
-# there are none, comment this out
-SUBDIRS = toolbar
-
-# these are the headers for your project
-noinst_HEADERS = kaddstringdlg.h kfilereplaceiface.h kfilereplacelib.h \
-	knewprojectdlg.h kfilereplaceview.h koptionsdlg.h report.h commandengine.h \
-	configurationclasses.h kfilereplace.h
-		 
-# let automoc handle all of the meta source files (moc)
-METASOURCES = AUTO
-
-kde_module_LTLIBRARIES = libkfilereplacepart.la
-libkfilereplacepart_la_SOURCES = kfilereplacepart.cpp kfilereplaceview.cpp \
-	kfilereplaceviewwdg.ui kaddstringdlg.cpp kaddstringdlgs.ui knewprojectdlg.cpp \
-	knewprojectdlgs.ui koptionsdlg.cpp koptionsdlgs.ui kfilereplacelib.cpp report.cpp \
-	commandengine.cpp configurationclasses.cpp
-				  
-libkfilereplacepart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts -lDCOP
-libkfilereplacepart_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KHTML)
-
-messages: rc.cpp
-	$(XGETTEXT) *.cpp *.h -o $(podir)/kfilereplace.pot
-
-KDE_ICON = AUTO
-kde_services_DATA = kfilereplacepart.desktop
-xdg_apps_DATA = kfilereplace.desktop
-
-# this is where the XML-GUI resource file goes
-partrcdir = $(kde_datadir)/kfilereplacepart
-partrc_DATA = kfilereplacepartui.rc
-
-shellrcdir = $(kde_datadir)/kfilereplace
-shellrc_DATA = kfilereplaceui.rc
-bin_PROGRAMS = kfilereplace
-kfilereplace_LDFLAGS = $(KDE_RPATH) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts -lDCOP
-kfilereplace_LDADD = $(LIB_KPARTS)
-kfilereplace_SOURCES = kfilereplace.cpp main.cpp
diff --git a/kfilereplace/toolbar/Makefile.am b/kfilereplace/toolbar/Makefile.am
deleted file mode 100644
index 1b5627ad..00000000
--- a/kfilereplace/toolbar/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-appdir = $(kde_datadir)/kfilereplacepart/icons
-app_ICON = AUTO
-
diff --git a/kimagemapeditor/kimagemapeditor.cpp b/kimagemapeditor/kimagemapeditor.cpp
index c4d698c5..199b757b 100644
--- a/kimagemapeditor/kimagemapeditor.cpp
+++ b/kimagemapeditor/kimagemapeditor.cpp
@@ -46,7 +46,7 @@
 #include <kaccel.h>
 #include <kstdaction.h>
 #include <kiconloader.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <kapplication.h>
 #include <kkeydialog.h>
@@ -57,7 +57,7 @@
 #include <kstatusbar.h>
 #include <kxmlguifactory.h>
 #include <kdockwidget.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #if KDE_IS_VERSION(3,1,90)
 #include <kinputdialog.h>
 #else
diff --git a/kimagemapeditor/kimedialogs.cpp b/kimagemapeditor/kimedialogs.cpp
index 665984ea..59187ffc 100644
--- a/kimagemapeditor/kimedialogs.cpp
+++ b/kimagemapeditor/kimedialogs.cpp
@@ -34,7 +34,7 @@
 //#include <tqwidget.h>
 // KDE
 #include <kiconloader.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kapplication.h>
diff --git a/kimagemapeditor/kimeshell.cpp b/kimagemapeditor/kimeshell.cpp
index cb7d9e21..3914ac50 100644
--- a/kimagemapeditor/kimeshell.cpp
+++ b/kimagemapeditor/kimeshell.cpp
@@ -21,7 +21,7 @@
 #include <kaction.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <kkeydialog.h>
 #include <kedittoolbar.h>
diff --git a/kimagemapeditor/qextfileinfo.cpp b/kimagemapeditor/qextfileinfo.cpp
index 440e9c78..518dc79a 100644
--- a/kimagemapeditor/qextfileinfo.cpp
+++ b/kimagemapeditor/qextfileinfo.cpp
@@ -21,11 +21,11 @@
 
 //kde includes
 #include <kurl.h>
-#include <kio/job.h>
-#include <kio/netaccess.h>
-#include <kio/scheduler.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/scheduler.h>
 #include <kdirlister.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kglobal.h>
 #include <kdebug.h>
 
diff --git a/kimagemapeditor/qextfileinfo.h b/kimagemapeditor/qextfileinfo.h
index b064bcd8..86dd2923 100644
--- a/kimagemapeditor/qextfileinfo.h
+++ b/kimagemapeditor/qextfileinfo.h
@@ -12,10 +12,10 @@
 #ifndef _TQEXTFILEINFO_H_
 #define _TQEXTFILEINFO_H_
 
-#include <kio/global.h>
-#include <kio/job.h>
+#include <tdeio/global.h>
+#include <tdeio/job.h>
 #include <kurl.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 #include <tqobject.h>
 #include <tqptrlist.h>
diff --git a/klinkstatus/klinkstatus.tdevelop b/klinkstatus/klinkstatus.tdevelop
index 1a58961e..2caa649b 100644
--- a/klinkstatus/klinkstatus.tdevelop
+++ b/klinkstatus/klinkstatus.tdevelop
@@ -57,12 +57,12 @@
         <cflags/>
         <f77flags/>
         <envvars>
-          <envvar value="kfilereplace kommander kimagemapeditor kxsldbg quanta lib" name="DO_NOT_COMPILE" />
+          <envvar value="tdefilereplace kommander kimagemapeditor kxsldbg quanta lib" name="DO_NOT_COMPILE" />
         </envvars>
       </debug>
       <default>
         <envvars>
-          <envvar value="kfilereplace kommander kimagemapeditor kxsldbg quanta lib" name="DO_NOT_COMPILE" />
+          <envvar value="tdefilereplace kommander kimagemapeditor kxsldbg quanta lib" name="DO_NOT_COMPILE" />
         </envvars>
         <configargs>--enable-debug=full</configargs>
         <builddir></builddir>
diff --git a/klinkstatus/src/cfg/klsconfig.kcfgc b/klinkstatus/src/cfg/klsconfig.kcfgc
index 089abab7..10adf128 100644
--- a/klinkstatus/src/cfg/klsconfig.kcfgc
+++ b/klinkstatus/src/cfg/klsconfig.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=klinkstatus.kcfg
 #IncludeFiles=defines.h
 ClassName=KLSConfig
diff --git a/klinkstatus/src/engine/linkchecker.cpp b/klinkstatus/src/engine/linkchecker.cpp
index 47a45ca6..13700c4e 100644
--- a/klinkstatus/src/engine/linkchecker.cpp
+++ b/klinkstatus/src/engine/linkchecker.cpp
@@ -27,11 +27,11 @@
 #include <tqtextcodec.h> 
 #include <tqcstring.h>
 
-#include <kio/netaccess.h>
-#include <kio/global.h>
-#include <kio/job.h>
-#include <kio/scheduler.h>
-#include <kio/slave.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/global.h>
+#include <tdeio/job.h>
+#include <tdeio/scheduler.h>
+#include <tdeio/slave.h>
 #include <kmimetype.h>
 #include <kapplication.h>
 #include <klocale.h>
diff --git a/klinkstatus/src/engine/linkchecker.h b/klinkstatus/src/engine/linkchecker.h
index a28d66bb..93b9268c 100644
--- a/klinkstatus/src/engine/linkchecker.h
+++ b/klinkstatus/src/engine/linkchecker.h
@@ -24,7 +24,7 @@
 #include <tqthread.h>
 #include <tqstring.h>
 
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 class KHTMLPart;
 
 #include "../parser/http.h"
diff --git a/klinkstatus/src/klinkstatus.cpp b/klinkstatus/src/klinkstatus.cpp
index 2efde62e..8309cb19 100644
--- a/klinkstatus/src/klinkstatus.cpp
+++ b/klinkstatus/src/klinkstatus.cpp
@@ -21,8 +21,8 @@
 #include "klinkstatus.h"
 
 #include <kkeydialog.h>
-#include <kfiledialog.h>
-#include <kconfig.h>
+#include <tdefiledialog.h>
+#include <tdeconfig.h>
 #include <kurl.h>
 #include <kedittoolbar.h>
 #include <kaction.h>
diff --git a/klinkstatus/src/klinkstatus_part.cpp b/klinkstatus/src/klinkstatus_part.cpp
index 78c72716..bf56dbd3 100644
--- a/klinkstatus/src/klinkstatus_part.cpp
+++ b/klinkstatus/src/klinkstatus_part.cpp
@@ -23,13 +23,13 @@
 #include <kinstance.h>
 #include <kaction.h>
 #include <kstdaction.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tdeparts/genericfactory.h>
 #include <tdeparts/factory.h>
 #include <kstandarddirs.h>
 #include <kaboutapplication.h>
 #include <kbugreport.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 #include <kglobalsettings.h>
 #include <kshortcut.h>
 #include <kaccel.h>
diff --git a/klinkstatus/src/ui/klshistorycombo.cpp b/klinkstatus/src/ui/klshistorycombo.cpp
index c29ae53d..13c8a16d 100644
--- a/klinkstatus/src/ui/klshistorycombo.cpp
+++ b/klinkstatus/src/ui/klshistorycombo.cpp
@@ -13,7 +13,7 @@
 #include "klsconfig.h"
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcompletionbox.h>
 #include <kdebug.h>
 #include <kstdaccel.h>
diff --git a/klinkstatus/src/ui/sessionwidget.cpp b/klinkstatus/src/ui/sessionwidget.cpp
index e6a96f61..a761499d 100644
--- a/klinkstatus/src/ui/sessionwidget.cpp
+++ b/klinkstatus/src/ui/sessionwidget.cpp
@@ -24,16 +24,16 @@
 #include <ksqueezedtextlabel.h>
 #include <kprogress.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kglobal.h>
 #include <kpushbutton.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kactionclasses.h>
 #include <ktempfile.h>
 #include <ksavefile.h>
 #include <kstandarddirs.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <tqevent.h>
 #include <tqlineedit.h>
diff --git a/kommander/editor/assoctexteditorimpl.cpp b/kommander/editor/assoctexteditorimpl.cpp
index 4cbaeb08..9fbfe938 100644
--- a/kommander/editor/assoctexteditorimpl.cpp
+++ b/kommander/editor/assoctexteditorimpl.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 /* KDE INCLUDES */
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
diff --git a/kommander/editor/filechooser.cpp b/kommander/editor/filechooser.cpp
index 6dfb84ec..ac0aad5a 100644
--- a/kommander/editor/filechooser.cpp
+++ b/kommander/editor/filechooser.cpp
@@ -1,7 +1,7 @@
 #include "filechooser.h"
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tqlayout.h>
 
 FileChooser::FileChooser( TQWidget *parent, const char *name )
diff --git a/kommander/editor/formfile.cpp b/kommander/editor/formfile.cpp
index fbb64d48..97a636ef 100644
--- a/kommander/editor/formfile.cpp
+++ b/kommander/editor/formfile.cpp
@@ -34,7 +34,7 @@
 
 // KDE includes
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kstatusbar.h>
diff --git a/kommander/editor/kommander.xml b/kommander/editor/kommander.xml
index ee10455b..2652e09b 100644
--- a/kommander/editor/kommander.xml
+++ b/kommander/editor/kommander.xml
@@ -558,7 +558,7 @@
       <!-- others -->
       <item> dcop </item>
       <item> kdialog </item>
-      <item> kfile </item>
+      <item> tdefile </item>
       <item> xhost </item>
       <item> xmodmap </item>
       <item> xset </item>
diff --git a/kommander/editor/main.cpp b/kommander/editor/main.cpp
index a4c4b27b..75e4ce67 100644
--- a/kommander/editor/main.cpp
+++ b/kommander/editor/main.cpp
@@ -17,7 +17,7 @@
 #include <kaboutdata.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <ksplashscreen.h>
diff --git a/kommander/editor/mainwindow.cpp b/kommander/editor/mainwindow.cpp
index 608049ed..fd3f0ecb 100644
--- a/kommander/editor/mainwindow.cpp
+++ b/kommander/editor/mainwindow.cpp
@@ -74,7 +74,7 @@
 #include <kaction.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kinputdialog.h>
 #include <klocale.h>
 #include <kmenubar.h>
@@ -86,7 +86,7 @@
 #include <ktoolbar.h>
 #include <kurl.h>
 #include <tdeparts/partmanager.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 extern TQMap<TQWidget*, TQString> *qwf_functions;
 extern TQMap<TQWidget*, TQString> *qwf_forms;
diff --git a/kommander/editor/mainwindowactions.cpp b/kommander/editor/mainwindowactions.cpp
index 749f5d3b..8a217843 100644
--- a/kommander/editor/mainwindowactions.cpp
+++ b/kommander/editor/mainwindowactions.cpp
@@ -60,7 +60,7 @@
 
 #include <kaction.h>
 #include <kapplication.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <kkeydialog.h>
diff --git a/kommander/editor/messagelog.cpp b/kommander/editor/messagelog.cpp
index 16947a77..33a385b3 100644
--- a/kommander/editor/messagelog.cpp
+++ b/kommander/editor/messagelog.cpp
@@ -17,7 +17,7 @@
 #include "messagelog.h"
 
 #include <kapplication.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <klistbox.h>
 #include <kmessagebox.h>
diff --git a/kommander/factory/kommanderfactory.cpp b/kommander/factory/kommanderfactory.cpp
index 7c717a68..76da35f1 100644
--- a/kommander/factory/kommanderfactory.cpp
+++ b/kommander/factory/kommanderfactory.cpp
@@ -19,7 +19,7 @@
 **********************************************************************/
 /* Modifications by Marc Britton (c) 2002 under GNU GPL, terms as above */
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klibloader.h>
 
 #include "kommanderfactory.h"
diff --git a/kommander/pluginmanager/mainwindow.cpp b/kommander/pluginmanager/mainwindow.cpp
index 8c1eb55b..249aed75 100644
--- a/kommander/pluginmanager/mainwindow.cpp
+++ b/kommander/pluginmanager/mainwindow.cpp
@@ -20,8 +20,8 @@
 
 #include <ktoolbar.h>
 #include <klistbox.h>
-#include <kconfig.h>
-#include <kfiledialog.h>
+#include <tdeconfig.h>
+#include <tdefiledialog.h>
 #include <klibloader.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kommander/pluginmanager/pluginmanager.cpp b/kommander/pluginmanager/pluginmanager.cpp
index e5de0841..64f1bf22 100644
--- a/kommander/pluginmanager/pluginmanager.cpp
+++ b/kommander/pluginmanager/pluginmanager.cpp
@@ -14,7 +14,7 @@
  ***************************************************************************/
 
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klibloader.h>
  
 #include "pluginmanager.h"
diff --git a/kommander/widget/functionlib.cpp b/kommander/widget/functionlib.cpp
index a43fbfaf..18f9a6b8 100644
--- a/kommander/widget/functionlib.cpp
+++ b/kommander/widget/functionlib.cpp
@@ -36,7 +36,7 @@
 #include <dcopclient.h>
 #include <kapplication.h>
 #include <kcolordialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <kinputdialog.h>
 #include <klocale.h>
diff --git a/kommander/widget/kommanderfunctions.cpp b/kommander/widget/kommanderfunctions.cpp
index b36a7251..dc890657 100644
--- a/kommander/widget/kommanderfunctions.cpp
+++ b/kommander/widget/kommanderfunctions.cpp
@@ -23,7 +23,7 @@
  
 #include <dcopclient.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kglobal.h>
 
diff --git a/kommander/widgets/fileselector.cpp b/kommander/widgets/fileselector.cpp
index 897f85c8..54a0e90a 100644
--- a/kommander/widgets/fileselector.cpp
+++ b/kommander/widgets/fileselector.cpp
@@ -16,7 +16,7 @@
 
 
 /* KDE INCLUDES */
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klineedit.h>
 #include <kpushbutton.h>
 #include <kurlcompletion.h>
diff --git a/kxsldbg/kxsldbg.cpp b/kxsldbg/kxsldbg.cpp
index 49b2305e..5dab0044 100644
--- a/kxsldbg/kxsldbg.cpp
+++ b/kxsldbg/kxsldbg.cpp
@@ -6,7 +6,7 @@
 #include "kxsldbg.h"
 
 #include <kkeydialog.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 
 #include <kedittoolbar.h>
diff --git a/kxsldbg/kxsldbgpart/kxsldbg_part.cpp b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp
index 05bbf489..6fbd6f46 100644
--- a/kxsldbg/kxsldbgpart/kxsldbg_part.cpp
+++ b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp
@@ -5,7 +5,7 @@
 #include <kinstance.h>
 #include <kaction.h>
 #include <kstdaction.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tdeparts/genericfactory.h>
 #include <tdetexteditor/markinterface.h> 
 #include <tdetexteditor/editinterface.h> 
diff --git a/kxsldbg/kxsldbgpart/qxsldbgdoc.h b/kxsldbg/kxsldbgpart/qxsldbgdoc.h
index 49f18070..c7c50174 100644
--- a/kxsldbg/kxsldbgpart/qxsldbgdoc.h
+++ b/kxsldbg/kxsldbgpart/qxsldbgdoc.h
@@ -9,7 +9,7 @@
 #ifndef TQXSLDBGDOC_H
 #define TQXSLDBGDOC_H
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <tqptrlist.h>
 #include <tqstring.h>
 #include <tqguardedptr.h>
diff --git a/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp
index 2967b522..ddf862ca 100644
--- a/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp
+++ b/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp
@@ -16,7 +16,7 @@
  ************************************************************************************/
 
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #include <tqdialog.h>
 #include <tqlineedit.h>
diff --git a/lib/compatibility/knewstuff/downloaddialog.cpp b/lib/compatibility/knewstuff/downloaddialog.cpp
index c5f402e1..afc27b16 100644
--- a/lib/compatibility/knewstuff/downloaddialog.cpp
+++ b/lib/compatibility/knewstuff/downloaddialog.cpp
@@ -25,11 +25,11 @@
 #include <ktabctl.h>
 #include <klistview.h>
 #include <kdebug.h>
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
 #include <kmessagebox.h>
 #include <kurl.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kiconloader.h>
 
diff --git a/lib/compatibility/knewstuff/engine.cpp b/lib/compatibility/knewstuff/engine.cpp
index 2abb7bca..12857917 100644
--- a/lib/compatibility/knewstuff/engine.cpp
+++ b/lib/compatibility/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>
diff --git a/lib/compatibility/knewstuff/knewstuffgeneric.cpp b/lib/compatibility/knewstuff/knewstuffgeneric.cpp
index 163d9ade..9d516298 100644
--- a/lib/compatibility/knewstuff/knewstuffgeneric.cpp
+++ b/lib/compatibility/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>
diff --git a/lib/compatibility/knewstuff/knewstuffsecure.cpp b/lib/compatibility/knewstuff/knewstuffsecure.cpp
index 3c90f068..a6a905c0 100644
--- a/lib/compatibility/knewstuff/knewstuffsecure.cpp
+++ b/lib/compatibility/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>
diff --git a/lib/compatibility/knewstuff/provider.cpp b/lib/compatibility/knewstuff/provider.cpp
index 92be65b6..4c631847 100644
--- a/lib/compatibility/knewstuff/provider.cpp
+++ b/lib/compatibility/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>
diff --git a/lib/compatibility/knewstuff/uploaddialog.cpp b/lib/compatibility/knewstuff/uploaddialog.cpp
index 9e6ae83a..08940d0a 100644
--- a/lib/compatibility/knewstuff/uploaddialog.cpp
+++ b/lib/compatibility/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 "engine.h"
diff --git a/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp
index 47e2d71d..b0f12173 100644
--- a/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp
@@ -33,7 +33,7 @@
 #include <tqstyle.h>
 
 #ifndef NO_KDE2
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <ktoolbar.h>
diff --git a/lib/compatibility/tdemdi/qextmdi/ktabwidget.cpp b/lib/compatibility/tdemdi/qextmdi/ktabwidget.cpp
index 041143d9..3b17a43a 100644
--- a/lib/compatibility/tdemdi/qextmdi/ktabwidget.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/ktabwidget.cpp
@@ -21,7 +21,7 @@
 #include <tqapplication.h>
 #include <tqstyle.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kstringhandler.h>
 
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp
index 91dcb4cd..916cee5b 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp
@@ -30,7 +30,7 @@
 
 #include "tdemdidefines.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp
index 80307785..6099d0c1 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp
@@ -33,7 +33,7 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 
 //TODO: Well, this is already defined in tdeui/kdockwidget.cpp
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp
index e326cc26..bef9fb12 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp
@@ -22,7 +22,7 @@
 
 #include <tqpopupmenu.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ktoolbar.h>
 #include <kmainwindow.h>
 #include <klocale.h>
diff --git a/lib/qextfileinfo.cpp b/lib/qextfileinfo.cpp
index 3aaf5e1b..d13f9733 100644
--- a/lib/qextfileinfo.cpp
+++ b/lib/qextfileinfo.cpp
@@ -21,11 +21,11 @@
 
 //kde includes
 #include <kurl.h>
-#include <kio/job.h>
-#include <kio/netaccess.h>
-#include <kio/scheduler.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/scheduler.h>
 #include <kdirlister.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kglobal.h>
 #include <kdebug.h>
 
diff --git a/lib/qextfileinfo.h b/lib/qextfileinfo.h
index 1fbe1093..bb3f3c05 100644
--- a/lib/qextfileinfo.h
+++ b/lib/qextfileinfo.h
@@ -12,10 +12,10 @@
 #ifndef _TQEXTFILEINFO_H_
 #define _TQEXTFILEINFO_H_
 
-#include <kio/global.h>
-#include <kio/job.h>
+#include <tdeio/global.h>
+#include <tdeio/job.h>
 #include <kurl.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 #include <tqobject.h>
 #include <tqptrlist.h>
diff --git a/quanta/components/csseditor/colorrequester.cpp b/quanta/components/csseditor/colorrequester.cpp
index 7538ebe9..be7aba50 100644
--- a/quanta/components/csseditor/colorrequester.cpp
+++ b/quanta/components/csseditor/colorrequester.cpp
@@ -55,7 +55,7 @@ void colorRequester::init()
      if ( !d->edit )
      d->edit = new KLineEdit( this, "line edit" );
 
-     myButton = new KPushButton( this, "kfile button");
+     myButton = new KPushButton( this, "tdefile button");
      TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("colorize"));
      TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal );
      myButton->setIconSet( iconSet );
diff --git a/quanta/components/csseditor/csseditor.cpp b/quanta/components/csseditor/csseditor.cpp
index d3586f57..a157adae 100644
--- a/quanta/components/csseditor/csseditor.cpp
+++ b/quanta/components/csseditor/csseditor.cpp
@@ -31,7 +31,7 @@
 #include <kstandarddirs.h>
 #include <klineedit.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdeparts/browserextension.h>
 
 #include "propertysetter.h"
diff --git a/quanta/components/csseditor/cssselector.cpp b/quanta/components/csseditor/cssselector.cpp
index 7e61cf02..b1da7961 100644
--- a/quanta/components/csseditor/cssselector.cpp
+++ b/quanta/components/csseditor/cssselector.cpp
@@ -34,7 +34,7 @@
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <kurlrequester.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include "project.h"
 #include "stylesheetparser.h"
 
diff --git a/quanta/components/csseditor/tlpeditors.cpp b/quanta/components/csseditor/tlpeditors.cpp
index 994876a3..ab70afd6 100644
--- a/quanta/components/csseditor/tlpeditors.cpp
+++ b/quanta/components/csseditor/tlpeditors.cpp
@@ -26,7 +26,7 @@
 #include <kdialog.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kimagefilepreview.h>
 
 #include "qextfileinfo.h"
diff --git a/quanta/components/debugger/dbgp/CMakeLists.txt b/quanta/components/debugger/dbgp/CMakeLists.txt
index 868fc177..0652c64d 100644
--- a/quanta/components/debugger/dbgp/CMakeLists.txt
+++ b/quanta/components/debugger/dbgp/CMakeLists.txt
@@ -34,6 +34,6 @@ tde_add_kpart( quantadebuggerdbgp AUTOMOC
     quantadebuggerdbgp.cpp dbgpsettingss.ui
     dbgpsettings.cpp dbgpnetwork.cpp
     qbytearrayfifo.cpp
-  LINK debuggerinterface-static kio-shared
+  LINK debuggerinterface-static tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/quanta/components/framewizard/fmfpeditor.cpp b/quanta/components/framewizard/fmfpeditor.cpp
index e2bfb44a..a191cd19 100644
--- a/quanta/components/framewizard/fmfpeditor.cpp
+++ b/quanta/components/framewizard/fmfpeditor.cpp
@@ -22,7 +22,7 @@
 #include <tqregexp.h>
 #include <kurlrequester.h>
 #include <tqstringlist.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 //#include <kpreviewwidgetbase.h> 
 
diff --git a/quanta/data/config/plugins.rc b/quanta/data/config/plugins.rc
index 1a5a5c24..d8035b9e 100644
--- a/quanta/data/config/plugins.rc
+++ b/quanta/data/config/plugins.rc
@@ -15,8 +15,8 @@ Input=3
 
 [KFileReplace]
 Arguments=
-FileName=trinity/libkfilereplacepart.la
-Icon=kfilereplace
+FileName=trinity/libtdefilereplacepart.la
+Icon=tdefilereplace
 Input=3
 Location=
 OutputWindow=Editor Tab
diff --git a/quanta/data/config/quanta_preview_config.desktop b/quanta/data/config/quanta_preview_config.desktop
index 4000aa18..a3f2e7d7 100644
--- a/quanta/data/config/quanta_preview_config.desktop
+++ b/quanta/data/config/quanta_preview_config.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-Exec=kcmshell --caption %c %i tdehtml_behavior tdehtml_java_js tdehtml_fonts cookies cache proxy kcmcss crypto useragent tdehtml_plugins
+Exec=tdecmshell --caption %c %i tdehtml_behavior tdehtml_java_js tdehtml_fonts cookies cache proxy kcmcss crypto useragent tdehtml_plugins
 Icon=konqueror
 DocPath=konqueror/index.html
 Name=Configure KHTML Browser Part
diff --git a/quanta/data/doc/templates.html b/quanta/data/doc/templates.html
index 3043187e..616dfbdc 100644
--- a/quanta/data/doc/templates.html
+++ b/quanta/data/doc/templates.html
@@ -137,7 +137,7 @@ cool things we took into consideration when using templates in projects.
   the file to the project templates prior to linking. This will prevent broken links on upload.  </li>
   <li>You always have control where you place your templates so you can choose to move them.
   However Quanta does not track this so you will need to change links. This is a good
-  task for kfilereplace which we are setting up to plug in as a kpart.  </li>
+  task for tdefilereplace which we are setting up to plug in as a kpart.  </li>
 </ul>
 </p>
 <p class="minihdr">Templates conclusion
diff --git a/quanta/dialogs/actionconfigdialog.cpp b/quanta/dialogs/actionconfigdialog.cpp
index 7ae6b4a4..9654c046 100644
--- a/quanta/dialogs/actionconfigdialog.cpp
+++ b/quanta/dialogs/actionconfigdialog.cpp
@@ -26,7 +26,7 @@
 
 //kde includes
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kicondialog.h>
 #include <kiconloader.h>
diff --git a/quanta/dialogs/copyto.cpp b/quanta/dialogs/copyto.cpp
index bc2543dc..b5c53356 100644
--- a/quanta/dialogs/copyto.cpp
+++ b/quanta/dialogs/copyto.cpp
@@ -17,8 +17,8 @@
 // qt includes
 
 // kde includes
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
 
 //app includes
 #include "copyto.h"
diff --git a/quanta/dialogs/copyto.h b/quanta/dialogs/copyto.h
index 29412488..3e021e0a 100644
--- a/quanta/dialogs/copyto.h
+++ b/quanta/dialogs/copyto.h
@@ -19,7 +19,7 @@
 #define COPYTO_H
 
 // kde includes
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 
 
 /**
diff --git a/quanta/dialogs/dirtydlg.cpp b/quanta/dialogs/dirtydlg.cpp
index be6f308a..08ce2883 100644
--- a/quanta/dialogs/dirtydlg.cpp
+++ b/quanta/dialogs/dirtydlg.cpp
@@ -23,10 +23,10 @@
 #include <kdialogbase.h>
 #include <klocale.h>
 #include <kprocess.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
-#include <kio/netaccess.h>
-#include <kfileitem.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/netaccess.h>
+#include <tdefileitem.h>
 
 //app includes
 #include "dirtydialog.h"
diff --git a/quanta/dialogs/dirtydlg.h b/quanta/dialogs/dirtydlg.h
index 4b6d9232..5fd14e36 100644
--- a/quanta/dialogs/dirtydlg.h
+++ b/quanta/dialogs/dirtydlg.h
@@ -18,7 +18,7 @@
 #define DIRTYDLG_H
 
 // kde includes
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 
 class DirtyDialog;
 class KDialogBase;
diff --git a/quanta/dialogs/dtepeditdlg.cpp b/quanta/dialogs/dtepeditdlg.cpp
index bbb3456d..79247f40 100644
--- a/quanta/dialogs/dtepeditdlg.cpp
+++ b/quanta/dialogs/dtepeditdlg.cpp
@@ -24,8 +24,8 @@
 
 //kde includes
 #include <kcombobox.h>
-#include <kconfig.h>
-#include <kfiledialog.h>
+#include <tdeconfig.h>
+#include <tdefiledialog.h>
 #include <kicondialog.h>
 #include <klistbox.h>
 #include <klineedit.h>
diff --git a/quanta/dialogs/filecombo.cpp b/quanta/dialogs/filecombo.cpp
index 63fd1e58..8f31f692 100644
--- a/quanta/dialogs/filecombo.cpp
+++ b/quanta/dialogs/filecombo.cpp
@@ -22,7 +22,7 @@
 
 // KDE includes
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurl.h>
 
 // app include
diff --git a/quanta/dialogs/settings/parseroptions.cpp b/quanta/dialogs/settings/parseroptions.cpp
index 92ff1206..1f0e8b3c 100644
--- a/quanta/dialogs/settings/parseroptions.cpp
+++ b/quanta/dialogs/settings/parseroptions.cpp
@@ -19,7 +19,7 @@
 #include <tqspinbox.h>
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 /*
  *  Constructs a ParserOptions which is a child of 'parent', with the
diff --git a/quanta/dialogs/tagdialogs/colorcombo.cpp b/quanta/dialogs/tagdialogs/colorcombo.cpp
index 19331def..ebe9a7fd 100644
--- a/quanta/dialogs/tagdialogs/colorcombo.cpp
+++ b/quanta/dialogs/tagdialogs/colorcombo.cpp
@@ -45,7 +45,7 @@
 #include <tqtimer.h>
 
 #include <kcolordialog.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
diff --git a/quanta/dialogs/tagdialogs/tagdialog.cpp b/quanta/dialogs/tagdialogs/tagdialog.cpp
index 90f5f80c..fe466986 100644
--- a/quanta/dialogs/tagdialogs/tagdialog.cpp
+++ b/quanta/dialogs/tagdialogs/tagdialog.cpp
@@ -24,7 +24,7 @@
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <tdetexteditor/viewcursorinterface.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurl.h>
 #include <kstdguiitem.h>
 #include <kdebug.h>
diff --git a/quanta/dialogs/tagdialogs/tagimgdlg.cpp b/quanta/dialogs/tagdialogs/tagimgdlg.cpp
index d2a680f5..24578a88 100644
--- a/quanta/dialogs/tagdialogs/tagimgdlg.cpp
+++ b/quanta/dialogs/tagdialogs/tagimgdlg.cpp
@@ -22,8 +22,8 @@
 //kde includes
 #include <kapplication.h>
 #include <klocale.h>
-#include <kio/netaccess.h>
-#include <kfiledialog.h>
+#include <tdeio/netaccess.h>
+#include <tdefiledialog.h>
 #include <kurl.h>
 
 //app includes
diff --git a/quanta/messages/annotationoutput.cpp b/quanta/messages/annotationoutput.cpp
index 6888f462..e42eef5d 100644
--- a/quanta/messages/annotationoutput.cpp
+++ b/quanta/messages/annotationoutput.cpp
@@ -21,7 +21,7 @@
 #include <tqtimer.h>
 
 #include <kdebug.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/quanta/messages/messageoutput.cpp b/quanta/messages/messageoutput.cpp
index 2d126794..210ee532 100644
--- a/quanta/messages/messageoutput.cpp
+++ b/quanta/messages/messageoutput.cpp
@@ -18,7 +18,7 @@
 // KDE includes
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kpopupmenu.h>
diff --git a/quanta/parsers/dtd/dtd.cpp b/quanta/parsers/dtd/dtd.cpp
index 34826ca4..19ccc218 100644
--- a/quanta/parsers/dtd/dtd.cpp
+++ b/quanta/parsers/dtd/dtd.cpp
@@ -25,7 +25,7 @@
 #include <klocale.h>
 #include <kurl.h>
 #include <kdebug.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
 
diff --git a/quanta/parsers/dtd/dtdparser.cpp b/quanta/parsers/dtd/dtdparser.cpp
index 07d571f8..52bd35c8 100644
--- a/quanta/parsers/dtd/dtdparser.cpp
+++ b/quanta/parsers/dtd/dtdparser.cpp
@@ -23,13 +23,13 @@
 #include <tqstring.h>
 
 //kde includes
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kurl.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 //other includes
 #ifdef LIBXML_2_5
diff --git a/quanta/parts/kafka/htmlenhancer.cpp b/quanta/parts/kafka/htmlenhancer.cpp
index 8077a76b..32c58bc1 100644
--- a/quanta/parts/kafka/htmlenhancer.cpp
+++ b/quanta/parts/kafka/htmlenhancer.cpp
@@ -20,7 +20,7 @@
 #include <dom/dom_exception.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "quantacommon.h"
 #include "document.h"
diff --git a/quanta/parts/kafka/kafkasyncoptions.cpp b/quanta/parts/kafka/kafkasyncoptions.cpp
index 2c37f0cd..2e6db3f9 100644
--- a/quanta/parts/kafka/kafkasyncoptions.cpp
+++ b/quanta/parts/kafka/kafkasyncoptions.cpp
@@ -19,7 +19,7 @@
 #include <tqcheckbox.h>
 #include <tqspinbox.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include "kafkasyncoptions.h"
diff --git a/quanta/parts/kafka/undoredo.cpp b/quanta/parts/kafka/undoredo.cpp
index c7345467..a342a23f 100644
--- a/quanta/parts/kafka/undoredo.cpp
+++ b/quanta/parts/kafka/undoredo.cpp
@@ -21,7 +21,7 @@
 #include <tqtabwidget.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <tdetexteditor/editinterface.h>
diff --git a/quanta/parts/preview/whtmlpart.cpp b/quanta/parts/preview/whtmlpart.cpp
index 94552890..bc39e1af 100644
--- a/quanta/parts/preview/whtmlpart.cpp
+++ b/quanta/parts/preview/whtmlpart.cpp
@@ -20,7 +20,7 @@
 #include <tqtextcodec.h>
 
 //kde includes
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <tdehtml_settings.h>
diff --git a/quanta/plugins/quantapluginconfig.cpp b/quanta/plugins/quantapluginconfig.cpp
index 62f25553..02bb3724 100644
--- a/quanta/plugins/quantapluginconfig.cpp
+++ b/quanta/plugins/quantapluginconfig.cpp
@@ -17,7 +17,7 @@
 
 /* KDE INCLUDES */
 #include <kdialogbase.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kicondialog.h>
diff --git a/quanta/plugins/quantaplugineditor.cpp b/quanta/plugins/quantaplugineditor.cpp
index 347ae9c6..6c8245f3 100644
--- a/quanta/plugins/quantaplugineditor.cpp
+++ b/quanta/plugins/quantaplugineditor.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 /* KDE INCLUDES */
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/quanta/plugins/quantaplugininterface.cpp b/quanta/plugins/quantaplugininterface.cpp
index fc9a8823..51a2cf25 100644
--- a/quanta/plugins/quantaplugininterface.cpp
+++ b/quanta/plugins/quantaplugininterface.cpp
@@ -17,7 +17,7 @@
 
 /* KDE INCLUDES */
 #include <kactioncollection.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kmainwindow.h>
 #include <klocale.h>
diff --git a/quanta/plugins/quantaplugininterface.h b/quanta/plugins/quantaplugininterface.h
index 5e876a5e..28458fad 100644
--- a/quanta/plugins/quantaplugininterface.h
+++ b/quanta/plugins/quantaplugininterface.h
@@ -19,7 +19,7 @@
 #define QUANTAPLUGININTERFACE_H
 
 /* KDE INCLUDES */
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 
 /* QT INCLUDES */
diff --git a/quanta/project/project.cpp b/quanta/project/project.cpp
index 6d5593d8..560b4e7e 100644
--- a/quanta/project/project.cpp
+++ b/quanta/project/project.cpp
@@ -31,7 +31,7 @@
 #include <kapplication.h>
 #include <kcharsets.h>
 #include <kdirwatch.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kmainwindow.h>
diff --git a/quanta/project/projectnewgeneral.cpp b/quanta/project/projectnewgeneral.cpp
index fe6030bb..c60a9ac2 100644
--- a/quanta/project/projectnewgeneral.cpp
+++ b/quanta/project/projectnewgeneral.cpp
@@ -26,7 +26,7 @@
 #include <tqcombobox.h>
 
 // kde includes
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/quanta/project/projectnewlocal.cpp b/quanta/project/projectnewlocal.cpp
index 97d824f4..b430b43b 100644
--- a/quanta/project/projectnewlocal.cpp
+++ b/quanta/project/projectnewlocal.cpp
@@ -28,7 +28,7 @@
 // kde includes
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kprogress.h>
 #include <kmimetype.h>
 #include <tdeversion.h>
diff --git a/quanta/project/projectnewweb.cpp b/quanta/project/projectnewweb.cpp
index 31d3f620..7d62d276 100644
--- a/quanta/project/projectnewweb.cpp
+++ b/quanta/project/projectnewweb.cpp
@@ -28,7 +28,7 @@
 #include <klocale.h>
 #include <kprocess.h>
 #include <kiconloader.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kmessagebox.h>
 #include <kled.h>
 
diff --git a/quanta/project/projectoptions.ui.h b/quanta/project/projectoptions.ui.h
index 3d0200aa..ef8ab07d 100644
--- a/quanta/project/projectoptions.ui.h
+++ b/quanta/project/projectoptions.ui.h
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include <kcombobox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tdeversion.h>
 #include <kmessagebox.h>
 #include <klocale.h>
diff --git a/quanta/project/projectprivate.cpp b/quanta/project/projectprivate.cpp
index c488acc0..305831ab 100644
--- a/quanta/project/projectprivate.cpp
+++ b/quanta/project/projectprivate.cpp
@@ -30,11 +30,11 @@
 #include <kaction.h>
 #include <kapplication.h>
 #include <kcharsets.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdirwatch.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kinputdialog.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kmainwindow.h>
diff --git a/quanta/project/projectupload.cpp b/quanta/project/projectupload.cpp
index 1f389cb4..6d075127 100644
--- a/quanta/project/projectupload.cpp
+++ b/quanta/project/projectupload.cpp
@@ -36,12 +36,12 @@
 //kde includes
 #include <kapplication.h>
 #include <kurl.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kmessagebox.h>
 #include <kprotocolinfo.h>
 #include <kdebug.h>
 #include <kinputdialog.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <klineedit.h>
 #include <kcombobox.h>
diff --git a/quanta/project/projectupload.h b/quanta/project/projectupload.h
index bd341eec..c3071899 100644
--- a/quanta/project/projectupload.h
+++ b/quanta/project/projectupload.h
@@ -25,7 +25,7 @@
 #include <tqptrlist.h>
 #include <tqstringlist.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 /**
   *@author Dmitry Poplavsky & Alexander Yakovlev & Andras Mantia
diff --git a/quanta/project/rescanprj.cpp b/quanta/project/rescanprj.cpp
index 5f5ebc71..e04fd444 100644
--- a/quanta/project/rescanprj.cpp
+++ b/quanta/project/rescanprj.cpp
@@ -25,7 +25,7 @@
 #include <kdebug.h>
 #include <kurl.h>
 #include <klocale.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kglobal.h>
 #include <kprogress.h>
 
diff --git a/quanta/project/rescanprj.h b/quanta/project/rescanprj.h
index da3844ac..5c36efb9 100644
--- a/quanta/project/rescanprj.h
+++ b/quanta/project/rescanprj.h
@@ -19,7 +19,7 @@
 #define RESCANPRJ_H
 
 #include <tqregexp.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 
 #include "rescanprjdir.h"
diff --git a/quanta/quanta.tdevelop b/quanta/quanta.tdevelop
index c5729fab..2a70d8f0 100644
--- a/quanta/quanta.tdevelop
+++ b/quanta/quanta.tdevelop
@@ -88,7 +88,7 @@
         <cppflags/>
         <ldflags/>
         <envvars>
-          <envvar value="kommander klinkstatus kfilereplace kxsldbg kimagemapeditor" name="DO_NOT_COMPILE2" />
+          <envvar value="kommander klinkstatus tdefilereplace kxsldbg kimagemapeditor" name="DO_NOT_COMPILE2" />
         </envvars>
       </default>
       <withkommander>
diff --git a/quanta/src/document.cpp b/quanta/src/document.cpp
index f6531e68..dee83bca 100644
--- a/quanta/src/document.cpp
+++ b/quanta/src/document.cpp
@@ -45,7 +45,7 @@
 #include <kdirwatch.h>
 #include <kdebug.h>
 #include <kprogress.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kstandarddirs.h>
 
 #include <tdetexteditor/document.h>
diff --git a/quanta/src/dtds.cpp b/quanta/src/dtds.cpp
index 9a91f304..642c3da7 100644
--- a/quanta/src/dtds.cpp
+++ b/quanta/src/dtds.cpp
@@ -28,7 +28,7 @@
 // include files for KDE
 #include <kapplication.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kurl.h>
 #include <kurlrequester.h>
@@ -36,7 +36,7 @@
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 
 // application specific includes
diff --git a/quanta/src/kqapp.cpp b/quanta/src/kqapp.cpp
index 33a68e91..53b73ea2 100644
--- a/quanta/src/kqapp.cpp
+++ b/quanta/src/kqapp.cpp
@@ -18,7 +18,7 @@
 
 #include <tqtimer.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <twin.h>
 #include <kcmdlineargs.h>
diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp
index f604bc43..d0e862ff 100644
--- a/quanta/src/quanta.cpp
+++ b/quanta/src/quanta.cpp
@@ -58,10 +58,10 @@
 #include <kiconloader.h>
 #include <kmessagebox.h>
 #include <kencodingfiledialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmenubar.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdehtmlview.h>
 #include <kdialogbase.h>
 #include <tdeversion.h>
@@ -107,7 +107,7 @@
 #include <tdetexteditor/view.h>
 #include <tdetexteditor/clipboardinterface.h>
 
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #ifdef ENABLE_CVSSERVICE
 #include "cvsservice.h"
@@ -195,7 +195,7 @@ extern int NN;
 
 const TQString resourceDir = TQString(QUANTA_PACKAGE) + "/";
 
-// from kfiledialog.cpp - avoid qt warning in STDERR (~/.xsessionerrors)
+// from tdefiledialog.cpp - avoid qt warning in STDERR (~/.xsessionerrors)
 static void silenceTQToolBar(TQtMsgType, const char *){}
 
 QuantaApp::QuantaApp(int mdiMode) : DCOPObject("WindowManagerIf"), KMdiMainFrm( 0, "Quanta", (KMdi::MdiMode) mdiMode)
diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp
index 77883967..48f106b0 100644
--- a/quanta/src/quanta_init.cpp
+++ b/quanta/src/quanta_init.cpp
@@ -40,11 +40,11 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <kmenubar.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdehtmlview.h>
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
@@ -54,7 +54,7 @@
 #include <kprocess.h>
 #include <kprogress.h>
 #include <ktip.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <ktabwidget.h>
 #include <tdemultitabbar.h>
 #include <tdetexteditor/view.h>
@@ -1412,7 +1412,7 @@ void QuantaInit::checkRuntimeDependencies()
 
 
   dependency.name = i18n("Control Center (tdebase)");
-  dependency.execName = "kcmshell";
+  dependency.execName = "tdecmshell";
   dependency.url = "http://www.kde.org";
   dependency.description = i18n("preview browser configuration");
   dependency.type = Dependency::Executable;
@@ -1427,7 +1427,7 @@ void QuantaInit::checkRuntimeDependencies()
 
   dependency.name = "KFileReplace";
   dependency.execName = "KFileReplace";
-  dependency.url = "http://kfilereplace.tdewebdev.org";
+  dependency.url = "http://tdefilereplace.tdewebdev.org";
   dependency.description = i18n("search and replace in files");
   dependency.type = Dependency::Plugin;
   dependencies.append(dependency);
diff --git a/quanta/src/quantadoc.cpp b/quanta/src/quantadoc.cpp
index 6a05a444..eb463cf6 100644
--- a/quanta/src/quantadoc.cpp
+++ b/quanta/src/quantadoc.cpp
@@ -29,7 +29,7 @@
 // include files for KDE
 #include <klocale.h>
 #include <kaction.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kpopupmenu.h>
 #include <kmessagebox.h>
 #include <kdirwatch.h>
diff --git a/quanta/src/viewmanager.cpp b/quanta/src/viewmanager.cpp
index 644e50a7..7cf9a1ed 100644
--- a/quanta/src/viewmanager.cpp
+++ b/quanta/src/viewmanager.cpp
@@ -28,7 +28,7 @@
 #include <tdetexteditor/popupmenuinterface.h>
 #include <tdetexteditor/editorchooser.h>
 #include <tdetexteditor/markinterface.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 
 //app includes
diff --git a/quanta/treeviews/basetreeview.cpp b/quanta/treeviews/basetreeview.cpp
index 7ff962e1..b2d774fc 100644
--- a/quanta/treeviews/basetreeview.cpp
+++ b/quanta/treeviews/basetreeview.cpp
@@ -41,7 +41,7 @@
 #include <kopenwith.h>
 #include <kmessagebox.h>
 #include <kpropertiesdialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kprogress.h>
 #include <kstandarddirs.h>
 #include <kurldrag.h>
diff --git a/quanta/treeviews/basetreeview.h b/quanta/treeviews/basetreeview.h
index bf7110cf..bef646ae 100644
--- a/quanta/treeviews/basetreeview.h
+++ b/quanta/treeviews/basetreeview.h
@@ -22,9 +22,9 @@
 #include <tqvaluelist.h>
 
 //kde includes
-#include <kfiletreebranch.h>
-#include <kfiletreeview.h>
-#include <kfiletreeviewitem.h>
+#include <tdefiletreebranch.h>
+#include <tdefiletreeview.h>
+#include <tdefiletreeviewitem.h>
 
 // quanta includes
 #include "quantacommon.h"
diff --git a/quanta/treeviews/docfolder.cpp b/quanta/treeviews/docfolder.cpp
index 3e7e8949..3d028451 100644
--- a/quanta/treeviews/docfolder.cpp
+++ b/quanta/treeviews/docfolder.cpp
@@ -20,7 +20,7 @@
 #include <tqpixmap.h>
 
 // KDE includes
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 
diff --git a/quanta/treeviews/docitem.cpp b/quanta/treeviews/docitem.cpp
index f24c3bb9..3fb4ac2f 100644
--- a/quanta/treeviews/docitem.cpp
+++ b/quanta/treeviews/docitem.cpp
@@ -17,7 +17,7 @@
 
 #include <tqstrlist.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "docitem.h"
 
diff --git a/quanta/treeviews/doctreeview.cpp b/quanta/treeviews/doctreeview.cpp
index 31579563..684072a5 100644
--- a/quanta/treeviews/doctreeview.cpp
+++ b/quanta/treeviews/doctreeview.cpp
@@ -22,7 +22,7 @@
 #include <tqdir.h>
 
 // KDE clases
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <klocale.h>
 #include <kpopupmenu.h>
diff --git a/quanta/treeviews/filestreeview.cpp b/quanta/treeviews/filestreeview.cpp
index b9a0ac1d..eee9e6fb 100644
--- a/quanta/treeviews/filestreeview.cpp
+++ b/quanta/treeviews/filestreeview.cpp
@@ -24,7 +24,7 @@
 #include <kopenwith.h>
 #include <kmessagebox.h>
 #include <kpopupmenu.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kprogress.h>
 #include <kurl.h>
 
diff --git a/quanta/treeviews/servertreeview.cpp b/quanta/treeviews/servertreeview.cpp
index 4c9a821f..fa34f582 100644
--- a/quanta/treeviews/servertreeview.cpp
+++ b/quanta/treeviews/servertreeview.cpp
@@ -25,7 +25,7 @@
 #include <kopenwith.h>
 #include <kmessagebox.h>
 #include <kpopupmenu.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kprogress.h>
 #include <kurl.h>
 
diff --git a/quanta/treeviews/structtreeview.cpp b/quanta/treeviews/structtreeview.cpp
index f744e52d..4fa7afa9 100644
--- a/quanta/treeviews/structtreeview.cpp
+++ b/quanta/treeviews/structtreeview.cpp
@@ -32,7 +32,7 @@
 #include <kpopupmenu.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdetexteditor/view.h>
 
diff --git a/quanta/treeviews/templatestreeview.cpp b/quanta/treeviews/templatestreeview.cpp
index bd00665f..a9aa75d0 100644
--- a/quanta/treeviews/templatestreeview.cpp
+++ b/quanta/treeviews/templatestreeview.cpp
@@ -48,11 +48,11 @@
 #include <kurlrequesterdlg.h>
 #include <ktempdir.h>
 #include <ktempfile.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kurldrag.h>
 #include <ktar.h>
 #include <kdebug.h>
-#include <kfile.h>
+#include <tdefile.h>
 
 
 #include "templatestreeview.h"
diff --git a/quanta/treeviews/uploadtreefile.cpp b/quanta/treeviews/uploadtreefile.cpp
index 9c055424..5257117e 100644
--- a/quanta/treeviews/uploadtreefile.cpp
+++ b/quanta/treeviews/uploadtreefile.cpp
@@ -19,7 +19,7 @@
 #include <tqfileinfo.h>
 
 // KDE includes
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kiconloader.h>
 #include <kurl.h>
 
diff --git a/quanta/treeviews/uploadtreeview.cpp b/quanta/treeviews/uploadtreeview.cpp
index 259b81dc..4c5af524 100644
--- a/quanta/treeviews/uploadtreeview.cpp
+++ b/quanta/treeviews/uploadtreeview.cpp
@@ -18,7 +18,7 @@
 #include <kcursor.h>
 #include <klocale.h>
 #include <kurl.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 #include "uploadtreeview.h"
 #include "quantacommon.h"
diff --git a/quanta/utility/quantabookmarks.cpp b/quanta/utility/quantabookmarks.cpp
index c27e07a7..0678a972 100644
--- a/quanta/utility/quantabookmarks.cpp
+++ b/quanta/utility/quantabookmarks.cpp
@@ -21,7 +21,7 @@
 #include "quantabookmarks.h"
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kaction.h>
 #include <kdebug.h>
diff --git a/quanta/utility/quantacommon.cpp b/quanta/utility/quantacommon.cpp
index e29c1013..e7f9380d 100644
--- a/quanta/utility/quantacommon.cpp
+++ b/quanta/utility/quantacommon.cpp
@@ -34,7 +34,7 @@
 #include <kmimetype.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kprotocolinfo.h>
 #include <kprogress.h>
diff --git a/quanta/utility/quantanetaccess.cpp b/quanta/utility/quantanetaccess.cpp
index 6fa248eb..eb47cb86 100644
--- a/quanta/utility/quantanetaccess.cpp
+++ b/quanta/utility/quantanetaccess.cpp
@@ -17,11 +17,11 @@
 #include <tqwidget.h>
 #include <tqdir.h>
 
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kurl.h>
 #include <kmessagebox.h>
 #include <klocale.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kstringhandler.h>
 
 #include "qextfileinfo.h"
diff --git a/quanta/utility/tagactionset.cpp b/quanta/utility/tagactionset.cpp
index 58af9c65..a5397df8 100644
--- a/quanta/utility/tagactionset.cpp
+++ b/quanta/utility/tagactionset.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kactioncollection.h>
 #include <kactionclasses.h>
 #include <dom/dom_node.h>
diff --git a/tdefilereplace/CMakeLists.txt b/tdefilereplace/CMakeLists.txt
new file mode 100644
index 00000000..621c0e02
--- /dev/null
+++ b/tdefilereplace/CMakeLists.txt
@@ -0,0 +1,56 @@
+#################################################
+#
+#  (C) 2010-2011 Serghei Amelian
+#  serghei (DOT) amelian (AT) gmail.com
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+add_subdirectory( toolbar )
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+
+##### other data ################################
+
+tde_install_icons( )
+install( FILES tdefilereplace.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( FILES tdefilereplacepart.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdefilereplacepartui.rc DESTINATION ${DATA_INSTALL_DIR}/tdefilereplacepart )
+install( FILES tdefilereplaceui.rc DESTINATION ${DATA_INSTALL_DIR}/tdefilereplace )
+
+
+##### libtdefilereplacepart (module) ##############
+
+tde_add_kpart( libtdefilereplacepart AUTOMOC
+  SOURCES
+    commandengine.cpp configurationclasses.cpp
+    tdefilereplacepart.cpp tdefilereplaceview.cpp
+    tdefilereplaceviewwdg.ui kaddstringdlg.cpp kaddstringdlgs.ui
+    knewprojectdlg.cpp knewprojectdlgs.ui koptionsdlg.cpp
+    koptionsdlgs.ui tdefilereplacelib.cpp report.cpp
+  LINK tdeio-shared tdeparts-shared
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### tdefilereplace (executable) #################
+
+tde_add_executable( tdefilereplace AUTOMOC
+  SOURCES
+    tdefilereplace.cpp main.cpp
+  LINK tdeio-shared tdeparts-shared
+  DESTINATION ${BIN_INSTALL_DIR}
+)
diff --git a/kfilereplace/ChangeLog b/tdefilereplace/ChangeLog
index 9a9c507e..b94d65f5 100644
--- a/kfilereplace/ChangeLog
+++ b/tdefilereplace/ChangeLog
@@ -36,12 +36,12 @@
   *  Fixed a bug in KAddStringDlg: now when we want edit a string the search-only mode and search-replace mode 
      don't merge.
   *  Modified KFR file format: I added the tag '<mode search=""/>' just after the root <kfr> to allows 
-     kfilereplace to recognize if the list to load is a list of only search strings. I added some lines of code
+     tdefilereplace to recognize if the list to load is a list of only search strings. I added some lines of code
      to permit users to load files that don't have this new tag.
   *  I'm writing docbook manual. 
 
 2005-01-10 Emiliano Gulmini <emi_barbarossa@yahoo.it>
-  *  The KFilereplaceView widget has been modified. Now it change the layout of kfilereplace depending of the 
+  *  The KFilereplaceView widget has been modified. Now it change the layout of tdefilereplace depending of the 
      value of m_option->m_searchOnlyMode.
   *  I fixed a bug in the backup file option.
 
@@ -77,7 +77,7 @@
      code that do commands feature from KFileREplaceLib to these two classes.
 
 2004-08-09 Emiliano Gulmini <emi_barbarossa@yahoo.it>
-  *  I fixed a bug that affected the method "void KFileReplaceView::slotStringsClear()" in kfilereplaceview.cpp file.
+  *  I fixed a bug that affected the method "void KFileReplaceView::slotStringsClear()" in tdefilereplaceview.cpp file.
      This bug caused the list of strings not to be correctly erased.
 
 2004-08-07 Emiliano Gulmini <emi_barbarossa@yahoo.it>
@@ -95,7 +95,7 @@
                         "if(not(dirInfo.isReadable() and dirInfo.isExecutable())" 
                         "   or                                                  "
                         "   not(dirInfo.isWritable()))                          " 
-     in kfilereplacepart.cpp
+     in tdefilereplacepart.cpp
 
 2004-07-30 Emiliano Gulmini <emi_barbarossa@yahoo.it>
   *  The icons have been fixed!!! What a miracle!!!
@@ -138,8 +138,8 @@
      apistruct.h
      kernel.(cpp,h)
      kexpression.(cpp,h)
-     kfilereplacedoc.(cpp,h)
-     kfilereplacepref.(cpp,h)
+     tdefilereplacedoc.(cpp,h)
+     tdefilereplacepref.(cpp,h)
 
     were removed and these files are added:
 
@@ -178,7 +178,7 @@
   *  Fixed a bug that generate a wrong XHTML result file.
 
 2004-03-06 Emiliano Gulmini <emi_barbarossa@yahoo.it>
-  *  Added kconfirmdlgs.ui.
+  *  Added tdeconfirmdlgs.ui.
   *  Fixed a bug in KOptionDlg, now when we select a option, the selection is shown correctly.
   *  Fixed a bug KNewProjectDlg. 
 
@@ -191,13 +191,13 @@
      html code.
 
 2004-02-24 Emiliano Gulmini <emi_barbarossa@yahoo.it>
-  *  kfilereplacepref.(h,cpp) were removed.
+  *  tdefilereplacepref.(h,cpp) were removed.
   *  kernel.(h,cpp) now are a singleton class.
   *  Some macros in kernel.h were replaced with integer constants.
   *  Methods in kernel.h file were renamed.
   *  Some superflous #include lines were removed.
   *  The filelib.(h,cpp) were subtituted with KFilereplaceLib singleton class.
-  *  Now kfilereplace logo and icons in the result view appear.
+  *  Now tdefilereplace logo and icons in the result view appear.
 
 2004-02-18 Emiliano Gulmini <emi_barbarossa@yahoo.it>
   *  The icons in toolbar directory were redrawn.
diff --git a/tdefilereplace/Makefile.am b/tdefilereplace/Makefile.am
new file mode 100644
index 00000000..8d2584c0
--- /dev/null
+++ b/tdefilereplace/Makefile.am
@@ -0,0 +1,43 @@
+## Makefile.am for tdefilereplace
+
+# set the include path for X, qt and KDE
+INCLUDES  = $(all_includes)
+
+# this has all of the subdirectories that make will recurse into.  if
+# there are none, comment this out
+SUBDIRS = toolbar
+
+# these are the headers for your project
+noinst_HEADERS = kaddstringdlg.h tdefilereplaceiface.h tdefilereplacelib.h \
+	knewprojectdlg.h tdefilereplaceview.h koptionsdlg.h report.h commandengine.h \
+	configurationclasses.h tdefilereplace.h
+		 
+# let automoc handle all of the meta source files (moc)
+METASOURCES = AUTO
+
+kde_module_LTLIBRARIES = libtdefilereplacepart.la
+libtdefilereplacepart_la_SOURCES = tdefilereplacepart.cpp tdefilereplaceview.cpp \
+	tdefilereplaceviewwdg.ui kaddstringdlg.cpp kaddstringdlgs.ui knewprojectdlg.cpp \
+	knewprojectdlgs.ui koptionsdlg.cpp koptionsdlgs.ui tdefilereplacelib.cpp report.cpp \
+	commandengine.cpp configurationclasses.cpp
+				  
+libtdefilereplacepart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts -lDCOP
+libtdefilereplacepart_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KHTML)
+
+messages: rc.cpp
+	$(XGETTEXT) *.cpp *.h -o $(podir)/tdefilereplace.pot
+
+KDE_ICON = AUTO
+kde_services_DATA = tdefilereplacepart.desktop
+xdg_apps_DATA = tdefilereplace.desktop
+
+# this is where the XML-GUI resource file goes
+partrcdir = $(kde_datadir)/tdefilereplacepart
+partrc_DATA = tdefilereplacepartui.rc
+
+shellrcdir = $(kde_datadir)/tdefilereplace
+shellrc_DATA = tdefilereplaceui.rc
+bin_PROGRAMS = tdefilereplace
+tdefilereplace_LDFLAGS = $(KDE_RPATH) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts -lDCOP
+tdefilereplace_LDADD = $(LIB_KPARTS)
+tdefilereplace_SOURCES = tdefilereplace.cpp main.cpp
diff --git a/kfilereplace/commandengine.cpp b/tdefilereplace/commandengine.cpp
index 5184773c..5184773c 100644
--- a/kfilereplace/commandengine.cpp
+++ b/tdefilereplace/commandengine.cpp
diff --git a/kfilereplace/commandengine.h b/tdefilereplace/commandengine.h
index 36bcfcb8..36bcfcb8 100644
--- a/kfilereplace/commandengine.h
+++ b/tdefilereplace/commandengine.h
diff --git a/kfilereplace/configurationclasses.cpp b/tdefilereplace/configurationclasses.cpp
index f0c6bcc4..f0c6bcc4 100644
--- a/kfilereplace/configurationclasses.cpp
+++ b/tdefilereplace/configurationclasses.cpp
diff --git a/kfilereplace/configurationclasses.h b/tdefilereplace/configurationclasses.h
index 0d36261b..206de1c4 100644
--- a/kfilereplace/configurationclasses.h
+++ b/tdefilereplace/configurationclasses.h
@@ -25,7 +25,7 @@
 #include <tqregexp.h>
 
 typedef TQMap<TQString,TQString> KeyValueMap;
-// entry strings in the kfilereplacerc file
+// entry strings in the tdefilereplacerc file
 const TQString rcDirectoriesList = "Directories list";
 const TQString rcFiltersList = "Filters list";
 const TQString rcRecentFiles = "Recent files";
diff --git a/kfilereplace/configure.in.in b/tdefilereplace/configure.in.in
index a7f9ec22..787f832f 100644
--- a/kfilereplace/configure.in.in
+++ b/tdefilereplace/configure.in.in
@@ -1,6 +1,6 @@
 #MIN_CONFIG
 
-AM_INIT_AUTOMAKE(kfilereplace, 0.8.0)
+AM_INIT_AUTOMAKE(tdefilereplace, 0.8.0)
 
 dnl These are common macros that you might or might not want to use
 
diff --git a/kfilereplace/hi22-app-kfilereplace.png b/tdefilereplace/hi22-app-tdefilereplace.png
index 429a3984..429a3984 100644
--- a/kfilereplace/hi22-app-kfilereplace.png
+++ b/tdefilereplace/hi22-app-tdefilereplace.png
diff --git a/kfilereplace/hi32-app-kfilereplace.png b/tdefilereplace/hi32-app-tdefilereplace.png
index 8dff2abb..8dff2abb 100644
--- a/kfilereplace/hi32-app-kfilereplace.png
+++ b/tdefilereplace/hi32-app-tdefilereplace.png
diff --git a/kfilereplace/hi48-app-kfilereplace.png b/tdefilereplace/hi48-app-tdefilereplace.png
index c11f34ba..c11f34ba 100644
--- a/kfilereplace/hi48-app-kfilereplace.png
+++ b/tdefilereplace/hi48-app-tdefilereplace.png
diff --git a/kfilereplace/kaddstringdlg.cpp b/tdefilereplace/kaddstringdlg.cpp
index 1ec33552..a87ff7be 100644
--- a/kfilereplace/kaddstringdlg.cpp
+++ b/tdefilereplace/kaddstringdlg.cpp
@@ -28,7 +28,7 @@
 #include <kmessagebox.h>
 #include <kiconloader.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 
 // local
@@ -266,7 +266,7 @@ void KAddStringDlg::slotDeleteStringFromView()
 
 void KAddStringDlg::slotHelp()
 {
-  kapp->invokeHelp(TQString(), "kfilereplace");
+  kapp->invokeHelp(TQString(), "tdefilereplace");
 }
 
 #include "kaddstringdlg.moc"
diff --git a/kfilereplace/kaddstringdlg.h b/tdefilereplace/kaddstringdlg.h
index f39c2961..f39c2961 100644
--- a/kfilereplace/kaddstringdlg.h
+++ b/tdefilereplace/kaddstringdlg.h
diff --git a/kfilereplace/kaddstringdlgs.ui b/tdefilereplace/kaddstringdlgs.ui
index 563aa33f..563aa33f 100644
--- a/kfilereplace/kaddstringdlgs.ui
+++ b/tdefilereplace/kaddstringdlgs.ui
diff --git a/kfilereplace/knewprojectdlg.cpp b/tdefilereplace/knewprojectdlg.cpp
index b610990e..4e9c9281 100644
--- a/kfilereplace/knewprojectdlg.cpp
+++ b/tdefilereplace/knewprojectdlg.cpp
@@ -32,8 +32,8 @@
 #include <kmessagebox.h>
 #include <kcharsets.h>
 #include <kcombobox.h>
-#include <kconfig.h>
-#include <kfiledialog.h>
+#include <tdeconfig.h>
+#include <tdefiledialog.h>
 #include <klineedit.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/kfilereplace/knewprojectdlg.h b/tdefilereplace/knewprojectdlg.h
index 7be5ecb9..b8b87da6 100644
--- a/kfilereplace/knewprojectdlg.h
+++ b/tdefilereplace/knewprojectdlg.h
@@ -56,7 +56,7 @@ class KNewProjectDlg : public KNewProjectDlgS
     void slotEnableChbUser(bool b);
     void slotEnableChbGroup(bool b);
     void slotEnableChbBackup(bool b);
-    void slotHelp(){ kapp->invokeHelp(TQString(), "kfilereplace"); }
+    void slotHelp(){ kapp->invokeHelp(TQString(), "tdefilereplace"); }
 
   private:
     void initGUI();
diff --git a/kfilereplace/knewprojectdlgs.ui b/tdefilereplace/knewprojectdlgs.ui
index b3509c1d..b3509c1d 100644
--- a/kfilereplace/knewprojectdlgs.ui
+++ b/tdefilereplace/knewprojectdlgs.ui
diff --git a/kfilereplace/koptionsdlg.cpp b/tdefilereplace/koptionsdlg.cpp
index 8d303f08..bd6bcbe8 100644
--- a/kfilereplace/koptionsdlg.cpp
+++ b/tdefilereplace/koptionsdlg.cpp
@@ -27,7 +27,7 @@
 // KDE
 #include <kcharsets.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
 #include <kapplication.h>
@@ -43,7 +43,7 @@ using namespace whatthisNameSpace;
 
 KOptionsDlg::KOptionsDlg(RCOptions* info, TQWidget *parent, const char *name) : KOptionsDlgS(parent,name,true)
 {
-  m_config = new TDEConfig("kfilereplacerc");
+  m_config = new TDEConfig("tdefilereplacerc");
   m_option = info;
 
   initGUI();
diff --git a/kfilereplace/koptionsdlg.h b/tdefilereplace/koptionsdlg.h
index a9e8e620..4654c5cd 100644
--- a/kfilereplace/koptionsdlg.h
+++ b/tdefilereplace/koptionsdlg.h
@@ -48,7 +48,7 @@ class KOptionsDlg : public KOptionsDlgS
     void slotChbBackup(bool b);
     void slotChbConfirmStrings(bool b);
     void slotChbShowConfirmDialog(bool b);
-    void slotHelp(){ kapp->invokeHelp(TQString(), "kfilereplace"); }
+    void slotHelp(){ kapp->invokeHelp(TQString(), "tdefilereplace"); }
 
   private:
     void initGUI();
diff --git a/kfilereplace/koptionsdlgs.ui b/tdefilereplace/koptionsdlgs.ui
index 131e01f0..131e01f0 100644
--- a/kfilereplace/koptionsdlgs.ui
+++ b/tdefilereplace/koptionsdlgs.ui
diff --git a/kfilereplace/main.cpp b/tdefilereplace/main.cpp
index b3adfffe..4b12eba0 100644
--- a/kfilereplace/main.cpp
+++ b/tdefilereplace/main.cpp
@@ -14,7 +14,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "kfilereplace.h"
+#include "tdefilereplace.h"
 
 #include <kapplication.h>
 #include <kaboutdata.h>
@@ -34,7 +34,7 @@ static KCmdLineOptions options[] =
 
 int main(int argc, char *argv[])
 {
-    TDEAboutData about("kfilereplace", I18N_NOOP("KFileReplace"), version, description,
+    TDEAboutData about("tdefilereplace", I18N_NOOP("KFileReplace"), version, description,
                      TDEAboutData::License_GPL_V2, "(C) 2004-2005 Andras Mantia\n(C) 2004-2005 Emiliano Gulmini\n(C) 1999-2002 Francois Dupoux", I18N_NOOP("Part of the KDEWebDev module."),
                      "http://www.tdewebdev.org");
 
diff --git a/kfilereplace/report.cpp b/tdefilereplace/report.cpp
index 6d485eba..6d485eba 100644
--- a/kfilereplace/report.cpp
+++ b/tdefilereplace/report.cpp
diff --git a/kfilereplace/report.h b/tdefilereplace/report.h
index 13856334..13856334 100644
--- a/kfilereplace/report.h
+++ b/tdefilereplace/report.h
diff --git a/kfilereplace/kfilereplace.cpp b/tdefilereplace/tdefilereplace.cpp
index a0976658..bd5725e4 100644
--- a/kfilereplace/kfilereplace.cpp
+++ b/tdefilereplace/tdefilereplace.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-               kfilereplace.cpp  -  KFileReplace shell implementation
+               tdefilereplace.cpp  -  KFileReplace shell implementation
                              -------------------
     begin                : Thu Sep 16 14:14:09 2004
     copyright            : (C) 2004 by Andras Mantia <amantia@kde.org>
@@ -22,16 +22,16 @@
 #include <kmessagebox.h>
 
 //app includes
-#include "kfilereplace.h"
+#include "tdefilereplace.h"
 
 KFileReplace::KFileReplace()
  : KParts::MainWindow(0L, "KFileReplace")
 {
-    KLibFactory *factory = KLibLoader::self()->factory("libkfilereplacepart");
+    KLibFactory *factory = KLibLoader::self()->factory("libtdefilereplacepart");
     if (factory)
     {
         m_part = static_cast<KParts::ReadOnlyPart *>(factory->create(TQT_TQOBJECT(this),
-                "kfilereplace_part", "KParts::ReadOnlyPart" ));
+                "tdefilereplace_part", "KParts::ReadOnlyPart" ));
 
         if (m_part)
         {
@@ -92,9 +92,9 @@ void KFileReplace::applyNewToolbarConfig()
 void KFileReplace::removeDuplicatedActions()
 {
     KActionCollection* part_action_collection = m_part->actionCollection();
-    KAction* part_about_action = part_action_collection->action("help_about_kfilereplace");
+    KAction* part_about_action = part_action_collection->action("help_about_tdefilereplace");
     KAction* part_report_action = part_action_collection->action("report_bug");
-    KAction* part_help_action= part_action_collection->action("help_kfilereplace");
+    KAction* part_help_action= part_action_collection->action("help_tdefilereplace");
 
     if (!part_about_action || !part_report_action || !part_help_action || !part_action_collection) 
       return;
@@ -108,4 +108,4 @@ void KFileReplace::removeDuplicatedActions()
     part_action_collection->remove(part_help_action);
 }
 
-#include "kfilereplace.moc"
+#include "tdefilereplace.moc"
diff --git a/kfilereplace/kfilereplace.desktop b/tdefilereplace/tdefilereplace.desktop
index e656566f..d5ae92ca 100644
--- a/kfilereplace/kfilereplace.desktop
+++ b/tdefilereplace/tdefilereplace.desktop
@@ -8,10 +8,10 @@ Name[sv]=Kfilereplace
 Name[ta]=Kகோப்பு இடமாற்று
 Name[tg]=KФайлро ҷойгузор кардан
 Name[tr]=K Dosya Değiştirme
-Exec=kfilereplace %i %m -caption "%c"
-Icon=kfilereplace
+Exec=tdefilereplace %i %m -caption "%c"
+Icon=tdefilereplace
 Type=Application
-DocPath=kfilereplace/index.html
+DocPath=tdefilereplace/index.html
 Terminal=false
 GenericName=Search & Replace Tool
 GenericName[bg]=Търсене и замяна
diff --git a/kfilereplace/kfilereplace.h b/tdefilereplace/tdefilereplace.h
index 5623d3bf..6dd154d9 100644
--- a/kfilereplace/kfilereplace.h
+++ b/tdefilereplace/tdefilereplace.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-               kfilereplace.h  -  KFileReplace header
+               tdefilereplace.h  -  KFileReplace header
                              -------------------
     begin                : Thu Sep 16 14:14:09 2004
     copyright            : (C) 2004 by Andras Mantia <amantia@kde.org>
diff --git a/kfilereplace/kfilereplace.tdevelop b/tdefilereplace/tdefilereplace.tdevelop
index fcba4350..14e5fe4a 100644
--- a/kfilereplace/kfilereplace.tdevelop
+++ b/tdefilereplace/tdefilereplace.tdevelop
@@ -112,7 +112,7 @@
     <run>
       <directoryradio>build</directoryradio>
       <customdirectory>/</customdirectory>
-      <mainprogram>kfilereplace/kfilereplace</mainprogram>
+      <mainprogram>tdefilereplace/tdefilereplace</mainprogram>
       <programargs/>
       <terminal>false</terminal>
       <autocompile>true</autocompile>
@@ -120,7 +120,7 @@
     </run>
     <general>
       <useconfiguration>default</useconfiguration>
-      <activetarget>kfilereplace</activetarget>
+      <activetarget>tdefilereplace</activetarget>
     </general>
     <configurations>
       <default>
diff --git a/kfilereplace/kfilereplaceiface.h b/tdefilereplace/tdefilereplaceiface.h
index 3c62ae99..515a330e 100644
--- a/kfilereplace/kfilereplaceiface.h
+++ b/tdefilereplace/tdefilereplaceiface.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          kfilereplaceif.h  -  description
+                          tdefilereplaceif.h  -  description
                              -------------------
     copyright            : (C) 1999 by Fran�ois Dupoux
                            (C) 2003 Andras Mantia
diff --git a/kfilereplace/kfilereplacelib.cpp b/tdefilereplace/tdefilereplacelib.cpp
index 6e0d8323..0f396f85 100644
--- a/kfilereplace/kfilereplacelib.cpp
+++ b/tdefilereplace/tdefilereplacelib.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                           kfilereplacelib.cpp  -  File library
+                           tdefilereplacelib.cpp  -  File library
                                       -------------------
     begin                : lun mai  3 20:19:52 CEST 1999
 
@@ -35,7 +35,7 @@
 #include <stdlib.h>
 
 // local
-#include "kfilereplacelib.h"
+#include "tdefilereplacelib.h"
 
 const double kilo = 1024.0;
 const double mega = 1048576.0;//1024^2
diff --git a/kfilereplace/kfilereplacelib.h b/tdefilereplace/tdefilereplacelib.h
index de80d17d..0810a992 100644
--- a/kfilereplace/kfilereplacelib.h
+++ b/tdefilereplace/tdefilereplacelib.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                           kfilereplacelib.h  -  File library, derived from filelib.h
+                           tdefilereplacelib.h  -  File library, derived from filelib.h
                                       -------------------
     begin                : lun mai  3 20:19:52 CEST 1999
 
diff --git a/kfilereplace/kfilereplacepart.cpp b/tdefilereplace/tdefilereplacepart.cpp
index ed01399a..ab91ae47 100644
--- a/kfilereplace/kfilereplacepart.cpp
+++ b/tdefilereplace/tdefilereplacepart.cpp
@@ -1,6 +1,6 @@
 //
 //
-// C++ Implementation: kfilereplacepart
+// C++ Implementation: tdefilereplacepart
 //
 // Description:
 //
@@ -26,10 +26,10 @@
 #include <kapplication.h>
 #include <kaction.h>
 #include <kbugreport.h>
-#include <kconfig.h>
-#include <kfiledialog.h>
+#include <tdeconfig.h>
+#include <tdefiledialog.h>
 #include <kinstance.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <tdeparts/genericfactory.h>
@@ -43,9 +43,9 @@
 #include <kguiitem.h>
 
 // local
-#include "kfilereplacelib.h"
-#include "kfilereplacepart.h"
-#include "kfilereplaceview.h"
+#include "tdefilereplacelib.h"
+#include "tdefilereplacepart.h"
+#include "tdefilereplaceview.h"
 #include "koptionsdlg.h"
 #include "knewprojectdlg.h"
 #include "report.h"
@@ -58,14 +58,14 @@ using namespace whatthisNameSpace;
 // Factory code for KDE 3
 typedef KParts::GenericFactory<KFileReplacePart> FileReplaceFactory;
 
-K_EXPORT_COMPONENT_FACTORY( libkfilereplacepart, FileReplaceFactory )
+K_EXPORT_COMPONENT_FACTORY( libtdefilereplacepart, FileReplaceFactory )
 
 KFileReplacePart::KFileReplacePart(TQWidget* parentWidget, const char* , TQObject* parent, const char* name, const TQStringList & ) : KParts::ReadOnlyPart(parent,name)
 {
   setInstance(FileReplaceFactory::instance());
-  TDEGlobal::locale()->insertCatalogue("kfilereplace");	
+  TDEGlobal::locale()->insertCatalogue("tdefilereplace");	
   m_parentWidget = parentWidget;
-  m_config = new TDEConfig("kfilereplacerc");
+  m_config = new TDEConfig("tdefilereplacerc");
   m_aboutDlg = 0;
   m_stop = false;
   m_optionMask = TQDir::Files;
@@ -443,7 +443,7 @@ void KFileReplacePart::showAboutApplication()
 
 void KFileReplacePart::appHelpActivated()
 {
-  kapp->invokeHelp(TQString(), "kfilereplace");
+  kapp->invokeHelp(TQString(), "tdefilereplace");
 }
 
 void KFileReplacePart::reportBug()
@@ -484,7 +484,7 @@ void KFileReplacePart::resetActions()
   actionCollection()->action("options_case")->setEnabled(true);
   actionCollection()->action("options_var")->setEnabled(!searchOnlyMode);
   actionCollection()->action("options_regularexpressions")->setEnabled(true);
-  actionCollection()->action("configure_kfilereplace")->setEnabled(true);
+  actionCollection()->action("configure_tdefilereplace")->setEnabled(true);
 
   hasItems = (rv->firstChild() != 0);
 
@@ -509,7 +509,7 @@ void KFileReplacePart::resetActions()
 //PUBLIC METHODS
 TDEAboutData* KFileReplacePart::createAboutData()
 {
-  TDEAboutData * aboutData = new TDEAboutData("kfilereplacepart",
+  TDEAboutData * aboutData = new TDEAboutData("tdefilereplacepart",
                                           I18N_NOOP("KFileReplacePart"),
                                           KFR_VERSION,
                                           I18N_NOOP( "Batch search and replace tool."),
@@ -551,7 +551,7 @@ bool KFileReplacePart::openURL(const KURL &url)
 //PRIVATE METHODS
 void KFileReplacePart::initGUI()
 {
-  setXMLFile("kfilereplacepartui.rc");
+  setXMLFile("tdefilereplacepartui.rc");
 
   actionCollection()->setHighlightingEnabled(true);
 
@@ -592,7 +592,7 @@ void KFileReplacePart::initGUI()
   (void)new KToggleAction(i18n("Case &Sensitive"), "casesensitive_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionCaseSensitive()), actionCollection(), "options_case");
   (void)new KToggleAction(i18n("Enable Commands &in Replace String: [$command:option$]"), "command_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionVariables()), actionCollection(), "options_var");
   (void)new KToggleAction(i18n("Enable &Regular Expressions"), "regularexpression_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionRegularExpressions()), actionCollection(), "options_regularexpressions");
-  (void)new KAction(i18n("Configure &KFileReplace..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionPreferences()), actionCollection(), "configure_kfilereplace");
+  (void)new KAction(i18n("Configure &KFileReplace..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionPreferences()), actionCollection(), "configure_tdefilereplace");
 
   // Results
   (void)new KAction(i18n("&Properties"), "informations", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultProperties()), actionCollection(), "results_infos");
@@ -606,8 +606,8 @@ void KFileReplacePart::initGUI()
   (void)new KAction(i18n("&Delete"), "editdelete", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultDelete()), actionCollection(), "results_delete");
   (void)new KAction(i18n("E&xpand Tree"), 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultTreeExpand()), actionCollection(), "results_treeexpand");
   (void)new KAction(i18n("&Reduce Tree"), 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultTreeReduce()), actionCollection(), "results_treereduce");
-  (void)new KAction(i18n("&About KFileReplace"), "kfilereplace", 0, TQT_TQOBJECT(this), TQT_SLOT(showAboutApplication()), actionCollection(), "help_about_kfilereplace");
-  (void)new KAction(i18n("KFileReplace &Handbook"), "help", 0, TQT_TQOBJECT(this), TQT_SLOT(appHelpActivated()), actionCollection(), "help_kfilereplace");
+  (void)new KAction(i18n("&About KFileReplace"), "tdefilereplace", 0, TQT_TQOBJECT(this), TQT_SLOT(showAboutApplication()), actionCollection(), "help_about_tdefilereplace");
+  (void)new KAction(i18n("KFileReplace &Handbook"), "help", 0, TQT_TQOBJECT(this), TQT_SLOT(appHelpActivated()), actionCollection(), "help_tdefilereplace");
   (void)new KAction(i18n("&Report Bug"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(reportBug()), actionCollection(), "report_bug");
 
 }
@@ -645,7 +645,7 @@ void KFileReplacePart::freezeActions()
   actionCollection()->action("options_case")->setEnabled(false);
   actionCollection()->action("options_var")->setEnabled(false);
   actionCollection()->action("options_regularexpressions")->setEnabled(false);
-  actionCollection()->action("configure_kfilereplace")->setEnabled(false);
+  actionCollection()->action("configure_tdefilereplace")->setEnabled(false);
   actionCollection()->action("results_infos")->setEnabled(false);
   actionCollection()->action("results_openfile")->setEnabled(false);
   if (actionCollection()->action("results_editfile"))
@@ -1517,7 +1517,7 @@ void KFileReplacePart::loadRulesFile(const TQString& fileName)
     {
       file.close();
 
-      KMessageBox::information(m_w, i18n("<qt>File <b>%1</b> seems not to be written in new kfr format. Remember that the old kfr format will be soon abandoned. You can convert your old rules files by simply saving them with kfilereplace.</qt>").arg(fileName),i18n("Warning"));
+      KMessageBox::information(m_w, i18n("<qt>File <b>%1</b> seems not to be written in new kfr format. Remember that the old kfr format will be soon abandoned. You can convert your old rules files by simply saving them with tdefilereplace.</qt>").arg(fileName),i18n("Warning"));
 
       KFileReplaceLib::convertOldToNewKFRFormat(fileName, sv);
 
@@ -1676,4 +1676,4 @@ void KFileReplacePart::whatsThis()
   actionCollection()->action("options_regularexpressions")->setWhatsThis(optionsRegularExpressionsWhatthis);
 }
 
-#include "kfilereplacepart.moc"
+#include "tdefilereplacepart.moc"
diff --git a/kfilereplace/kfilereplacepart.desktop b/tdefilereplace/tdefilereplacepart.desktop
index f8c01e3e..de5ba1ee 100644
--- a/kfilereplace/kfilereplacepart.desktop
+++ b/tdefilereplace/tdefilereplacepart.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
 Type=Service
 MimeType=inode/directory
-Icon=kfilereplace.png
+Icon=tdefilereplace.png
 ServiceTypes=KParts/ReadOnlyPart
-X-TDE-Library=libkfilereplacepart
+X-TDE-Library=libtdefilereplacepart
 Comment=A batch search and replace tool
 Comment[bg]=Търсене и замяна във фонов режим
 Comment[ca]=Una eina per a la cerca i substitució per lots
diff --git a/kfilereplace/kfilereplacepart.h b/tdefilereplace/tdefilereplacepart.h
index cc427153..d4f84b77 100644
--- a/kfilereplace/kfilereplacepart.h
+++ b/tdefilereplace/tdefilereplacepart.h
@@ -1,6 +1,6 @@
 //
 //
-// C++ Interface: kfilereplacepart
+// C++ Interface: tdefilereplacepart
 //
 // Description:
 //
@@ -101,12 +101,12 @@ class KFileReplacePart: public KParts::ReadOnlyPart
     void initView();
 
     /**
-     * This method freezes the GUI of kfilereplace during searching
+     * This method freezes the GUI of tdefilereplace during searching
      */
     void freezeActions();
 
     /**
-     * These methods load the resources from kfilereplacerc
+     * These methods load the resources from tdefilereplacerc
      */
     void loadOptionsFromRC();
     void loadOptions();
@@ -118,7 +118,7 @@ class KFileReplacePart: public KParts::ReadOnlyPart
     void loadBackupExtensionOptions();
 
     /**
-     * These methods save the resources to kfilereplacerc
+     * These methods save the resources to tdefilereplacerc
      */
     void saveOptionsToRC();
     void saveOptions();
diff --git a/kfilereplace/kfilereplacepartui.rc b/tdefilereplace/tdefilereplacepartui.rc
index 66946878..797809c6 100644
--- a/kfilereplace/kfilereplacepartui.rc
+++ b/tdefilereplace/tdefilereplacepartui.rc
@@ -1,7 +1,7 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="kfilereplace" version="6">
+<kpartgui name="tdefilereplace" version="6">
 <MenuBar>
-    <Menu name="kfilerepace"><text>Search/&amp;Replace</text>
+    <Menu name="tdefilerepace"><text>Search/&amp;Replace</text>
         <Action name="new_project"/>
         <Action name="search"/>
         <Action name="file_simulate"/>
@@ -42,13 +42,13 @@
         </Menu>
     </Menu>
     <Menu name="settings"><text>&amp;Settings</text>
-        <Action name="configure_kfilereplace"/>
+        <Action name="configure_tdefilereplace"/>
     </Menu>
     <Menu name="help"><text>&amp;Help</text>
 	<Separator/>
-	<Action name="help_kfilereplace" />
+	<Action name="help_tdefilereplace" />
 	<Action name="report_bug" />
-	<Action name="help_about_kfilereplace" />
+	<Action name="help_about_tdefilereplace" />
     </Menu>
 </MenuBar>
 <ToolBar noMerge="1" name="mainToolBar">
diff --git a/kfilereplace/kfilereplaceui.rc b/tdefilereplace/tdefilereplaceui.rc
index 2f645413..e70165ae 100644
--- a/kfilereplace/kfilereplaceui.rc
+++ b/tdefilereplace/tdefilereplaceui.rc
@@ -1,10 +1,10 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="kfilereplace" version="1">
+<kpartgui name="tdefilereplace" version="1">
 <MenuBar>
   <Menu noMerge="1" name="file"><text>&amp;File</text>
     <Action name="file_quit"/>
   </Menu>
-  <Menu name="kfilerepace"><text>Search/&amp;Replace</text>
+  <Menu name="tdefilerepace"><text>Search/&amp;Replace</text>
   </Menu>    
 </MenuBar>
 </kpartgui>
diff --git a/kfilereplace/kfilereplaceview.cpp b/tdefilereplace/tdefilereplaceview.cpp
index 5996193e..b7a8c6be 100644
--- a/kfilereplace/kfilereplaceview.cpp
+++ b/tdefilereplace/tdefilereplaceview.cpp
@@ -1,5 +1,5 @@
 /*****************************************************************************
-                          kfilereplaceview.cpp  -  description
+                          tdefilereplaceview.cpp  -  description
                              -------------------
     begin                : sam oct 16 15:28:00 CEST 1999
     copyright            : (C) 1999 by Fran�is Dupoux <dupoux@dupoux.com>
@@ -33,11 +33,11 @@
 //#include <kdebug.h>
 #include <kiconloader.h>
 #include <kled.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 // local
-#include "kfilereplaceview.h"
-#include "kfilereplacelib.h"
+#include "tdefilereplaceview.h"
+#include "tdefilereplacelib.h"
 #include "kaddstringdlg.h"
 #include "whatthis.h"
 
@@ -669,4 +669,4 @@ void KFileReplaceView::whatsThis()
   TQWhatsThis::add(getResultsView(), lvResultWhatthis);
   TQWhatsThis::add(getStringsView(), lvStringsWhatthis);
 }
-#include "kfilereplaceview.moc"
+#include "tdefilereplaceview.moc"
diff --git a/kfilereplace/kfilereplaceview.h b/tdefilereplace/tdefilereplaceview.h
index 4df878cf..adb77f6b 100644
--- a/kfilereplace/kfilereplaceview.h
+++ b/tdefilereplace/tdefilereplaceview.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          kfilereplaceview.h  -  description
+                          tdefilereplaceview.h  -  description
                              -------------------
     begin                : sam oct 16 15:28:00 CEST 1999
     copyright            : (C) 1999 by Fran�ois Dupoux <dupoux@dupoux.com>
@@ -32,7 +32,7 @@ class KPopupMenu;
 class KListView;
 
 //local
-#include "kfilereplaceviewwdg.h"
+#include "tdefilereplaceviewwdg.h"
 #include "configurationclasses.h"
 
 class coord
diff --git a/kfilereplace/kfilereplaceviewwdg.ui b/tdefilereplace/tdefilereplaceviewwdg.ui
index c8fca48d..c8fca48d 100644
--- a/kfilereplace/kfilereplaceviewwdg.ui
+++ b/tdefilereplace/tdefilereplaceviewwdg.ui
diff --git a/kfilereplace/toolbar/CMakeLists.txt b/tdefilereplace/toolbar/CMakeLists.txt
index 5496d621..95cdbd9f 100644
--- a/kfilereplace/toolbar/CMakeLists.txt
+++ b/tdefilereplace/toolbar/CMakeLists.txt
@@ -10,4 +10,4 @@
 #################################################
 
 
-tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/kfilereplacepart/icons )
+tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/tdefilereplacepart/icons )
diff --git a/tdefilereplace/toolbar/Makefile.am b/tdefilereplace/toolbar/Makefile.am
new file mode 100644
index 00000000..fb5c86b8
--- /dev/null
+++ b/tdefilereplace/toolbar/Makefile.am
@@ -0,0 +1,3 @@
+appdir = $(kde_datadir)/tdefilereplacepart/icons
+app_ICON = AUTO
+
diff --git a/kfilereplace/toolbar/cr22-action-back.png b/tdefilereplace/toolbar/cr22-action-back.png
index 3e8f12fe..3e8f12fe 100644
--- a/kfilereplace/toolbar/cr22-action-back.png
+++ b/tdefilereplace/toolbar/cr22-action-back.png
diff --git a/kfilereplace/toolbar/cr22-action-backup_option.png b/tdefilereplace/toolbar/cr22-action-backup_option.png
index a0e1e02f..a0e1e02f 100644
--- a/kfilereplace/toolbar/cr22-action-backup_option.png
+++ b/tdefilereplace/toolbar/cr22-action-backup_option.png
diff --git a/kfilereplace/toolbar/cr22-action-casesensitive_option.png b/tdefilereplace/toolbar/cr22-action-casesensitive_option.png
index 6302c0f2..6302c0f2 100644
--- a/kfilereplace/toolbar/cr22-action-casesensitive_option.png
+++ b/tdefilereplace/toolbar/cr22-action-casesensitive_option.png
diff --git a/kfilereplace/toolbar/cr22-action-command_option.png b/tdefilereplace/toolbar/cr22-action-command_option.png
index 1da3688b..1da3688b 100644
--- a/kfilereplace/toolbar/cr22-action-command_option.png
+++ b/tdefilereplace/toolbar/cr22-action-command_option.png
diff --git a/kfilereplace/toolbar/cr22-action-editadd.png b/tdefilereplace/toolbar/cr22-action-editadd.png
index 5eb6f503..5eb6f503 100644
--- a/kfilereplace/toolbar/cr22-action-editadd.png
+++ b/tdefilereplace/toolbar/cr22-action-editadd.png
diff --git a/kfilereplace/toolbar/cr22-action-editremove.png b/tdefilereplace/toolbar/cr22-action-editremove.png
index 50117f6d..50117f6d 100644
--- a/kfilereplace/toolbar/cr22-action-editremove.png
+++ b/tdefilereplace/toolbar/cr22-action-editremove.png
diff --git a/kfilereplace/toolbar/cr22-action-filereplace.png b/tdefilereplace/toolbar/cr22-action-filereplace.png
index c3692e11..c3692e11 100644
--- a/kfilereplace/toolbar/cr22-action-filereplace.png
+++ b/tdefilereplace/toolbar/cr22-action-filereplace.png
diff --git a/kfilereplace/toolbar/cr22-action-filesearch.png b/tdefilereplace/toolbar/cr22-action-filesearch.png
index 1be59c49..1be59c49 100644
--- a/kfilereplace/toolbar/cr22-action-filesearch.png
+++ b/tdefilereplace/toolbar/cr22-action-filesearch.png
diff --git a/kfilereplace/toolbar/cr22-action-filesimulate.png b/tdefilereplace/toolbar/cr22-action-filesimulate.png
index 7cc5b284..7cc5b284 100644
--- a/kfilereplace/toolbar/cr22-action-filesimulate.png
+++ b/tdefilereplace/toolbar/cr22-action-filesimulate.png
diff --git a/kfilereplace/toolbar/cr22-action-informations.png b/tdefilereplace/toolbar/cr22-action-informations.png
index daeb5b80..daeb5b80 100644
--- a/kfilereplace/toolbar/cr22-action-informations.png
+++ b/tdefilereplace/toolbar/cr22-action-informations.png
diff --git a/kfilereplace/toolbar/cr22-action-invert.png b/tdefilereplace/toolbar/cr22-action-invert.png
index f3ab8be6..f3ab8be6 100644
--- a/kfilereplace/toolbar/cr22-action-invert.png
+++ b/tdefilereplace/toolbar/cr22-action-invert.png
diff --git a/kfilereplace/toolbar/cr22-action-next.png b/tdefilereplace/toolbar/cr22-action-next.png
index cfab7cfb..cfab7cfb 100644
--- a/kfilereplace/toolbar/cr22-action-next.png
+++ b/tdefilereplace/toolbar/cr22-action-next.png
diff --git a/kfilereplace/toolbar/cr22-action-projectopen.png b/tdefilereplace/toolbar/cr22-action-projectopen.png
index 607e6aa8..607e6aa8 100644
--- a/kfilereplace/toolbar/cr22-action-projectopen.png
+++ b/tdefilereplace/toolbar/cr22-action-projectopen.png
diff --git a/kfilereplace/toolbar/cr22-action-recursive_option.png b/tdefilereplace/toolbar/cr22-action-recursive_option.png
index bc98df90..bc98df90 100644
--- a/kfilereplace/toolbar/cr22-action-recursive_option.png
+++ b/tdefilereplace/toolbar/cr22-action-recursive_option.png
diff --git a/kfilereplace/toolbar/cr22-action-regularexpression_option.png b/tdefilereplace/toolbar/cr22-action-regularexpression_option.png
index f74c7b56..f74c7b56 100644
--- a/kfilereplace/toolbar/cr22-action-regularexpression_option.png
+++ b/tdefilereplace/toolbar/cr22-action-regularexpression_option.png
diff --git a/kfilereplace/toolbar/cr22-action-unsortedList.png b/tdefilereplace/toolbar/cr22-action-unsortedList.png
index bed281f1..bed281f1 100644
--- a/kfilereplace/toolbar/cr22-action-unsortedList.png
+++ b/tdefilereplace/toolbar/cr22-action-unsortedList.png
diff --git a/kfilereplace/tutorial.kwd b/tdefilereplace/tutorial.kwd
index 2183e53b..2183e53b 100644
--- a/kfilereplace/tutorial.kwd
+++ b/tdefilereplace/tutorial.kwd
diff --git a/kfilereplace/whatthis.h b/tdefilereplace/whatthis.h
index 09f6ac80..6692d373 100644
--- a/kfilereplace/whatthis.h
+++ b/tdefilereplace/whatthis.h
@@ -62,7 +62,7 @@ namespace whatthisNameSpace
 
   const TQString chbIgnoreWhitespacesWhatthis ="";
 
-  const TQString chbFollowSymLinksWhatthis = i18n("If kfilereplace encounters a symbolic link treats it like a normal folder or file.");
+  const TQString chbFollowSymLinksWhatthis = i18n("If tdefilereplace encounters a symbolic link treats it like a normal folder or file.");
 
   const TQString chbIgnoreHiddenWhatthis = i18n("Enable this option to ignore hidden files or folders.");