Initial TDE conversion

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

74 files changed, 684 insertions, 684 deletions

diff --git a/BUGS b/BUGS
index 32198e3..5fdbabf 100644
--- a/BUGS
+++ b/BUGS
@@ -18,7 +18,7 @@ the window continuously.
 
 Some actions in the Configure Shortcuts and Configure Toolbars dialogs
 have the same name when in fact they are different actions. This is
-presently a kdelibs limitation.
+presently a tdelibs limitation.
 
 Reporting bugs
 --------------
diff --git a/INSTALL b/INSTALL
index 8b913b5..8b17418 100644
--- a/INSTALL
+++ b/INSTALL
@@ -31,7 +31,7 @@ Create configure script
 
 Configure
 
-  ./configure --prefix=`kde-config --prefix`
+  ./configure --prefix=`tde-config --prefix`
 
 Compile
 
diff --git a/doc/da/howto-bug-reporting.docbook b/doc/da/howto-bug-reporting.docbook
index adbe810..7e45ef5 100644
--- a/doc/da/howto-bug-reporting.docbook
+++ b/doc/da/howto-bug-reporting.docbook
@@ -68,7 +68,7 @@
 
 <listitem
 ><para
->vindueshåndteringen, normalt &kwin;.</para
+>vindueshåndteringen, normalt &twin;.</para
 ></listitem>
 
 </itemizedlist>
diff --git a/doc/da/howto-compilation.docbook b/doc/da/howto-compilation.docbook
index 8bf81f5..dc2c97e 100644
--- a/doc/da/howto-compilation.docbook
+++ b/doc/da/howto-compilation.docbook
@@ -4,9 +4,9 @@
 
 <para
 >Hent først ned og installér udviklingspakker for &kde;, Qt og X11. De skulle være tilgængelige i din distribution, for eksempel i Debian er pakkenavnene <literal
->kdelibs4-dev</literal
+>tdelibs-trinity-dev</literal
 >, <literal
->libqt3-mt-dev</literal
+>libtqt-mt-dev</literal
 > og <literal
 >xlibs-dev</literal
 >. Du kan også behøve andre udviklingspakker.</para>
@@ -130,7 +130,7 @@
 >./configure</command
 > <option
 >--prefix</option
-> `kde-config --prefix`</userinput
+> `tde-config --prefix`</userinput
 ></para>
 
 <para
@@ -249,7 +249,7 @@
 ><command
 >./configure</command
 > <option
->--prefix=`kde-config --prefix`</option
+>--prefix=`tde-config --prefix`</option
 > <option
 >--enable-libsuffix=64</option
 > <option
diff --git a/doc/da/howto-troubleshooting.docbook b/doc/da/howto-troubleshooting.docbook
index 8db1187..e8470f7 100644
--- a/doc/da/howto-troubleshooting.docbook
+++ b/doc/da/howto-troubleshooting.docbook
@@ -49,13 +49,13 @@
 > blev borte under installation, og &kplayer; kan ikke finde den. Hvis du installerede med en binær pakke, så klag din nød til pakkeudvikleren. Når du kompilerer fra kildekode, så sørg for at du følger instruktionerne i <link linkend="howto-compilation"
 >minivejledningen for kompilering</link
 >, særlig delen om <command
->kde-config</command
+>tde-config</command
 >. Inden du starter, skriv</para>
 
 <para
 ><userinput
 ><command
->kde-config</command
+>tde-config</command
 > <option
 >--prefix</option
 ></userinput
@@ -410,15 +410,15 @@
 
 <sect3>
 <title
->Kan ikke opgradere kdelibs-data på grund af en konflikt</title>
+>Kan ikke opgradere tdelibs-trinity-data på grund af en konflikt</title>
 
 <para
 >I Debian indeholder pakken <literal
->kdelibs-data</literal
+>tdelibs-trinity-data</literal
 > filen <filename
 >rtsp.protocol</filename
 >, som &kplayer; erstatter med sin egen version. Hvis du senere forsøger at uogradere pakken <literal
->kdelibs-data</literal
+>tdelibs-trinity-data</literal
 >, klager <command
 >apt-get</command
 > over en konflikt. Det er et fejl i <command
@@ -436,7 +436,7 @@
 ><userinput
 ><command
 >apt-get</command
-> install kdelibs-data</userinput
+> install tdelibs-trinity-data</userinput
 ></para>
 
 <para
@@ -450,7 +450,7 @@
 >Hvis du kører <userinput
 ><command
 >apt-get</command
-> install kdelibs-data</userinput
+> install tdelibs-trinity-data</userinput
 > inden <userinput
 ><command
 >apt-get</command
diff --git a/doc/da/index.docbook b/doc/da/index.docbook
index d531da1..e7b9fe3 100644
--- a/doc/da/index.docbook
+++ b/doc/da/index.docbook
@@ -86,7 +86,7 @@
 <keyword
 >KDE</keyword>
 <keyword
->kdemultimedia</keyword>
+>tdemultimedia</keyword>
 <keyword
 >KPlayer</keyword>
 <keyword
diff --git a/doc/en/howto-bug-reporting.docbook b/doc/en/howto-bug-reporting.docbook
index f45a1a1..9919426 100644
--- a/doc/en/howto-bug-reporting.docbook
+++ b/doc/en/howto-bug-reporting.docbook
@@ -47,7 +47,7 @@ a bug</ulink>, please include all of the following information.</para>
 
 <listitem><para>XFree,</para></listitem>
 
-<listitem><para>the window manager, normally &kwin;.</para></listitem>
+<listitem><para>the window manager, normally &twin;.</para></listitem>
 
 </itemizedlist>
 
diff --git a/doc/en/howto-compilation.docbook b/doc/en/howto-compilation.docbook
index 23bfd77..c567a4b 100644
--- a/doc/en/howto-compilation.docbook
+++ b/doc/en/howto-compilation.docbook
@@ -3,8 +3,8 @@
 
 <para>First, download and install development packages for &kde;, Qt, and X11.
 Those should be available in your distribution, for example in Debian the
-package names are <literal>kdelibs4-dev</literal>,
-<literal>libqt3-mt-dev</literal> and <literal>xlibs-dev</literal>. You may need
+package names are <literal>tdelibs-trinity-dev</literal>,
+<literal>libtqt-mt-dev</literal> and <literal>xlibs-dev</literal>. You may need
 other development packages as well.</para>
 
 <sect2 id="howto-compilation-sources">
@@ -63,7 +63,7 @@ co <option>-P</option> kplayer</userinput></para>
 <para>and run it</para>
 
 <para><userinput><command>./configure</command> <option>--prefix</option>
-`kde-config --prefix`</userinput></para>
+`tde-config --prefix`</userinput></para>
 
 <para>If at this point you are getting errors about missing libraries, you will
 probably need to install more development packages from your distribution. The
@@ -129,7 +129,7 @@ url="http://linux.tosovsky.info/exec.php?show=kplayeren">English</ulink>.</para>
 2.6.6-1.435.2.3smp kernel. Here is how he ran
 <command>configure</command>:</para>
 
-<para><userinput><command>./configure</command> <option>--prefix=`kde-config
+<para><userinput><command>./configure</command> <option>--prefix=`tde-config
 --prefix`</option> <option>--enable-libsuffix=64</option>
 <option>--with-qt-includes=/usr/lib64/qt-3.3/include</option>
 <option>--with-qt-libraries=/usr/lib64/qt-3.3/lib</option></userinput></para>
diff --git a/doc/en/howto-troubleshooting.docbook b/doc/en/howto-troubleshooting.docbook
index deb9d12..4dcaa7d 100644
--- a/doc/en/howto-troubleshooting.docbook
+++ b/doc/en/howto-troubleshooting.docbook
@@ -39,10 +39,10 @@ patches</ulink>.</para>
 installation, and &kplayer; cannot find it. If you installed using a binary
 package, complain to the package maintainer. When compiling from source, be sure
 to follow the instructions in the <link linkend="howto-compilation">Compilation
-micro-HOWTO</link>, especially the part about <command>kde-config</command>.
+micro-HOWTO</link>, especially the part about <command>tde-config</command>.
 Before starting, run</para>
 
-<para><userinput><command>kde-config</command>
+<para><userinput><command>tde-config</command>
 <option>--prefix</option></userinput></para>
 
 <para>from the command line to make sure that it returns the &kde; prefix
diff --git a/doc/en/index.docbook b/doc/en/index.docbook
index 3d4d95e..985aea1 100644
--- a/doc/en/index.docbook
+++ b/doc/en/index.docbook
@@ -57,7 +57,7 @@ multimedia player that uses the
 
 <keywordset>
 <keyword>KDE</keyword>
-<keyword>kdemultimedia</keyword>
+<keyword>tdemultimedia</keyword>
 <keyword>KPlayer</keyword>
 <keyword>MPlayer</keyword>
 <keyword>multimedia</keyword>
diff --git a/doc/es/howto-bug-reporting.docbook b/doc/es/howto-bug-reporting.docbook
index d3f3604..f0af80a 100644
--- a/doc/es/howto-bug-reporting.docbook
+++ b/doc/es/howto-bug-reporting.docbook
@@ -68,7 +68,7 @@
 
 <listitem
 ><para
->El administrador de ventanas, normalmente &kwin;.</para
+>El administrador de ventanas, normalmente &twin;.</para
 ></listitem>
 
 </itemizedlist>
diff --git a/doc/es/howto-compilation.docbook b/doc/es/howto-compilation.docbook
index a33723d..3bbfafd 100644
--- a/doc/es/howto-compilation.docbook
+++ b/doc/es/howto-compilation.docbook
@@ -4,9 +4,9 @@
 
 <para
 >En primer lugar, descargue e instale los paquetes de desarrollo para &kde;, Qt y X11. Éstos deberían estar disponibles en su distribución, por ejemplo, en Debian los nombres de los paquetes son <literal
->kdelibs4-dev</literal
+>tdelibs-trinity-dev</literal
 >, <literal
->libqt3-mt-dev</literal
+>libtqt-mt-dev</literal
 > y <literal
 >xlibs-dev</literal
 >. Puede necesitar también otros paquetes de desarrollo.</para>
@@ -130,7 +130,7 @@
 >./configure</command
 > <option
 >--prefix</option
-> `kde-config --prefix`</userinput
+> `tde-config --prefix`</userinput
 ></para>
 
 <para
@@ -249,7 +249,7 @@
 ><command
 >./configure</command
 > <option
->--prefix=`kde-config --prefix`</option
+>--prefix=`tde-config --prefix`</option
 > <option
 >--enable-libsuffix=64</option
 > <option
diff --git a/doc/es/howto-troubleshooting.docbook b/doc/es/howto-troubleshooting.docbook
index 07a9445..a4ea6be 100644
--- a/doc/es/howto-troubleshooting.docbook
+++ b/doc/es/howto-troubleshooting.docbook
@@ -49,13 +49,13 @@
 > se colocó mal durante la instalación, y &kplayer; no puede encontrarlo. Si lo ha instalado utilizando un paquete binario, pregunte al responsable de mantener el paquete. Cuando se compila desde las fuentes, asegúrese de seguir las instrucciones del <link linkend="howto-compilation"
 >micro CÓMO sobre compilación</link
 >, especialmente la parte sobre <command
->kde-config</command
+>tde-config</command
 >. Antes de comenzar, ejecute</para>
 
 <para
 ><userinput
 ><command
->kde-config</command
+>tde-config</command
 > <option
 >--prefix</option
 ></userinput
@@ -412,15 +412,15 @@
 
 <sect3>
 <title
->No se puede incrementar la versión de kdelibs-data debido a un conflicto</title>
+>No se puede incrementar la versión de tdelibs-trinity-data debido a un conflicto</title>
 
 <para
 >En Debian el paquete <literal
->kdelibs-data</literal
+>tdelibs-trinity-data</literal
 > contiene el archivo <filename
 >rtsp.protocol</filename
 >, que &kplayer; reemplaza con su propia versión. Si posteriormente intenta actualizar el paquete <literal
->kdelibs-data</literal
+>tdelibs-trinity-data</literal
 >, <command
 >apt-get</command
 > se quejará de un problema. Éste es un fallo en <command
@@ -438,7 +438,7 @@
 ><userinput
 ><command
 >apt-get</command
-> install kdelibs-data</userinput
+> install tdelibs-trinity-data</userinput
 ></para>
 
 <para
@@ -452,7 +452,7 @@
 >Si ejecuta <userinput
 ><command
 >apt-get</command
-> install kdelibs-data</userinput
+> install tdelibs-trinity-data</userinput
 > antes de <userinput
 ><command
 >apt-get</command
diff --git a/doc/es/index.docbook b/doc/es/index.docbook
index 4c489a1..8237a6f 100644
--- a/doc/es/index.docbook
+++ b/doc/es/index.docbook
@@ -101,7 +101,7 @@
 <keyword
 >KDE</keyword>
 <keyword
->kdemultimedia</keyword>
+>tdemultimedia</keyword>
 <keyword
 >KPlayer</keyword>
 <keyword
diff --git a/doc/it/howto-bug-reporting.docbook b/doc/it/howto-bug-reporting.docbook
index 1530243..37c418d 100644
--- a/doc/it/howto-bug-reporting.docbook
+++ b/doc/it/howto-bug-reporting.docbook
@@ -68,7 +68,7 @@
 
 <listitem
 ><para
->il gestore delle finestre, normalmente &kwin;.</para
+>il gestore delle finestre, normalmente &twin;.</para
 ></listitem>
 
 </itemizedlist>
diff --git a/doc/it/howto-compilation.docbook b/doc/it/howto-compilation.docbook
index 1f6c62e..e8e1dd3 100644
--- a/doc/it/howto-compilation.docbook
+++ b/doc/it/howto-compilation.docbook
@@ -4,9 +4,9 @@
 
 <para
 >Per prima cosa, scarica e installa i tuoi pacchetti di sviluppo per &kde;, Qt, e X11. Questi dovrebbero essere disponibili nella tua distribuzione, per esempio in Debian i nomi dei pacchetti sono <literal
->kdelibs4-dev</literal
+>tdelibs-trinity-dev</literal
 >, <literal
->libqt3-mt-dev</literal
+>libtqt-mt-dev</literal
 > e <literal
 >xlibs-dev</literal
 >. Potresti aver bisogno anche di altri pacchetti di sviluppo.</para>
@@ -130,7 +130,7 @@
 >./configure</command
 > <option
 >--prefix</option
-> `kde-config --prefix`</userinput
+> `tde-config --prefix`</userinput
 ></para>
 
 <para
@@ -249,7 +249,7 @@
 ><command
 >./configure</command
 > <option
->--prefix=`kde-config --prefix`</option
+>--prefix=`tde-config --prefix`</option
 > <option
 >--enable-libsuffix=64</option
 > <option
diff --git a/doc/it/howto-settings.docbook b/doc/it/howto-settings.docbook
index 8ecc48b..eff669e 100644
--- a/doc/it/howto-settings.docbook
+++ b/doc/it/howto-settings.docbook
@@ -428,7 +428,7 @@
 <varlistentry
 ><term
 ><guilabel
->Usa un file temporaneo per riprodurre da slave KIO</guilabel
+>Usa un file temporaneo per riprodurre da slave TDEIO</guilabel
 ></term>
 <listitem
 ><para
@@ -449,7 +449,7 @@
 <varlistentry
 ><term
 ><guilabel
->Usa slave KIO per HTTP, FTP, SMB</guilabel
+>Usa slave TDEIO per HTTP, FTP, SMB</guilabel
 ></term>
 <listitem
 ><para
diff --git a/doc/it/howto-troubleshooting.docbook b/doc/it/howto-troubleshooting.docbook
index 54f6216..41abfe0 100644
--- a/doc/it/howto-troubleshooting.docbook
+++ b/doc/it/howto-troubleshooting.docbook
@@ -49,13 +49,13 @@
 > file was misplaced during installation, and &kplayer; cannot find it. If you installed using a binary package, complain to the package maintainer. When compiling from source, be sure to follow the instructions in the <link linkend="howto-compilation"
 >Compilation micro-HOWTO</link
 >, especially the part about <command
->kde-config</command
+>tde-config</command
 >. Before starting, run</para>
 
 <para
 ><userinput
 ><command
->kde-config</command
+>tde-config</command
 > <option
 >--prefix</option
 ></userinput
@@ -414,15 +414,15 @@
 
 <sect3>
 <title
->Impossbile aggiornare kdelibs-data a causa di un conflitto</title>
+>Impossbile aggiornare tdelibs-trinity-data a causa di un conflitto</title>
 
 <para
 >In Debian il pacchetto <literal
->kdelibs-data</literal
+>tdelibs-trinity-data</literal
 > contiene il file <filename
 >rtsp.protocol</filename
 > , che &kplayer; sostituisce con la propria versione. Se successivamente si prova ad aggiornare il pacchetto <literal
->kdelibs-data</literal
+>tdelibs-trinity-data</literal
 >, <command
 >apt-get</command
 > segnalerà un conflitto. Questo è un bug di <command
@@ -440,7 +440,7 @@
 ><userinput
 ><command
 >apt-get</command
-> install kdelibs-data</userinput
+> install tdelibs-trinity-data</userinput
 ></para>
 
 <para
@@ -454,7 +454,7 @@
 >Se esegui <userinput
 ><command
 >apt-get</command
-> install kdelibs-data</userinput
+> install tdelibs-trinity-data</userinput
 > prima di <userinput
 ><command
 >apt-get</command
diff --git a/doc/it/index.docbook b/doc/it/index.docbook
index 15c612d..5695fe0 100644
--- a/doc/it/index.docbook
+++ b/doc/it/index.docbook
@@ -101,7 +101,7 @@
 <keyword
 >KDE</keyword>
 <keyword
->kdemultimedia</keyword>
+>tdemultimedia</keyword>
 <keyword
 >KPlayer</keyword>
 <keyword
diff --git a/doc/pt/howto-bug-reporting.docbook b/doc/pt/howto-bug-reporting.docbook
index 0e8cc6e..55c31c9 100644
--- a/doc/pt/howto-bug-reporting.docbook
+++ b/doc/pt/howto-bug-reporting.docbook
@@ -68,7 +68,7 @@
 
 <listitem
 ><para
->o gestor de janelas, normalmente o &kwin;.</para
+>o gestor de janelas, normalmente o &twin;.</para
 ></listitem>
 
 </itemizedlist>
diff --git a/doc/pt/howto-compilation.docbook b/doc/pt/howto-compilation.docbook
index 86b8f40..9ba3ead 100644
--- a/doc/pt/howto-compilation.docbook
+++ b/doc/pt/howto-compilation.docbook
@@ -4,9 +4,9 @@
 
 <para
 >Primeiro, obtenha e instale os pacotes de desenvolvimento para o &kde;, o Qt e o X11. Estes deverão estar disponíveis na sua distribuição; por exemplo, na Debian, os nomes dos pacotes são <literal
->kdelibs4-dev</literal
+>tdelibs-trinity-dev</literal
 >, <literal
->libqt3-mt-dev</literal
+>libtqt-mt-dev</literal
 > e <literal
 >xlibs-dev</literal
 >. Poderá também necessitar de outros pacotes de desenvolvimento.</para>
@@ -130,7 +130,7 @@
 >./configure</command
 > <option
 >--prefix</option
-> `kde-config --prefix`</userinput
+> `tde-config --prefix`</userinput
 ></para>
 
 <para
@@ -249,7 +249,7 @@
 ><command
 >./configure</command
 > <option
->--prefix=`kde-config --prefix`</option
+>--prefix=`tde-config --prefix`</option
 > <option
 >--enable-libsuffix=64</option
 > <option
diff --git a/doc/pt/howto-troubleshooting.docbook b/doc/pt/howto-troubleshooting.docbook
index a05b504..c1135ba 100644
--- a/doc/pt/howto-troubleshooting.docbook
+++ b/doc/pt/howto-troubleshooting.docbook
@@ -49,13 +49,13 @@
 > foi colocado no sítio errado durante a instalação, e o &kplayer; não o consegue encontrar. Se o instalou através de um pacote binário, queixe-se ao responsável de manutenção do pacote. Ao compilar a partir do código-fonte, certifique-se que segue as instruções no <link linkend="howto-compilation"
 >micro-HOWTO de compilação</link
 >, especialmente a parte acerca do <command
->kde-config</command
+>tde-config</command
 >. Antes de começar, execute</para>
 
 <para
 ><userinput
 ><command
->kde-config</command
+>tde-config</command
 > <option
 >--prefix</option
 ></userinput
@@ -410,15 +410,15 @@
 
 <sect3>
 <title
->Não é possível actualizar o kdelibs-data devido a um conflito</title>
+>Não é possível actualizar o tdelibs-trinity-data devido a um conflito</title>
 
 <para
 >Na Debian, o pacote <literal
->kdelibs-data</literal
+>tdelibs-trinity-data</literal
 > contém o ficheiro <filename
 >rtsp.protocol</filename
 >, que o &kplayer; substitui pela sua própria versão. Se mais tarde tentar actualizar o pacote <literal
->kdelibs-data</literal
+>tdelibs-trinity-data</literal
 >, o <command
 >apt-get</command
 > queixar-se-á de um conflito. Isto é um erro no <command
@@ -436,7 +436,7 @@
 ><userinput
 ><command
 >apt-get</command
-> install kdelibs-data</userinput
+> install tdelibs-trinity-data</userinput
 ></para>
 
 <para
@@ -450,7 +450,7 @@
 >Se executar o <userinput
 ><command
 >apt-get</command
-> install kdelibs-data</userinput
+> install tdelibs-trinity-data</userinput
 > antes do <userinput
 ><command
 >apt-get</command
diff --git a/doc/pt/index.docbook b/doc/pt/index.docbook
index a3a0f35..d24105d 100644
--- a/doc/pt/index.docbook
+++ b/doc/pt/index.docbook
@@ -101,7 +101,7 @@
 <keyword
 >KDE</keyword>
 <keyword
->kdemultimedia</keyword>
+>tdemultimedia</keyword>
 <keyword
 >KPlayer</keyword>
 <keyword
diff --git a/doc/sv/howto-bug-reporting.docbook b/doc/sv/howto-bug-reporting.docbook
index ad11fc4..e3d7b0f 100644
--- a/doc/sv/howto-bug-reporting.docbook
+++ b/doc/sv/howto-bug-reporting.docbook
@@ -68,7 +68,7 @@
 
 <listitem
 ><para
->fönsterhanteraren, normalt &kwin;.</para
+>fönsterhanteraren, normalt &twin;.</para
 ></listitem>
 
 </itemizedlist>
diff --git a/doc/sv/howto-compilation.docbook b/doc/sv/howto-compilation.docbook
index a27d64d..46268ca 100644
--- a/doc/sv/howto-compilation.docbook
+++ b/doc/sv/howto-compilation.docbook
@@ -4,9 +4,9 @@
 
 <para
 >Ladda först ner och installera utvecklingspaket för &kde;, Qt och X11. De ska vara tillgängliga i din distribution, till exempel i Debian är paketnamnen <literal
->kdelibs4-dev</literal
+>tdelibs-trinity-dev</literal
 >, <literal
->libqt3-mt-dev</literal
+>libtqt-mt-dev</literal
 > och <literal
 >xlibs-dev</literal
 >. Du kan också behöva andra utvecklingspaket.</para>
@@ -130,7 +130,7 @@
 >./configure</command
 > <option
 >--prefix</option
-> `kde-config --prefix`</userinput
+> `tde-config --prefix`</userinput
 ></para>
 
 <para
@@ -249,7 +249,7 @@
 ><command
 >./configure</command
 > <option
->--prefix=`kde-config --prefix`</option
+>--prefix=`tde-config --prefix`</option
 > <option
 >--enable-libsuffix=64</option
 > <option
diff --git a/doc/sv/howto-troubleshooting.docbook b/doc/sv/howto-troubleshooting.docbook
index d838b05..3b5864d 100644
--- a/doc/sv/howto-troubleshooting.docbook
+++ b/doc/sv/howto-troubleshooting.docbook
@@ -49,13 +49,13 @@
 > kom bort under installation, och &kplayer; kan inte hitta den. Om du installerade med ett binärpaket, klaga hos paketutvecklaren. När du kompilerar från källkod, försäkra dig om att du följer instruktionerna i <link linkend="howto-compilation"
 >minihandledningen för kompilering</link
 >, särskilt delen om <command
->kde-config</command
+>tde-config</command
 >. Innan du startar, skriv</para>
 
 <para
 ><userinput
 ><command
->kde-config</command
+>tde-config</command
 > <option
 >--prefix</option
 ></userinput
@@ -410,15 +410,15 @@
 
 <sect3>
 <title
->Kan inte uppgradera kdelibs-data på grund av en konflikt</title>
+>Kan inte uppgradera tdelibs-trinity-data på grund av en konflikt</title>
 
 <para
 >I Debian innehåller paketet <literal
->kdelibs-data</literal
+>tdelibs-trinity-data</literal
 > filen <filename
 >rtsp.protocol</filename
 >, som &kplayer; ersätter med sin egen version. Om du senare försöker uppgradera paketet <literal
->kdelibs-data</literal
+>tdelibs-trinity-data</literal
 >, klagar <command
 >apt-get</command
 > på en konflikt. Det är ett fel i <command
@@ -436,7 +436,7 @@
 ><userinput
 ><command
 >apt-get</command
-> install kdelibs-data</userinput
+> install tdelibs-trinity-data</userinput
 ></para>
 
 <para
@@ -450,7 +450,7 @@
 >Om du kör <userinput
 ><command
 >apt-get</command
-> install kdelibs-data</userinput
+> install tdelibs-trinity-data</userinput
 > innan <userinput
 ><command
 >apt-get</command
diff --git a/doc/sv/index.docbook b/doc/sv/index.docbook
index 3a131ee..01376d7 100644
--- a/doc/sv/index.docbook
+++ b/doc/sv/index.docbook
@@ -101,7 +101,7 @@
 <keyword
 >KDE</keyword>
 <keyword
->kdemultimedia</keyword>
+>tdemultimedia</keyword>
 <keyword
 >KPlayer</keyword>
 <keyword
diff --git a/kplayer/Makefile.am b/kplayer/Makefile.am
index 7b74d69..d260d52 100644
--- a/kplayer/Makefile.am
+++ b/kplayer/Makefile.am
@@ -2,7 +2,7 @@ bin_PROGRAMS = kplayer
 
 kplayer_SOURCES = kplayerpropertiesdevice.ui kplayernodeaction.cpp kplayernodeview.cpp kplayerplaylist.cpp kplayersettingsdialog.cpp kplayersettingssubtitles.ui kplayersettingsbrightness.ui kplayersettingsvolume.ui kplayersettingssaturation.ui kplayersettingsprogress.ui kplayersettingshue.ui kplayersettingscontrols.ui kplayersettingssliders.ui kplayersettingscontrast.ui kplayerlogwindow.cpp kplayersettingsvideo.ui kplayersettingsaudio.ui kplayersettingsadvanced.ui kplayersettingsgeneral.ui kplayer.cpp main.cpp 
 
-kplayer_LDADD   = libkplayernoinst.la $(LIB_KPARTS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET) -lDCOP
+kplayer_LDADD   = libkplayernoinst.la $(LIB_TDEPARTS) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) $(LIBSOCKET) -lDCOP
 
 # These paths are KDE specific. Use them:
 # kde_appsdir         Where your application's menu entry (.desktop) should go to.
@@ -39,13 +39,13 @@ kplayer_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 noinst_LTLIBRARIES = libkplayernoinst.la
 libkplayernoinst_la_LDFLAGS = $(all_libraries) -no-undefined
 libkplayernoinst_la_SOURCES = x11.cpp kplayerwidget.cpp kplayerslideraction.cpp kplayerprocess.cpp kplayersettings.cpp kplayerproperties.cpp kplayeractionlist.cpp kplayerengine.cpp kplayersource.cpp kplayernode.cpp kplayerpropertiesdialog.cpp kplayerpropertiesgeneral.ui kplayerpropertiessize.ui kplayerpropertiessubtitles.ui kplayerpropertiesaudio.ui kplayerpropertiesvideo.ui kplayerpropertiesadvanced.ui
-libkplayernoinst_la_LIBADD = $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+libkplayernoinst_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
 libkplayernoinst_la_METASOURCES = kplayerwidget.moc kplayerslideraction.moc kplayerprocess.moc kplayersettings.moc kplayerproperties.moc kplayeractionlist.moc kplayerengine.moc kplayerpropertiesdialog.moc kplayersource.moc kplayernode.moc
 
 kde_module_LTLIBRARIES = libkplayerpart.la
 libkplayerpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -no-undefined
 libkplayerpart_la_SOURCES = kplayerpart.cpp
-libkplayerpart_la_LIBADD = $(LIB_KPARTS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) -lDCOP libkplayernoinst.la
+libkplayerpart_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) -lDCOP libkplayernoinst.la
 libkplayerpart_la_METASOURCES = kplayerpart.moc
 
 # Uncomment the following two lines if you add a ui.rc file for your application to make use of KDEs XML GUI builing
diff --git a/kplayer/kplayer-actions.desktop b/kplayer/kplayer-actions.desktop
index 3681fdf..cab59e4 100644
--- a/kplayer/kplayer-actions.desktop
+++ b/kplayer/kplayer-actions.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=audio/mp3,audio/mpeg3,audio/mpeg4,audio/mpg,audio/mpeg,audio/mpegurl,audio/m3u,audio/mp4,audio/wav,video/msvideo,video/mpeg4,video/mpeg,video/x-m4v,video/x-mpeg,video/x-mpeg2,video/mp4,video/x-msmpeg,video/vnd.mpegurl,video/x-mpegurl,video/x-msvideo,video/quicktime,video/x-qtc,audio/x-ms-asf,audio/x-ms-asx,audio/x-ms-wma,audio/x-ms-wax,audio/x-ms-wmp,audio/x-ms-wmv,video/x-ms-asf,video/x-ms-asf-plugin,video/x-ms-asx,video/x-ms-wax,video/x-ms-wmp,video/x-ms-wmv,video/x-ms-wma,video/x-ms-wvx,video/x-ms-wmx,video/x-ms-wm,application/asx,application/x-ms-asf,application/vnd.ms-asf,application/x-ms-wmd,application/x-ms-wmz,audio/scpls,audio/x-scpls,audio/x-pls,audio/vnd.mpegurl,audio/x-mpg,audio/x-mpeg,audio/x-mpeg3,audio/x-mpegurl,audio/x-realaudio,audio/x-pn-realaudio,audio/x-pn-realaudio-plugin,application/x-pn-realaudio,audio/vnd.rn-realaudio,video/x-realvideo,video/x-pn-realvideo,video/vnd.rn-realvideo,video/x-pn-realvideo-plugin,application/vnd.rn-realmedia,application/vnd.rn-realmedia-vbr,application/vnd.rn-realplayer,application/sdp,application/smil,application/x-smil,application/streamingmedia,application/x-streamingmedia,video/nsv,audio/x-mp3,video/x-ogm,video/x-theora,audio/vorbis,audio/x-vorbis,audio/x-oggflac,application/x-ogg,application/ogg,audio/mp1,audio/x-mp1,audio/mp2,audio/x-mp2,audio/x-wav,video/avi,video/x-avi,video/x-divx,video/x-fli,video/x-matroska,audio/x-matroska,application/x-mplayer2,application/x-cda,audio/aac,audio/ac3,audio/basic,audio/m4a,audio/x-aac,audio/x-adpcm,audio/x-flac,audio/x-m3u,audio/x-m4a,audio/x-musepack,audio/x-pn-windows-pcm,video/x-3gpp,video/x-3gpp2,video/mediaplayer,uri/mms,uri/mmst,uri/mmsu,uri/pnm,uri/rtsp,uri/rtspt,uri/rtspu,inode/directory
+X-TDE-ServiceTypes=audio/mp3,audio/mpeg3,audio/mpeg4,audio/mpg,audio/mpeg,audio/mpegurl,audio/m3u,audio/mp4,audio/wav,video/msvideo,video/mpeg4,video/mpeg,video/x-m4v,video/x-mpeg,video/x-mpeg2,video/mp4,video/x-msmpeg,video/vnd.mpegurl,video/x-mpegurl,video/x-msvideo,video/quicktime,video/x-qtc,audio/x-ms-asf,audio/x-ms-asx,audio/x-ms-wma,audio/x-ms-wax,audio/x-ms-wmp,audio/x-ms-wmv,video/x-ms-asf,video/x-ms-asf-plugin,video/x-ms-asx,video/x-ms-wax,video/x-ms-wmp,video/x-ms-wmv,video/x-ms-wma,video/x-ms-wvx,video/x-ms-wmx,video/x-ms-wm,application/asx,application/x-ms-asf,application/vnd.ms-asf,application/x-ms-wmd,application/x-ms-wmz,audio/scpls,audio/x-scpls,audio/x-pls,audio/vnd.mpegurl,audio/x-mpg,audio/x-mpeg,audio/x-mpeg3,audio/x-mpegurl,audio/x-realaudio,audio/x-pn-realaudio,audio/x-pn-realaudio-plugin,application/x-pn-realaudio,audio/vnd.rn-realaudio,video/x-realvideo,video/x-pn-realvideo,video/vnd.rn-realvideo,video/x-pn-realvideo-plugin,application/vnd.rn-realmedia,application/vnd.rn-realmedia-vbr,application/vnd.rn-realplayer,application/sdp,application/smil,application/x-smil,application/streamingmedia,application/x-streamingmedia,video/nsv,audio/x-mp3,video/x-ogm,video/x-theora,audio/vorbis,audio/x-vorbis,audio/x-oggflac,application/x-ogg,application/ogg,audio/mp1,audio/x-mp1,audio/mp2,audio/x-mp2,audio/x-wav,video/avi,video/x-avi,video/x-divx,video/x-fli,video/x-matroska,audio/x-matroska,application/x-mplayer2,application/x-cda,audio/aac,audio/ac3,audio/basic,audio/m4a,audio/x-aac,audio/x-adpcm,audio/x-flac,audio/x-m3u,audio/x-m4a,audio/x-musepack,audio/x-pn-windows-pcm,video/x-3gpp,video/x-3gpp2,video/mediaplayer,uri/mms,uri/mmst,uri/mmsu,uri/pnm,uri/rtsp,uri/rtspt,uri/rtspu,inode/directory
 Actions=AddToNewPlaylist
 Encoding=UTF8
 
diff --git a/kplayer/kplayer-directory.desktop b/kplayer/kplayer-directory.desktop
index 9a233ce..ad78808 100644
--- a/kplayer/kplayer-directory.desktop
+++ b/kplayer/kplayer-directory.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=inode/directory
+X-TDE-ServiceTypes=inode/directory
 Actions=AddToPlaylists;AddToCollection
 Encoding=UTF8
 
diff --git a/kplayer/kplayer-next.desktop b/kplayer/kplayer-next.desktop
index ce1326a..2225d16 100644
--- a/kplayer/kplayer-next.desktop
+++ b/kplayer/kplayer-next.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=audio/mp3,audio/mpeg3,audio/mpeg4,audio/mpg,audio/mpeg,audio/mpegurl,audio/m3u,audio/mp4,audio/wav,video/msvideo,video/mpeg4,video/mpeg,video/x-m4v,video/x-mpeg,video/x-mpeg2,video/mp4,video/x-msmpeg,video/vnd.mpegurl,video/x-mpegurl,video/x-msvideo,video/quicktime,video/x-qtc,audio/x-ms-asf,audio/x-ms-asx,audio/x-ms-wma,audio/x-ms-wax,audio/x-ms-wmp,audio/x-ms-wmv,video/x-ms-asf,video/x-ms-asf-plugin,video/x-ms-asx,video/x-ms-wax,video/x-ms-wmp,video/x-ms-wmv,video/x-ms-wma,video/x-ms-wvx,video/x-ms-wmx,video/x-ms-wm,application/asx,application/x-ms-asf,application/vnd.ms-asf,application/x-ms-wmd,application/x-ms-wmz,audio/scpls,audio/x-scpls,audio/x-pls,audio/vnd.mpegurl,audio/x-mpg,audio/x-mpeg,audio/x-mpeg3,audio/x-mpegurl,audio/x-realaudio,audio/x-pn-realaudio,audio/x-pn-realaudio-plugin,application/x-pn-realaudio,audio/vnd.rn-realaudio,video/x-realvideo,video/x-pn-realvideo,video/vnd.rn-realvideo,video/x-pn-realvideo-plugin,application/vnd.rn-realmedia,application/vnd.rn-realmedia-vbr,application/vnd.rn-realplayer,application/sdp,application/smil,application/x-smil,application/streamingmedia,application/x-streamingmedia,video/nsv,audio/x-mp3,video/x-ogm,video/x-theora,audio/vorbis,audio/x-vorbis,audio/x-oggflac,application/x-ogg,application/ogg,audio/mp1,audio/x-mp1,audio/mp2,audio/x-mp2,audio/x-wav,video/avi,video/x-avi,video/x-divx,video/x-fli,video/x-matroska,audio/x-matroska,application/x-mplayer2,application/x-cda,audio/aac,audio/ac3,audio/basic,audio/m4a,audio/x-aac,audio/x-adpcm,audio/x-flac,audio/x-m3u,audio/x-m4a,audio/x-musepack,audio/x-pn-windows-pcm,video/x-3gpp,video/x-3gpp2,video/mediaplayer,uri/mms,uri/mmst,uri/mmsu,uri/pnm,uri/rtsp,uri/rtspt,uri/rtspu,inode/directory,media/cdrom_mounted,media/cdrom_unmounted,media/cdwriter_mounted,media/cdwriter_unmounted,media/dvd_mounted,media/dvd_unmounted,media/audiocd,media/dvdvideo,media/svcd,media/vcd
+X-TDE-ServiceTypes=audio/mp3,audio/mpeg3,audio/mpeg4,audio/mpg,audio/mpeg,audio/mpegurl,audio/m3u,audio/mp4,audio/wav,video/msvideo,video/mpeg4,video/mpeg,video/x-m4v,video/x-mpeg,video/x-mpeg2,video/mp4,video/x-msmpeg,video/vnd.mpegurl,video/x-mpegurl,video/x-msvideo,video/quicktime,video/x-qtc,audio/x-ms-asf,audio/x-ms-asx,audio/x-ms-wma,audio/x-ms-wax,audio/x-ms-wmp,audio/x-ms-wmv,video/x-ms-asf,video/x-ms-asf-plugin,video/x-ms-asx,video/x-ms-wax,video/x-ms-wmp,video/x-ms-wmv,video/x-ms-wma,video/x-ms-wvx,video/x-ms-wmx,video/x-ms-wm,application/asx,application/x-ms-asf,application/vnd.ms-asf,application/x-ms-wmd,application/x-ms-wmz,audio/scpls,audio/x-scpls,audio/x-pls,audio/vnd.mpegurl,audio/x-mpg,audio/x-mpeg,audio/x-mpeg3,audio/x-mpegurl,audio/x-realaudio,audio/x-pn-realaudio,audio/x-pn-realaudio-plugin,application/x-pn-realaudio,audio/vnd.rn-realaudio,video/x-realvideo,video/x-pn-realvideo,video/vnd.rn-realvideo,video/x-pn-realvideo-plugin,application/vnd.rn-realmedia,application/vnd.rn-realmedia-vbr,application/vnd.rn-realplayer,application/sdp,application/smil,application/x-smil,application/streamingmedia,application/x-streamingmedia,video/nsv,audio/x-mp3,video/x-ogm,video/x-theora,audio/vorbis,audio/x-vorbis,audio/x-oggflac,application/x-ogg,application/ogg,audio/mp1,audio/x-mp1,audio/mp2,audio/x-mp2,audio/x-wav,video/avi,video/x-avi,video/x-divx,video/x-fli,video/x-matroska,audio/x-matroska,application/x-mplayer2,application/x-cda,audio/aac,audio/ac3,audio/basic,audio/m4a,audio/x-aac,audio/x-adpcm,audio/x-flac,audio/x-m3u,audio/x-m4a,audio/x-musepack,audio/x-pn-windows-pcm,video/x-3gpp,video/x-3gpp2,video/mediaplayer,uri/mms,uri/mmst,uri/mmsu,uri/pnm,uri/rtsp,uri/rtspt,uri/rtspu,inode/directory,media/cdrom_mounted,media/cdrom_unmounted,media/cdwriter_mounted,media/cdwriter_unmounted,media/dvd_mounted,media/dvd_unmounted,media/audiocd,media/dvdvideo,media/svcd,media/vcd
 Actions=PlayNext;QueueNext
 Encoding=UTF8
 
diff --git a/kplayer/kplayer-play-queue.desktop b/kplayer/kplayer-play-queue.desktop
index 1c4c2b3..18f4a58 100644
--- a/kplayer/kplayer-play-queue.desktop
+++ b/kplayer/kplayer-play-queue.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
-ServiceTypes=audio/mp3,audio/mpeg3,audio/mpeg4,audio/mpg,audio/mpeg,audio/mpegurl,audio/m3u,audio/mp4,audio/wav,video/msvideo,video/mpeg4,video/mpeg,video/x-m4v,video/x-mpeg,video/x-mpeg2,video/mp4,video/x-msmpeg,video/vnd.mpegurl,video/x-mpegurl,video/x-msvideo,video/quicktime,video/x-qtc,audio/x-ms-asf,audio/x-ms-asx,audio/x-ms-wma,audio/x-ms-wax,audio/x-ms-wmp,audio/x-ms-wmv,video/x-ms-asf,video/x-ms-asf-plugin,video/x-ms-asx,video/x-ms-wax,video/x-ms-wmp,video/x-ms-wmv,video/x-ms-wma,video/x-ms-wvx,video/x-ms-wmx,video/x-ms-wm,application/asx,application/x-ms-asf,application/vnd.ms-asf,application/x-ms-wmd,application/x-ms-wmz,audio/scpls,audio/x-scpls,audio/x-pls,audio/vnd.mpegurl,audio/x-mpg,audio/x-mpeg,audio/x-mpeg3,audio/x-mpegurl,audio/x-realaudio,audio/x-pn-realaudio,audio/x-pn-realaudio-plugin,application/x-pn-realaudio,audio/vnd.rn-realaudio,video/x-realvideo,video/x-pn-realvideo,video/vnd.rn-realvideo,video/x-pn-realvideo-plugin,application/vnd.rn-realmedia,application/vnd.rn-realmedia-vbr,application/vnd.rn-realplayer,application/sdp,application/smil,application/x-smil,application/streamingmedia,application/x-streamingmedia,video/nsv,audio/x-mp3,video/x-ogm,video/x-theora,audio/vorbis,audio/x-vorbis,audio/x-oggflac,application/x-ogg,application/ogg,audio/mp1,audio/x-mp1,audio/mp2,audio/x-mp2,audio/x-wav,video/avi,video/x-avi,video/x-divx,video/x-fli,video/x-matroska,audio/x-matroska,application/x-mplayer2,application/x-cda,audio/aac,audio/ac3,audio/basic,audio/m4a,audio/x-aac,audio/x-adpcm,audio/x-flac,audio/x-m3u,audio/x-m4a,audio/x-musepack,audio/x-pn-windows-pcm,video/x-3gpp,video/x-3gpp2,video/mediaplayer,uri/mms,uri/mmst,uri/mmsu,uri/pnm,uri/rtsp,uri/rtspt,uri/rtspu,inode/directory,media/cdrom_mounted,media/cdrom_unmounted,media/cdwriter_mounted,media/cdwriter_unmounted,media/dvd_mounted,media/dvd_unmounted,media/audiocd,media/dvdvideo,media/svcd,media/vcd
+X-TDE-ServiceTypes=audio/mp3,audio/mpeg3,audio/mpeg4,audio/mpg,audio/mpeg,audio/mpegurl,audio/m3u,audio/mp4,audio/wav,video/msvideo,video/mpeg4,video/mpeg,video/x-m4v,video/x-mpeg,video/x-mpeg2,video/mp4,video/x-msmpeg,video/vnd.mpegurl,video/x-mpegurl,video/x-msvideo,video/quicktime,video/x-qtc,audio/x-ms-asf,audio/x-ms-asx,audio/x-ms-wma,audio/x-ms-wax,audio/x-ms-wmp,audio/x-ms-wmv,video/x-ms-asf,video/x-ms-asf-plugin,video/x-ms-asx,video/x-ms-wax,video/x-ms-wmp,video/x-ms-wmv,video/x-ms-wma,video/x-ms-wvx,video/x-ms-wmx,video/x-ms-wm,application/asx,application/x-ms-asf,application/vnd.ms-asf,application/x-ms-wmd,application/x-ms-wmz,audio/scpls,audio/x-scpls,audio/x-pls,audio/vnd.mpegurl,audio/x-mpg,audio/x-mpeg,audio/x-mpeg3,audio/x-mpegurl,audio/x-realaudio,audio/x-pn-realaudio,audio/x-pn-realaudio-plugin,application/x-pn-realaudio,audio/vnd.rn-realaudio,video/x-realvideo,video/x-pn-realvideo,video/vnd.rn-realvideo,video/x-pn-realvideo-plugin,application/vnd.rn-realmedia,application/vnd.rn-realmedia-vbr,application/vnd.rn-realplayer,application/sdp,application/smil,application/x-smil,application/streamingmedia,application/x-streamingmedia,video/nsv,audio/x-mp3,video/x-ogm,video/x-theora,audio/vorbis,audio/x-vorbis,audio/x-oggflac,application/x-ogg,application/ogg,audio/mp1,audio/x-mp1,audio/mp2,audio/x-mp2,audio/x-wav,video/avi,video/x-avi,video/x-divx,video/x-fli,video/x-matroska,audio/x-matroska,application/x-mplayer2,application/x-cda,audio/aac,audio/ac3,audio/basic,audio/m4a,audio/x-aac,audio/x-adpcm,audio/x-flac,audio/x-m3u,audio/x-m4a,audio/x-musepack,audio/x-pn-windows-pcm,video/x-3gpp,video/x-3gpp2,video/mediaplayer,uri/mms,uri/mmst,uri/mmsu,uri/pnm,uri/rtsp,uri/rtspt,uri/rtspu,inode/directory,media/cdrom_mounted,media/cdrom_unmounted,media/cdwriter_mounted,media/cdwriter_unmounted,media/dvd_mounted,media/dvd_unmounted,media/audiocd,media/dvdvideo,media/svcd,media/vcd
 Actions=Play;Queue
 Encoding=UTF8
-X-KDE-Priority=TopLevel
+X-TDE-Priority=TopLevel
 
 [Desktop Action Play]
 Name=Play
diff --git a/kplayer/kplayer.cpp b/kplayer/kplayer.cpp
index ef0f602..b92b656 100644
--- a/kplayer/kplayer.cpp
+++ b/kplayer/kplayer.cpp
@@ -13,19 +13,19 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kcursor.h>
 #include <kedittoolbar.h>
 #include <kkeydialog.h>
-#include <klocale.h>
-#include <kmenubar.h>
+#include <tdelocale.h>
+#include <tdemenubar.h>
 #include <kstatusbar.h>
 #include <kstdaction.h>
 #include <kurl.h>
 #include <kurldrag.h>
-#include <kwin.h>
+#include <twin.h>
 #include <tqdatetime.h>
 #include <tqdockarea.h>
 #include <tqeventloop.h>
@@ -63,7 +63,7 @@ void KPlayerX11GetKeyboardMouseState (uint id);
 #define ID_PROGRESS_MSG 3
 
 TQString resourcePath (const TQString& filename);
-extern KAboutData* about;
+extern TDEAboutData* about;
 
 KPlayerApplication::KPlayerApplication (void)
   : KUniqueApplication (true, true, true)
@@ -87,7 +87,7 @@ int KPlayerApplication::newInstance (void)
     kdDebugTime() << "Creating main window\n";
 #endif
     mainWindow = new KPlayer();
-    /*if ( isRestored() && KMainWindow::canBeRestored (1) )
+    /*if ( isRestored() && TDEMainWindow::canBeRestored (1) )
     {
 #ifdef DEBUG_KPLAYER_WINDOW
       kdDebugTime() << "Restoring main window\n";
@@ -346,7 +346,7 @@ bool KPlayerApplication::notify (TQObject* object, TQEvent* event)
 
 /*int KPlayerApplication::x11ClientMessage (TQWidget* widget, XEvent* event, bool passive_only)
 {
-  KApplication::x11ClientMessage (widget, event, passive_only);
+  TDEApplication::x11ClientMessage (widget, event, passive_only);
 }*/
 
 #ifdef DEBUG_KPLAYER_RESIZING
@@ -390,7 +390,7 @@ void dumpObject (const TQObject* object, int indent, int depth = 20)
 }
 #endif
 
-KPlayer::KPlayer (TQWidget *parent, const char *name) : KMainWindow (parent, name)
+KPlayer::KPlayer (TQWidget *parent, const char *name) : TDEMainWindow (parent, name)
 {
 #ifdef DEBUG_KPLAYER_WINDOW
   kdDebugTime() << "Creating main window\n";
@@ -458,7 +458,7 @@ KPlayer::KPlayer (TQWidget *parent, const char *name) : KMainWindow (parent, nam
     SLOT (actionListUpdating (KPlayerActionList*)));
   connect (engine() -> subtitleActionList(), SIGNAL (updated (KPlayerActionList*)),
     SLOT (actionListUpdated (KPlayerActionList*)));
-  KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
   if ( args -> count() > 0 && (args -> isSet ("play") || args -> isSet ("play-next")
       || ! args -> isSet ("queue") && ! args -> isSet ("queue-next") && ! args -> isSet ("add-to-new-playlist")
       && ! args -> isSet ("add-to-playlists") && ! args -> isSet ("add-to-collection")) )
@@ -539,7 +539,7 @@ KPlayer::KPlayer (TQWidget *parent, const char *name) : KMainWindow (parent, nam
   setAutoSaveSettings ("MainWindow", false);
   resetAutoSaveSettings();  // saveWindowSize = false;
   readOptions();
-  KToolBar* toolbar = toolBar (m_toolbar[PLAYLIST_TOOLBAR].name);
+  TDEToolBar* toolbar = toolBar (m_toolbar[PLAYLIST_TOOLBAR].name);
   setDockEnabled (toolbar, DockLeft, false);
   setDockEnabled (toolbar, DockRight, false);
   setDockEnabled (library(), DockLeft, false);
@@ -576,7 +576,7 @@ void KPlayer::initActions (void)
 #ifdef DEBUG_KPLAYER_WINDOW
   kdDebugTime() << "Creating actions\n";
 #endif
-  KAction* action = KStdAction::quit (this, SLOT (fileQuit()), actionCollection());
+  TDEAction* action = KStdAction::quit (this, SLOT (fileQuit()), actionCollection());
   action -> setStatusText (i18n("Quits KPlayer"));
   action -> setWhatsThis (i18n("Quit command saves the playlist and all settings, stops playing and closes KPlayer."));
   action = KStdAction::showMenubar (this, SLOT (viewMenubar()), actionCollection());
@@ -585,34 +585,34 @@ void KPlayer::initActions (void)
   action = KStdAction::showStatusbar (this, SLOT (viewStatusbar()), actionCollection());
   action -> setStatusText (i18n("Shows/hides the status bar"));
   action -> setWhatsThis (i18n("Show Statusbar command shows or hides the status bar."));
-  action = new KToggleAction (i18n("&Show Playlist"), 0, CTRL + Key_P, this, SLOT (viewPlaylist()), actionCollection(), "options_show_playlist");
+  action = new TDEToggleAction (i18n("&Show Playlist"), 0, CTRL + Key_P, this, SLOT (viewPlaylist()), actionCollection(), "options_show_playlist");
   action -> setStatusText (i18n("Shows/hides the playlist"));
   action -> setWhatsThis (i18n("Show Playlist command shows or hides the playlist toolbar."));
-  action = new KToggleAction (i18n("Sho&w Library"), 0, CTRL + Key_L, this, SLOT (viewLibrary()), actionCollection(), "options_show_library");
+  action = new TDEToggleAction (i18n("Sho&w Library"), 0, CTRL + Key_L, this, SLOT (viewLibrary()), actionCollection(), "options_show_library");
   action -> setStatusText (i18n("Shows/hides the multimedia library"));
   action -> setWhatsThis (i18n("Show Library command shows or hides the multimedia library."));
-  action = new KToggleAction (i18n("Show Message &Log"), 0, CTRL + Key_G, this, SLOT (viewMessageLog()), actionCollection(), "options_show_log");
+  action = new TDEToggleAction (i18n("Show Message &Log"), 0, CTRL + Key_G, this, SLOT (viewMessageLog()), actionCollection(), "options_show_log");
   action -> setStatusText (i18n("Shows/hides the message log"));
   action -> setWhatsThis (i18n("Show Message Log command shows or hides the message log."));
-  action = new KToggleAction (i18n("Show Main &Toolbar"), 0, 0, this, SLOT (viewMainToolbar()), actionCollection(), "options_show_toolbar");
+  action = new TDEToggleAction (i18n("Show Main &Toolbar"), 0, 0, this, SLOT (viewMainToolbar()), actionCollection(), "options_show_toolbar");
   action -> setStatusText (i18n("Shows/hides the main toolbar"));
   action -> setWhatsThis (i18n("Show Main Toolbar command shows or hides the main toolbar."));
-  action = new KToggleAction (i18n("Show &Progress Toolbar"), 0, 0, this, SLOT (viewProgressToolbar()), actionCollection(), "settings_progress_toolbar");
+  action = new TDEToggleAction (i18n("Show &Progress Toolbar"), 0, 0, this, SLOT (viewProgressToolbar()), actionCollection(), "settings_progress_toolbar");
   action -> setStatusText (i18n("Shows/hides the progress toolbar"));
   action -> setWhatsThis (i18n("Show Progress Toolbar command shows or hides the progress toolbar. This command is available when the time length of the current file is known."));
-  action = new KToggleAction (i18n("Show &Volume Toolbar"), "volume", 0, this, SLOT (viewVolumeToolbar()), actionCollection(), "settings_volume_toolbar");
+  action = new TDEToggleAction (i18n("Show &Volume Toolbar"), "volume", 0, this, SLOT (viewVolumeToolbar()), actionCollection(), "settings_volume_toolbar");
   action -> setStatusText (i18n("Shows/hides the volume toolbar"));
   action -> setWhatsThis (i18n("Show Volume Toolbar command shows or hides the volume toolbar."));
-  action = new KToggleAction (i18n("Show C&ontrast Toolbar"), "contrast", 0, this, SLOT (viewContrastToolbar()), actionCollection(), "settings_contrast_toolbar");
+  action = new TDEToggleAction (i18n("Show C&ontrast Toolbar"), "contrast", 0, this, SLOT (viewContrastToolbar()), actionCollection(), "settings_contrast_toolbar");
   action -> setStatusText (i18n("Shows/hides the contrast toolbar"));
   action -> setWhatsThis (i18n("Show Contrast Toolbar command shows or hides the contrast toolbar. This command is available for video files."));
-  action = new KToggleAction (i18n("Show &Brightness Toolbar"), "brightness", 0, this, SLOT (viewBrightnessToolbar()), actionCollection(), "settings_brightness_toolbar");
+  action = new TDEToggleAction (i18n("Show &Brightness Toolbar"), "brightness", 0, this, SLOT (viewBrightnessToolbar()), actionCollection(), "settings_brightness_toolbar");
   action -> setStatusText (i18n("Shows/hides the brightness toolbar"));
   action -> setWhatsThis (i18n("Show Brightness Toolbar command shows or hides the brightness toolbar. This command is available for video files."));
-  action = new KToggleAction (i18n("Show H&ue Toolbar"), "hue", 0, this, SLOT (viewHueToolbar()), actionCollection(), "settings_hue_toolbar");
+  action = new TDEToggleAction (i18n("Show H&ue Toolbar"), "hue", 0, this, SLOT (viewHueToolbar()), actionCollection(), "settings_hue_toolbar");
   action -> setStatusText (i18n("Shows/hides the hue toolbar"));
   action -> setWhatsThis (i18n("Show Hue Toolbar command shows or hides the hue toolbar. This command is available for video files."));
-  action = new KToggleAction (i18n("Show &Saturation Toolbar"), "saturation", 0, this, SLOT (viewSaturationToolbar()), actionCollection(), "settings_saturation_toolbar");
+  action = new TDEToggleAction (i18n("Show &Saturation Toolbar"), "saturation", 0, this, SLOT (viewSaturationToolbar()), actionCollection(), "settings_saturation_toolbar");
   action -> setStatusText (i18n("Shows/hides the saturation toolbar"));
   action -> setWhatsThis (i18n("Show Saturation Toolbar command shows or hides the saturation toolbar. This command is available for video files."));
   action = KStdAction::keyBindings (this, SLOT (settingsKeyBindings()), actionCollection());
@@ -885,12 +885,12 @@ void KPlayer::readOptions (void)
 #endif
 }
 
-/*void KPlayer::saveProperties (KConfig* config) const
+/*void KPlayer::saveProperties (TDEConfig* config) const
 {
   config -> writeEntry ("File URL", settings() -> url().url());
 }
 
-void KPlayer::readProperties (KConfig* config)
+void KPlayer::readProperties (TDEConfig* config)
 {
   library() -> load (config -> readEntry ("File URL"), false);
 }*/
@@ -898,7 +898,7 @@ void KPlayer::readProperties (KConfig* config)
 void KPlayer::enableToolbar (int index)
 {
   Toolbar& toolbar = m_toolbar [index];
-  KToggleAction* action = toggleAction (toolbar.action);
+  TDEToggleAction* action = toggleAction (toolbar.action);
 //if ( action -> isEnabled() )
 //  return;
   action -> setEnabled (true);
@@ -908,7 +908,7 @@ void KPlayer::enableToolbar (int index)
 void KPlayer::disableToolbar (int index)
 {
   Toolbar& toolbar = m_toolbar [index];
-  KToggleAction* action = toggleAction (toolbar.action);
+  TDEToggleAction* action = toggleAction (toolbar.action);
 //if ( ! action -> isEnabled() )
 //  return;
   if ( action -> isChecked() )
@@ -1080,7 +1080,7 @@ void KPlayer::showMaximized (void)
 #ifdef DEBUG_KPLAYER_WINDOW
   bool maximized = isMaximized();
 #endif
-  KMainWindow::showMaximized();
+  TDEMainWindow::showMaximized();
   KWin::clearState (winId(), 1 << 9); // KDE 3.2 FullScreen
   KWin::setState (winId(), NET::Max);
 #ifdef DEBUG_KPLAYER_WINDOW
@@ -1095,8 +1095,8 @@ void KPlayer::showNormal (void)
 #ifdef DEBUG_KPLAYER_WINDOW
   bool maximized = isMaximized();
 #endif
-  KMainWindow::showNormal();
-  //KMainWindow::showNormal();
+  TDEMainWindow::showNormal();
+  //TDEMainWindow::showNormal();
   KWin::clearState (winId(), NET::Max | (1 << 9)); // KDE 3.2 FullScreen
 #ifdef DEBUG_KPLAYER_WINDOW
   kdDebugTime() << "KPlayer::showNormal " << maximized << " -> " << isMaximized() << "\n";
@@ -1126,7 +1126,7 @@ void KPlayer::start (void)
     << ", size " << width() << "x" << height() << "\n";
 #endif
   KPlayerX11GetKeyboardMouseState (winId());
-  KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
   if ( args -> count() > 0 )
   {
     KURL::List urls;
@@ -1148,7 +1148,7 @@ void KPlayer::start (void)
       library() -> library() -> treeView() -> addToCollectionUrls (urls);
     else
       playlist() -> playUrls (urls);
-    //openUrl (KCmdLineArgs::makeURL (args -> arg (args -> count() - 1)));
+    //openUrl (TDECmdLineArgs::makeURL (args -> arg (args -> count() - 1)));
   }
   args -> clear();
 }
@@ -1161,7 +1161,7 @@ void KPlayer::start (void)
     << " spontaneous " << ev -> spontaneous() << "\n";
 //if ( ev -> type() == TQEvent::LayoutHint && isFullScreen() )
 //  return false;
-  return KMainWindow::event (ev);
+  return TDEMainWindow::event (ev);
 }*/
 
 void KPlayer::contextMenu (const TQPoint& global_position)
@@ -1179,7 +1179,7 @@ void KPlayer::contextMenu (const TQPoint& global_position)
 
 void KPlayer::contextMenuEvent (TQContextMenuEvent* event)
 {
-  KMainWindow::contextMenuEvent (event);
+  TDEMainWindow::contextMenuEvent (event);
   contextMenu (event -> globalPos());
   event -> accept();
 }
@@ -1232,7 +1232,7 @@ void KPlayer::closeEvent (TQCloseEvent* event)
   library() -> library() -> terminate();
   playlist() -> terminate();
   KPlayerEngine::terminate();
-  KMainWindow::closeEvent (event);
+  TDEMainWindow::closeEvent (event);
 #ifdef DEBUG_KPLAYER_WINDOW
   kdDebugTime() << "KPlayer::closeEvent\n";
 #endif
@@ -1383,7 +1383,7 @@ void KPlayer::showToolbar (int index)
   toggleAction (m_toolbar[index].action) -> setChecked (show);
   if ( show )
   {
-    KToolBar* toolbar = toolBar (m_toolbar[index].name);
+    TDEToolBar* toolbar = toolBar (m_toolbar[index].name);
     toolbar -> show();
     int hint = toolbar -> minimumSizeHint().height();
     if ( toolbar -> orientation() == TQt::Vertical && kPlayerWorkspace() -> height() < hint
@@ -1631,7 +1631,7 @@ void KPlayer::showEvent (TQShowEvent* event)
 #ifdef DEBUG_KPLAYER_WINDOW
   kdDebugTime() << "KPlayer::showEvent\n";
 #endif
-  KMainWindow::showEvent (event);
+  TDEMainWindow::showEvent (event);
   if ( m_initial_show )
     return;
   m_initial_show = true;
@@ -1661,7 +1661,7 @@ void KPlayer::showEvent (TQShowEvent* event)
 
 void KPlayer::windowActivationChange (bool old)
 {
-  KMainWindow::windowActivationChange (old);
+  TDEMainWindow::windowActivationChange (old);
   bool active = isActiveWindow();
 #ifdef DEBUG_KPLAYER_WINDOW
   kdDebugTime() << "Main window activation " << old << " -> " << active << "\n";
@@ -1681,7 +1681,7 @@ void KPlayer::focusInEvent (TQFocusEvent* event)
 #ifdef DEBUG_KPLAYER_WINDOW
   kdDebugTime() << "Window focus in event\n";
 #endif
-  KMainWindow::focusInEvent (event);
+  TDEMainWindow::focusInEvent (event);
 }
 
 void KPlayer::focusOutEvent (TQFocusEvent* event)
@@ -1689,7 +1689,7 @@ void KPlayer::focusOutEvent (TQFocusEvent* event)
 #ifdef DEBUG_KPLAYER_WINDOW
   kdDebugTime() << "Window focus out event\n";
 #endif
-  KMainWindow::focusOutEvent (event);
+  TDEMainWindow::focusOutEvent (event);
 }
 
 void KPlayer::moveEvent (TQMoveEvent* event)
@@ -1697,7 +1697,7 @@ void KPlayer::moveEvent (TQMoveEvent* event)
 #ifdef DEBUG_KPLAYER_RESIZING
   bool maximized = isMaximized();
 #endif
-  KMainWindow::moveEvent (event);
+  TDEMainWindow::moveEvent (event);
   if ( ! m_full_screen && ! m_set_display_size && ! settings() -> maximized() && ! isMaximized() && m_initial_show )
     m_normal_geometry.setRect (x(), y(), width(), height());
 #ifdef DEBUG_KPLAYER_RESIZING
@@ -1714,7 +1714,7 @@ void KPlayer::resizeEvent (TQResizeEvent* event)
 #ifdef DEBUG_KPLAYER_RESIZING
   bool maximized = isMaximized();
 #endif
-  KMainWindow::resizeEvent (event);
+  TDEMainWindow::resizeEvent (event);
   if ( ! m_full_screen && ! m_set_display_size && ! settings() -> maximized() && ! isMaximized() && m_initial_show )
     m_normal_geometry.setSize (TQSize (width(), height()));
 #ifdef DEBUG_KPLAYER_RESIZING
@@ -1757,7 +1757,7 @@ void KPlayer::setMinimumSize (int w, int h)
 #endif
   w = msh.width();
   h = msh.height();
-  KMainWindow::setMinimumSize (w, h);
+  TDEMainWindow::setMinimumSize (w, h);
 #ifdef DEBUG_KPLAYER_RESIZING
   dumpObject (this, 0, 1);
   if ( prev != size() )
@@ -2071,7 +2071,7 @@ void KPlayer::zoom (void)
 #endif
   TQSize target (minimumSizeHint());
   TQRect available (availableGeometry());
-  KMainWindow::setMinimumSize (target.width(), target.height());
+  TDEMainWindow::setMinimumSize (target.width(), target.height());
   do_zoom();
   target = frameGeometry().size() + settings() -> displaySize().expandedTo (TQSize (1, 1)) - centralWidget() -> size();
   TQt::Dock dock;
diff --git a/kplayer/kplayer.desktop b/kplayer/kplayer.desktop
index 78b7efd..e99a4d2 100644
--- a/kplayer/kplayer.desktop
+++ b/kplayer/kplayer.desktop
@@ -3,7 +3,7 @@ Encoding=UTF-8
 Type=Application
 Exec=kplayer -- %U
 Icon=kplayer.png
-DocPath=kplayer/index.html
+X-DocPath=kplayer/index.html
 Comment=Media Player
 Comment[af]=Media Speler
 Comment[ar]=قارئ الوسائط
@@ -117,4 +117,4 @@ GenericName[zh_CN]=媒体播放器
 GenericName[zh_TW]=多媒體播放器
 GenericName[zu]=Umdlali Wezezindaba
 MimeType=audio/mp3;audio/mpeg3;audio/mpeg4;audio/mpg;audio/mpeg;audio/mpegurl;audio/m3u;audio/mp4;audio/wav;video/msvideo;video/mpeg4;video/mpeg;video/x-m4v;video/x-mpeg;video/x-mpeg2;video/mp4;video/x-msmpeg;video/vnd.mpegurl;video/x-mpegurl;video/x-msvideo;video/quicktime;video/x-qtc;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wma;audio/x-ms-wax;audio/x-ms-wmp;audio/x-ms-wmv;video/x-ms-asf;video/x-ms-asf-plugin;video/x-ms-asx;video/x-ms-wax;video/x-ms-wmp;video/x-ms-wmv;video/x-ms-wma;video/x-ms-wvx;video/x-ms-wmx;video/x-ms-wm;application/asx;application/x-ms-asf;application/vnd.ms-asf;application/x-ms-wmd;application/x-ms-wmz;audio/scpls;audio/x-scpls;audio/x-pls;audio/vnd.mpegurl;audio/x-mpg;audio/x-mpeg;audio/x-mpeg3;audio/x-mpegurl;audio/x-realaudio;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;application/x-pn-realaudio;audio/vnd.rn-realaudio;video/x-realvideo;video/x-pn-realvideo;video/vnd.rn-realvideo;video/x-pn-realvideo-plugin;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;application/vnd.rn-realplayer;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;video/nsv;audio/x-mp3;video/x-ogm;video/x-theora;audio/vorbis;audio/x-vorbis;audio/x-oggflac;application/x-ogg;application/ogg;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/x-wav;video/avi;video/x-avi;video/x-divx;video/x-fli;video/x-matroska;audio/x-matroska;application/x-mplayer2;application/x-cda;audio/aac;audio/ac3;audio/basic;audio/m4a;audio/x-aac;audio/x-adpcm;audio/x-flac;audio/x-m3u;audio/x-m4a;audio/x-musepack;audio/x-pn-windows-pcm;video/x-3gpp;video/x-3gpp2;video/mediaplayer;uri/mms;uri/mmst;uri/mmsu;uri/pnm;uri/rtsp;uri/rtspt;uri/rtspu
-Categories=AudioVideo;Player;Qt;KDE;
+Categories=AudioVideo;Player;Qt;TDE;
diff --git a/kplayer/kplayer.h b/kplayer/kplayer.h
index 003f39b..a4409a1 100644
--- a/kplayer/kplayer.h
+++ b/kplayer/kplayer.h
@@ -20,8 +20,8 @@
 #include <config.h>
 #endif
 
-#include <kaction.h>
-#include <kmainwindow.h>
+#include <tdeaction.h>
+#include <tdemainwindow.h>
 #include <kuniqueapplication.h>
 
 #include "kplayerengine.h"
@@ -33,7 +33,7 @@ class KPlayerNodeView;
 class KPlayerPlaylist;
 class KPlayerWorkspace;
 class KStatusBarLabel;
-class KToggleAction;
+class TDEToggleAction;
 class KURL;
 class TQMenuData;
 
@@ -52,7 +52,7 @@ class TQMenuData;
 /** The KPlayer main window class.
   *@author kiriuja
   */
-class KPlayer : public KMainWindow
+class KPlayer : public TDEMainWindow
 {
   Q_OBJECT 
 
@@ -65,7 +65,7 @@ class KPlayer : public KMainWindow
   } Toolbar;
 
 public:
-  /** Constructor. Parameters are passed to KMainWindow constructor. */
+  /** Constructor. Parameters are passed to TDEMainWindow constructor. */
   KPlayer (TQWidget* parent=0, const char *name=0);
   /** Destructor. */
   virtual ~KPlayer() { }
@@ -84,7 +84,7 @@ public:
     { return engine() -> process(); }
 
   /** Main config. */
-  KConfig* config (void) const
+  TDEConfig* config (void) const
     { return KPlayerEngine::engine() -> config(); }
 
   /** Playlist. */
@@ -160,11 +160,11 @@ protected:
   /** Read general options again and initialize all variables like the recent file list. */
   void readOptions (void);
   /** Saves the current URLs during session end to the session config file.
-      @see KMainWindow#saveProperties */
-  //virtual void saveProperties (KConfig*) const;
+      @see TDEMainWindow#saveProperties */
+  //virtual void saveProperties (TDEConfig*) const;
   /** Restores the URLs from the session config file.
-      @see KMainWindow#readProperties */
-  //virtual void readProperties (KConfig*);
+      @see TDEMainWindow#readProperties */
+  //virtual void readProperties (TDEConfig*);
 
   /** Enables or disables player actions. */
   void enablePlayerActions (void);
@@ -194,7 +194,7 @@ protected:
   /** Changes the statusbar contents for the standard label permanently, used to indicate current actions. */
   void setStatusText (const TQString&);
 
-  /** Processes the widget events. Passes them on to KMainWindow. */
+  /** Processes the widget events. Passes them on to TDEMainWindow. */
   //virtual bool event (TQEvent*);
   /** Sets the window geometry on the initial show event. */
   virtual void showEvent (TQShowEvent*);
@@ -215,11 +215,11 @@ protected:
   virtual void closeEvent (TQCloseEvent*);
 
   /** Retrieves an action from the actionCollection by name. */
-  KAction* action (const char* name) const
+  TDEAction* action (const char* name) const
     { return actionCollection() -> action (name); }
   /** Retrieves a toggle action from the actionCollection by name. */
-  KToggleAction* toggleAction (const char* name) const
-    { return (KToggleAction*) action (name); }
+  TDEToggleAction* toggleAction (const char* name) const
+    { return (TDEToggleAction*) action (name); }
 
   /** Rearranges child windows and clears events. */
   void activateLayout (void);
diff --git a/kplayer/kplayeractionlist.cpp b/kplayer/kplayeractionlist.cpp
index 0f2a95f..3af374d 100644
--- a/kplayer/kplayeractionlist.cpp
+++ b/kplayer/kplayeractionlist.cpp
@@ -13,8 +13,8 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <kaction.h>
-#include <klocale.h>
+#include <tdeaction.h>
+#include <tdelocale.h>
 #include <tqpopupmenu.h>
 #include <tqregexp.h>
 
@@ -58,7 +58,7 @@ void KPlayerActionList::plug (void)
 #ifdef DEBUG_KPLAYER_ACTIONLIST
     kdDebugTime() << "Inserting separators\n";
 #endif
-    KAction* action = actions().getFirst();
+    TDEAction* action = actions().getFirst();
     int i, count = action -> containerCount();
 #ifdef DEBUG_KPLAYER_ACTIONLIST
     kdDebugTime() << " Containers " << count << "\n";
@@ -124,7 +124,7 @@ void KPlayerActionList::unplug (void)
 #ifdef DEBUG_KPLAYER_ACTIONLIST
     kdDebugTime() << "Removing separators\n";
 #endif
-    KAction* action = actions().getFirst();
+    TDEAction* action = actions().getFirst();
     int i, count = action -> containerCount();
 #ifdef DEBUG_KPLAYER_ACTIONLIST
     kdDebugTime() << " Containers " << count << "\n";
@@ -181,7 +181,7 @@ void KPlayerActionList::unplug (void)
   m_actions.clear();
 }
 
-void KPlayerActionList::updateAction (KAction* action)
+void KPlayerActionList::updateAction (TDEAction* action)
 {
   TQString text (action -> text());
   action -> setStatusText (m_status.arg (text));
@@ -196,14 +196,14 @@ void KPlayerActionList::actionActivated (void)
 #ifdef DEBUG_KPLAYER_ACTIONLIST
   kdDebugTime() << "KPlayerActionList::actionActivated\n";
 #endif
-  if ( sender() && sender() -> inherits ("KAction") )
+  if ( sender() && sender() -> inherits ("TDEAction") )
   {
-    KAction* action = (KAction*) sender();
+    TDEAction* action = (TDEAction*) sender();
 #ifdef DEBUG_KPLAYER_ACTIONLIST
     kdDebugTime() << " Name   " << action -> text() << "\n";
 #endif
     int index = 0;
-    TQPtrListIterator<KAction> iterator (actions());
+    TQPtrListIterator<TDEAction> iterator (actions());
     while ( iterator.current() )
     {
       if ( iterator.current() == action )
@@ -217,7 +217,7 @@ void KPlayerActionList::actionActivated (void)
   }
 }
 
-void KPlayerActionList::actionActivated (KAction*, int index)
+void KPlayerActionList::actionActivated (TDEAction*, int index)
 {
 #ifdef DEBUG_KPLAYER_ACTIONLIST
   kdDebugTime() << "KPlayerActionList::actionActivated\n";
@@ -251,7 +251,7 @@ void KPlayerSimpleActionList::update (void)
   TQStringList::ConstIterator iterator (m_names.constBegin());
   while ( iterator != m_names.constEnd() )
   {
-    KAction* action = new KAction (*iterator, 0, this, SLOT(actionActivated()), this);
+    TDEAction* action = new TDEAction (*iterator, 0, this, SLOT(actionActivated()), this);
     updateAction (action);
     m_actions.append (action);
     ++ iterator;
@@ -259,7 +259,7 @@ void KPlayerSimpleActionList::update (void)
   plug();
 }
 
-void KPlayerSimpleActionList::updateAction (KAction* action)
+void KPlayerSimpleActionList::updateAction (TDEAction* action)
 {
   TQString text (action -> text());
   KPlayerPropertyInfo* info = KPlayerMedia::info (text);
@@ -291,7 +291,7 @@ KPlayerToggleActionList::~KPlayerToggleActionList()
 #endif
 }
 
-void KPlayerToggleActionList::updateAction (KAction* action)
+void KPlayerToggleActionList::updateAction (TDEAction* action)
 {
   TQString text (action -> text());
   KPlayerPropertyInfo* info = KPlayerMedia::info (text);
@@ -306,7 +306,7 @@ void KPlayerToggleActionList::updateAction (KAction* action)
   action -> setText (caption);
 }
 
-void KPlayerToggleActionList::actionActivated (KAction* action, int index)
+void KPlayerToggleActionList::actionActivated (TDEAction* action, int index)
 {
 #ifdef DEBUG_KPLAYER_ACTIONLIST
   kdDebugTime() << "KPlayerToggleActionList::actionActivated\n";
@@ -347,7 +347,7 @@ TQString languageName (int id, TQString language)
         language = other.mid (index + 5, 2);
     }
   }
-  TQString locname (KGlobal::locale() -> twoAlphaToLanguageName (language));
+  TQString locname (TDEGlobal::locale() -> twoAlphaToLanguageName (language));
   if ( locname.isEmpty() )
   {
     if ( language == "no" )
@@ -384,7 +384,7 @@ void KPlayerTrackActionList::addActions (const TQMap<int, TQString>& ids, int id
 #ifdef DEBUG_KPLAYER_ACTIONLIST
     kdDebugTime() << " Stream " << iterator.key() << " " << iterator.data() << " " << text << "\n";
 #endif
-    KToggleAction* action = new KToggleAction (text, 0, this, SLOT(actionActivated()), this);
+    TDEToggleAction* action = new TDEToggleAction (text, 0, this, SLOT(actionActivated()), this);
     updateAction (action);
     action -> setExclusiveGroup (name());
     if ( id == iterator.key() )
@@ -402,13 +402,13 @@ void KPlayerTrackActionList::update (const TQMap<int, TQString>& ids, int id)
   plug();
 }
 
-void KPlayerTrackActionList::actionActivated (KAction* action, int index)
+void KPlayerTrackActionList::actionActivated (TDEAction* action, int index)
 {
 #ifdef DEBUG_KPLAYER_ACTIONLIST
   kdDebugTime() << "KPlayerTrackActionList::actionActivated\n";
   kdDebugTime() << " Index  " << index << "\n";
 #endif
-  KPlayerActionList::actionActivated (action, ((KToggleAction*) action) -> isChecked() ? index : -1);
+  KPlayerActionList::actionActivated (action, ((TDEToggleAction*) action) -> isChecked() ? index : -1);
 }
 
 KPlayerSubtitleTrackActionList::KPlayerSubtitleTrackActionList (const TQString& text, const TQString& status,
@@ -433,7 +433,7 @@ void KPlayerSubtitleTrackActionList::update (bool show, const TQMap<int, TQStrin
   unplug();
   if ( sids.count() > 0 || vsids.count() > 0 || files.count() > 0 )
   {
-    KToggleAction* action = new KToggleAction (i18n("&None"), 0, this, SLOT(actionActivated()), this);
+    TDEToggleAction* action = new TDEToggleAction (i18n("&None"), 0, this, SLOT(actionActivated()), this);
     action -> setStatusText (i18n("Turns off subtitle display"));
     action -> setWhatsThis (i18n("Subtitles None command turns off subtitle display."));
     action -> setExclusiveGroup (name());
@@ -453,7 +453,7 @@ void KPlayerSubtitleTrackActionList::update (bool show, const TQMap<int, TQStrin
 #endif
       if ( ! text.isEmpty() )
       {
-        action = new KToggleAction (text, 0, this, SLOT (actionActivated()), this);
+        action = new TDEToggleAction (text, 0, this, SLOT (actionActivated()), this);
         updateAction (action);
         action -> setText (text);
         action -> setExclusiveGroup (name());
@@ -467,16 +467,16 @@ void KPlayerSubtitleTrackActionList::update (bool show, const TQMap<int, TQStrin
   plug();
 }
 
-void KPlayerSubtitleTrackActionList::actionActivated (KAction* action, int index)
+void KPlayerSubtitleTrackActionList::actionActivated (TDEAction* action, int index)
 {
 #ifdef DEBUG_KPLAYER_ACTIONLIST
   kdDebugTime() << "KPlayerSubtitleTrackActionList::actionActivated\n";
   kdDebugTime() << " Index  " << index << "\n";
 #endif
-  if ( ! ((KToggleAction*) action) -> isChecked() )
+  if ( ! ((TDEToggleAction*) action) -> isChecked() )
   {
     index = 0;
-    ((KToggleAction*) actions().getFirst()) -> setChecked (true);
+    ((TDEToggleAction*) actions().getFirst()) -> setChecked (true);
   }
   KPlayerActionList::actionActivated (action, index);
 }
diff --git a/kplayer/kplayeractionlist.h b/kplayer/kplayeractionlist.h
index 86ee8c8..e443d52 100644
--- a/kplayer/kplayeractionlist.h
+++ b/kplayer/kplayeractionlist.h
@@ -19,7 +19,7 @@
 #include <tqobject.h>
 #include <tqptrlist.h>
 
-class KAction;
+class TDEAction;
 
 /**Action list.
   *@author kiriuja
@@ -36,7 +36,7 @@ public:
   virtual ~KPlayerActionList();
 
   /** Returns the list of actions. */
-  const TQPtrList<KAction>& actions (void) const
+  const TQPtrList<TDEAction>& actions (void) const
     { return m_actions; }
   /** Returns the number of actions on the list. */
   int count (void) const
@@ -63,9 +63,9 @@ protected:
   /** Unplugs the action list. */
   void unplug (void);
   /** Updates the action text, status, and whats this. */
-  virtual void updateAction (KAction* action);
+  virtual void updateAction (TDEAction* action);
   /** Selects the item with the given index by emitting the activated signal. */
-  virtual void actionActivated (KAction* action, int index);
+  virtual void actionActivated (TDEAction* action, int index);
 
   /** Action text template. */
   TQString m_text;
@@ -74,7 +74,7 @@ protected:
   /** Action whats this text template. */
   TQString m_whatsthis;
   /** Action list. */
-  TQPtrList<KAction> m_actions;
+  TQPtrList<TDEAction> m_actions;
 };
 
 /**Simple action list.
@@ -96,7 +96,7 @@ public:
 
 protected:
   /** Updates the action text, status, and whats this. */
-  virtual void updateAction (KAction* action);
+  virtual void updateAction (TDEAction* action);
 
   /** Action names. */
   const TQStringList& m_names;
@@ -119,9 +119,9 @@ public:
 
 protected:
   /** Updates the action text, status, and whats this. */
-  virtual void updateAction (KAction* action);
+  virtual void updateAction (TDEAction* action);
   /** Selects the item with the given index by emitting the activated signal. */
-  virtual void actionActivated (KAction* action, int index);
+  virtual void actionActivated (TDEAction* action, int index);
 
   /** Action states. */
   const TQMap<TQString, bool>& m_states;
@@ -155,7 +155,7 @@ protected:
   void addActions (const TQMap<int, TQString>& ids, int id);
 
   /** Selects the track with the given index by emitting the activated signal. */
-  virtual void actionActivated (KAction* action, int index);
+  virtual void actionActivated (TDEAction* action, int index);
 };
 
 /**Subtitle track action list.
@@ -178,7 +178,7 @@ public:
 
 protected:
   /** Selects the track with the given index by emitting the activated signal. */
-  virtual void actionActivated (KAction* action, int index);
+  virtual void actionActivated (TDEAction* action, int index);
 };
 
 #endif
diff --git a/kplayer/kplayerengine.cpp b/kplayer/kplayerengine.cpp
index e956a36..5745c7a 100644
--- a/kplayer/kplayerengine.cpp
+++ b/kplayer/kplayerengine.cpp
@@ -14,11 +14,11 @@
  ***************************************************************************/
 
 #include <dcopclient.h>
-#include <kapplication.h>
-#include <kconfig.h>
-#include <klocale.h>
-#include <kmainwindow.h>
-#include <krecentdocument.h>
+#include <tdeapplication.h>
+#include <tdeconfig.h>
+#include <tdelocale.h>
+#include <tdemainwindow.h>
+#include <tderecentdocument.h>
 #include <kurlrequester.h>
 #include <kurlrequesterdlg.h>
 #include <tqdatetime.h>
@@ -90,7 +90,7 @@ KPlayerFileDialog::KPlayerFileDialog (const TQString& dir, const TQString& filte
   ops -> clearHistory();
 }
 
-KPlayerEngine::KPlayerEngine (KActionCollection* ac, TQWidget* parent, const char* name, KConfig* config)
+KPlayerEngine::KPlayerEngine (TDEActionCollection* ac, TQWidget* parent, const char* name, TDEConfig* config)
 {
 #ifdef DEBUG_KPLAYER_ENGINE
   kdDebugTime() << "Creating engine\n";
@@ -100,9 +100,9 @@ KPlayerEngine::KPlayerEngine (KActionCollection* ac, TQWidget* parent, const cha
   m_light = config == 0;
   m_progress_factor = 0;
   m_stop = m_updating = m_zooming = m_play_pending = m_enable_screen_saver = m_amixer_running = false;
-  m_config = light() ? new KConfig ("kplayerrc") : config;
-  m_store = new KConfig ("kplayerlibraryrc");
-  m_meta = new KConfig ("kplayerplaylistrc");
+  m_config = light() ? new TDEConfig ("kplayerrc") : config;
+  m_store = new TDEConfig ("kplayerlibraryrc");
+  m_meta = new TDEConfig ("kplayerplaylistrc");
   m_configuration = new KPlayerConfiguration;
   configuration() -> setup();
   m_settings = new KPlayerSettings;
@@ -447,7 +447,7 @@ KPlayerEngine::~KPlayerEngine()
     delete meta();
 }
 
-void KPlayerEngine::initialize (KActionCollection* ac, TQWidget* parent, const char* name, KConfig* config)
+void KPlayerEngine::initialize (TDEActionCollection* ac, TQWidget* parent, const char* name, TDEConfig* config)
 {
   if ( ! engine() )
   {
@@ -474,50 +474,50 @@ void KPlayerEngine::setupActions (void)
 #ifdef DEBUG_KPLAYER_ENGINE
   kdDebugTime() << "KPlayerEngine::setupActions\n";
 #endif
-  KAction* action;
-  action = new KAction (i18n("&Properties..."), "properties", ALT + Key_Return, this, SLOT (fileProperties()), m_ac, "file_properties");
+  TDEAction* action;
+  action = new TDEAction (i18n("&Properties..."), "properties", ALT + Key_Return, this, SLOT (fileProperties()), m_ac, "file_properties");
   action -> setStatusText (i18n("Opens the File Properties dialog"));
   action -> setWhatsThis (i18n("Properties command opens the File Properties dialog that lets you choose many options specific to the currently loaded file. See the File properties micro-HOWTO for details."));
 
-  action = new KAction (i18n("&Play"), "player_play", Key_Return, this, SLOT (play()), m_ac, "player_play");
+  action = new TDEAction (i18n("&Play"), "player_play", Key_Return, this, SLOT (play()), m_ac, "player_play");
   action -> setStatusText (i18n("Plays the currently loaded file"));
   action -> setWhatsThis (i18n("Play command starts playback of the current file. If the player has been paused, this command resumes playback. This command is available when a file is loaded."));
-  action = new KToggleAction (i18n("Paus&e"), "player_pause", Key_Space, this, SLOT (pause()), m_ac, "player_pause");
+  action = new TDEToggleAction (i18n("Paus&e"), "player_pause", Key_Space, this, SLOT (pause()), m_ac, "player_pause");
   action -> setStatusText (i18n("Pauses the player"));
   action -> setWhatsThis (i18n("Pause command pauses or resumes playback of the current file. This command is available when the player is not idle."));
-  action = new KAction (i18n("&Stop"), "player_stop", Key_Escape, this, SLOT (stop()), m_ac, "player_stop");
+  action = new TDEAction (i18n("&Stop"), "player_stop", Key_Escape, this, SLOT (stop()), m_ac, "player_stop");
   action -> setStatusText (i18n("Stops the player"));
   action -> setWhatsThis (i18n("Stop command stops playback of the current file. This command is available when the player is not idle."));
 
-  action = new KAction (i18n("&Forward"), 0, Key_Right, this, SLOT (forward()), m_ac, "player_forward");
+  action = new TDEAction (i18n("&Forward"), 0, Key_Right, this, SLOT (forward()), m_ac, "player_forward");
   action -> setStatusText (i18n("Moves playback forward"));
   action -> setWhatsThis (i18n("Forward command moves playback forward by one percent of the time length of the current file. This command is available when playing a file."));
-  action = new KAction (i18n("F&ast Forward"), "player_fwd", CTRL + Key_Right, this, SLOT (fastForward()), m_ac, "player_fast_forward");
+  action = new TDEAction (i18n("F&ast Forward"), "player_fwd", CTRL + Key_Right, this, SLOT (fastForward()), m_ac, "player_fast_forward");
   action -> setStatusText (i18n("Moves playback forward fast"));
   action -> setWhatsThis (i18n("Fast Forward command moves playback forward by ten percent of the time length of the current file. This command is available when playing a file."));
-  action = new KAction (i18n("&Backward"), 0, Key_Left, this, SLOT (backward()), m_ac, "player_backward");
+  action = new TDEAction (i18n("&Backward"), 0, Key_Left, this, SLOT (backward()), m_ac, "player_backward");
   action -> setStatusText (i18n("Moves playback backward"));
   action -> setWhatsThis (i18n("Backward command moves playback backward by one percent of the time length of the current file. This command is available when playing a file."));
-  action = new KAction (i18n("Fast Back&ward"), "player_rew", CTRL + Key_Left, this, SLOT (fastBackward()), m_ac, "player_fast_backward");
+  action = new TDEAction (i18n("Fast Back&ward"), "player_rew", CTRL + Key_Left, this, SLOT (fastBackward()), m_ac, "player_fast_backward");
   action -> setStatusText (i18n("Moves playback backward fast"));
   action -> setWhatsThis (i18n("Fast Backward command moves playback backward by ten percent of the time length of the current file. This command is available when playing a file."));
-  action = new KAction (i18n("Back &to Start"), 0, CTRL + Key_Home, this, SLOT (start()), m_ac, "player_start");
+  action = new TDEAction (i18n("Back &to Start"), 0, CTRL + Key_Home, this, SLOT (start()), m_ac, "player_start");
   action -> setStatusText (i18n("Moves playback to the beginning"));
   action -> setWhatsThis (i18n("Back to Start command moves playback to the beginning of the current file. This command is available when playing a file."));
 
-  action = new KAction (i18n("&Increase Volume"), 0, CTRL + Key_Up, this, SLOT (volumeIncrease()), m_ac, "audio_volume_up");
+  action = new TDEAction (i18n("&Increase Volume"), 0, CTRL + Key_Up, this, SLOT (volumeIncrease()), m_ac, "audio_volume_up");
   action -> setStatusText (i18n("Increases the volume"));
   action -> setWhatsThis (i18n("Increase Volume command increases the sound volume."));
-  action = new KAction (i18n("&Decrease Volume"), 0, CTRL + Key_Down, this, SLOT (volumeDecrease()), m_ac, "audio_volume_down");
+  action = new TDEAction (i18n("&Decrease Volume"), 0, CTRL + Key_Down, this, SLOT (volumeDecrease()), m_ac, "audio_volume_down");
   action -> setStatusText (i18n("Decreases the volume"));
   action -> setWhatsThis (i18n("Decrease Volume command decreases the sound volume."));
-  KToggleAction* toggle = new KToggleAction (i18n("&Mute"), "mute", CTRL + Key_Backslash, this, SLOT (mute()), m_ac, "audio_mute");
+  TDEToggleAction* toggle = new TDEToggleAction (i18n("&Mute"), "mute", CTRL + Key_Backslash, this, SLOT (mute()), m_ac, "audio_mute");
   toggle -> setStatusText (i18n("Turns the sound on/off"));
   toggle -> setWhatsThis (i18n("Mute command turns the sound on or off."));
   if ( configuration() -> mute() )
     toggle -> setChecked (true);
 
-  toggle = new KToggleAction (i18n("Maintain &Aspect"), "viewmagfit", CTRL + Key_A, this, SLOT (maintainAspect()), m_ac, "view_maintain_aspect");
+  toggle = new TDEToggleAction (i18n("Maintain &Aspect"), "viewmagfit", CTRL + Key_A, this, SLOT (maintainAspect()), m_ac, "view_maintain_aspect");
   toggle -> setStatusText (i18n("Maintains the video aspect ratio"));
   toggle -> setWhatsThis (i18n("Maintain Aspect command toggles the option to maintain the video aspect ratio."));
   if ( settings() -> maintainAspect() )
@@ -546,17 +546,17 @@ void KPlayerEngine::setupActions (void)
     return;
   }
 
-  action = new KAction (i18n("&Load Subtitles..."), 0, CTRL + Key_S, this, SLOT (fileOpenSubtitles()), m_ac, "subtitles_load");
+  action = new TDEAction (i18n("&Load Subtitles..."), 0, CTRL + Key_S, this, SLOT (fileOpenSubtitles()), m_ac, "subtitles_load");
   action -> setStatusText (i18n("Opens a subtitle file"));
   action -> setWhatsThis (i18n("Load Subtitles command displays the standard Open File dialog and lets you choose a subtitle file to use with the current file or URL. If you load subtitles when video is playing, KPlayer will display the subtitles immediately. By default it will also remember the subtitles you choose in the current file properties. This command is available for video files."));
-  /*action = new KAction (i18n("Load Su&btitle URL..."), 0, 0, this, SLOT (fileOpenSubtitleUrl()), m_ac, "subtitles_load_url");
+  /*action = new TDEAction (i18n("Load Su&btitle URL..."), 0, 0, this, SLOT (fileOpenSubtitleUrl()), m_ac, "subtitles_load_url");
   action -> setStatusText (i18n("Opens a subtitle URL"));
   action -> setWhatsThis (i18n("Load Subtitle URL command displays the standard Open URL dialog and lets you type or paste in a subtitle URL to use with the current file or URL. If you load subtitles when video is playing, KPlayer will display the subtitles immediately. By default it will also remember the subtitles you choose in the current file properties. This command is available for video files."));
-  action = new KAction (i18n("U&nload Subtitles"), 0, 0, this, SLOT (fileUnloadSubtitles()), m_ac, "subtitles_unload");
+  action = new TDEAction (i18n("U&nload Subtitles"), 0, 0, this, SLOT (fileUnloadSubtitles()), m_ac, "subtitles_unload");
   action -> setStatusText (i18n("Unloads subtitles"));
   action -> setWhatsThis (i18n("Unload Subtitles command unloads the currently loaded subtitles, and if video is playing, hides the subtitles. This command is available when subtitles are loaded."));*/
 
-  action = new KToggleAction (i18n("&Full Screen"), "window_fullscreen", CTRL + Key_F, this, SLOT (fullScreen()), m_ac, "view_full_screen");
+  action = new TDEToggleAction (i18n("&Full Screen"), "window_fullscreen", CTRL + Key_F, this, SLOT (fullScreen()), m_ac, "view_full_screen");
   action -> setStatusText (i18n("Switches to full screen mode"));
   action -> setWhatsThis (i18n("Full Screen command switches to full screen video display and back to normal mode."));
   action = KStdAction::zoomIn (this, SLOT (zoomIn()), m_ac);
@@ -565,90 +565,90 @@ void KPlayerEngine::setupActions (void)
   action = KStdAction::zoomOut (this, SLOT (zoomOut()), m_ac);
   action -> setStatusText (i18n("Shrinks the video"));
   action -> setWhatsThis (i18n("Zoom Out command reduces the video area by one half of the original video size of the current file."));
-  toggle = new KToggleAction (i18n("Zoom to 5&0%"), 0, 0, this, SLOT (zoom12()), m_ac, "view_zoom_1_2");
+  toggle = new TDEToggleAction (i18n("Zoom to 5&0%"), 0, 0, this, SLOT (zoom12()), m_ac, "view_zoom_1_2");
   // xgettext:no-c-format
   toggle -> setStatusText (i18n("Scales video to 50% of the original size"));
   // xgettext:no-c-format
   toggle -> setWhatsThis (i18n("Zoom to 50% command resizes the video area to one half of the original video size of the current file."));
   toggle -> setExclusiveGroup ("zoom");
-  toggle = new KToggleAction (i18n("Zoom to &100%"), 0, CTRL + Key_Backspace, this, SLOT (zoom11()), m_ac, "view_zoom_1_1");
+  toggle = new TDEToggleAction (i18n("Zoom to &100%"), 0, CTRL + Key_Backspace, this, SLOT (zoom11()), m_ac, "view_zoom_1_1");
   toggle -> setStatusText (i18n("Scales video to its original size"));
   // xgettext:no-c-format
   toggle -> setWhatsThis (i18n("Zoom to 100% command resizes the video area to the original video size of the current file."));
   toggle -> setExclusiveGroup ("zoom");
-  toggle = new KToggleAction (i18n("Zoo&m to 150%"), 0, 0, this, SLOT (zoom32()), m_ac, "view_zoom_3_2");
+  toggle = new TDEToggleAction (i18n("Zoo&m to 150%"), 0, 0, this, SLOT (zoom32()), m_ac, "view_zoom_3_2");
   // xgettext:no-c-format
   toggle -> setStatusText (i18n("Scales video to 150% of the original size"));
   // xgettext:no-c-format
   toggle -> setWhatsThis (i18n("Zoom to 150% command resizes the video area to 150% of the original video size of the current file."));
   toggle -> setExclusiveGroup ("zoom");
-  toggle = new KToggleAction (i18n("Zoom to &200%"), 0, 0, this, SLOT (zoom21()), m_ac, "view_zoom_2_1");
+  toggle = new TDEToggleAction (i18n("Zoom to &200%"), 0, 0, this, SLOT (zoom21()), m_ac, "view_zoom_2_1");
   // xgettext:no-c-format
   toggle -> setStatusText (i18n("Scales video to 200% of the original size"));
   // xgettext:no-c-format
   toggle -> setWhatsThis (i18n("Zoom to 200% command resizes the video area to twice the original video size of the current file."));
   toggle -> setExclusiveGroup ("zoom");
-  toggle = new KToggleAction (i18n("Zoom &to 250%"), 0, 0, this, SLOT (zoom52()), m_ac, "view_zoom_5_2");
+  toggle = new TDEToggleAction (i18n("Zoom &to 250%"), 0, 0, this, SLOT (zoom52()), m_ac, "view_zoom_5_2");
   // xgettext:no-c-format
   toggle -> setStatusText (i18n("Scales video to 250% of the original size"));
   // xgettext:no-c-format
   toggle -> setWhatsThis (i18n("Zoom to 250% command resizes the video area to 250% of the original video size of the current file."));
   toggle -> setExclusiveGroup ("zoom");
-  toggle = new KToggleAction (i18n("Zoom to &300%"), 0, 0, this, SLOT (zoom31()), m_ac, "view_zoom_3_1");
+  toggle = new TDEToggleAction (i18n("Zoom to &300%"), 0, 0, this, SLOT (zoom31()), m_ac, "view_zoom_3_1");
   // xgettext:no-c-format
   toggle -> setStatusText (i18n("Scales video to 300% of the original size"));
   // xgettext:no-c-format
   toggle -> setWhatsThis (i18n("Zoom to 300% command resizes the video area to thrice the original video size of the current file."));
   toggle -> setExclusiveGroup ("zoom");
 
-  toggle = new KToggleAction (i18n("Maintain Original &Aspect"), 0, 0, this, SLOT (maintainOriginalAspect()), m_ac, "view_original_aspect");
+  toggle = new TDEToggleAction (i18n("Maintain Original &Aspect"), 0, 0, this, SLOT (maintainOriginalAspect()), m_ac, "view_original_aspect");
   toggle -> setStatusText (i18n("Maintains the original video aspect ratio"));
   toggle -> setWhatsThis (i18n("Maintain Original Aspect command toggles the option to maintain the original video aspect ratio of the current file."));
   if ( settings() -> maintainAspect() )
     toggle -> setChecked (true);
   toggle -> setExclusiveGroup ("aspect");
-  toggle = new KToggleAction (i18n("Maintain &Current Aspect"), 0, 0, this, SLOT (maintainCurrentAspect()), m_ac, "view_current_aspect");
+  toggle = new TDEToggleAction (i18n("Maintain &Current Aspect"), 0, 0, this, SLOT (maintainCurrentAspect()), m_ac, "view_current_aspect");
   toggle -> setStatusText (i18n("Maintains the current video aspect ratio"));
   toggle -> setWhatsThis (i18n("Maintain Current Aspect command toggles the option to maintain the current video aspect ratio."));
   toggle -> setExclusiveGroup ("aspect");
-  toggle = new KToggleAction (i18n("Force &4 to 3 Aspect"), 0, 0, this, SLOT (aspect43()), m_ac, "view_aspect_4_3");
+  toggle = new TDEToggleAction (i18n("Force &4 to 3 Aspect"), 0, 0, this, SLOT (aspect43()), m_ac, "view_aspect_4_3");
   toggle -> setStatusText (i18n("Sets 4 to 3 video aspect ratio"));
   toggle -> setWhatsThis (i18n("Force 4 to 3 Aspect command toggles the option to maintain four to three video aspect ratio."));
   toggle -> setExclusiveGroup ("aspect");
-  toggle = new KToggleAction (i18n("Force 1&6 to 9 Aspect"), 0, 0, this, SLOT (aspect169()), m_ac, "view_aspect_16_9");
+  toggle = new TDEToggleAction (i18n("Force 1&6 to 9 Aspect"), 0, 0, this, SLOT (aspect169()), m_ac, "view_aspect_16_9");
   toggle -> setStatusText (i18n("Sets 16 to 9 video aspect ratio"));
   toggle -> setWhatsThis (i18n("Force 16 to 9 Aspect command toggles the option to maintain sixteen to nine video aspect ratio."));
   toggle -> setExclusiveGroup ("aspect");
 
-  action = new KAction (i18n("I&ncrease Delay"), 0, CTRL + Key_BracketLeft, this, SLOT (audioDelayIncrease()), m_ac, "audio_delay_up");
+  action = new TDEAction (i18n("I&ncrease Delay"), 0, CTRL + Key_BracketLeft, this, SLOT (audioDelayIncrease()), m_ac, "audio_delay_up");
   action -> setStatusText (i18n("Increases audio delay"));
   action -> setWhatsThis (i18n("Increase Delay command increases the delay of sound relative to video."));
-  action = new KAction (i18n("D&ecrease Delay"), 0, CTRL + Key_BracketRight, this, SLOT (audioDelayDecrease()), m_ac, "audio_delay_down");
+  action = new TDEAction (i18n("D&ecrease Delay"), 0, CTRL + Key_BracketRight, this, SLOT (audioDelayDecrease()), m_ac, "audio_delay_down");
   action -> setStatusText (i18n("Decreases audio delay"));
   action -> setWhatsThis (i18n("Decrease Delay command decreases the delay of sound relative to video."));
 
-  action = new KAction (i18n("Decrease C&ontrast"), 0, CTRL + Key_1, this, SLOT (contrastDecrease()), m_ac, "video_contrast_down");
+  action = new TDEAction (i18n("Decrease C&ontrast"), 0, CTRL + Key_1, this, SLOT (contrastDecrease()), m_ac, "video_contrast_down");
   action -> setStatusText (i18n("Decreases video contrast"));
   action -> setWhatsThis (i18n("Decrease Contrast command decreases the video contrast."));
-  action = new KAction (i18n("Increase &Contrast"), 0, CTRL + Key_2, this, SLOT (contrastIncrease()), m_ac, "video_contrast_up");
+  action = new TDEAction (i18n("Increase &Contrast"), 0, CTRL + Key_2, this, SLOT (contrastIncrease()), m_ac, "video_contrast_up");
   action -> setStatusText (i18n("Increases video contrast"));
   action -> setWhatsThis (i18n("Increase Contrast command increases the video contrast."));
-  action = new KAction (i18n("Decrease B&rightness"), 0, CTRL + Key_3, this, SLOT (brightnessDecrease()), m_ac, "video_brightness_down");
+  action = new TDEAction (i18n("Decrease B&rightness"), 0, CTRL + Key_3, this, SLOT (brightnessDecrease()), m_ac, "video_brightness_down");
   action -> setStatusText (i18n("Decreases video brightness"));
   action -> setWhatsThis (i18n("Decrease Brightness command decreases the video brightness."));
-  action = new KAction (i18n("Increase &Brightness"), 0, CTRL + Key_4, this, SLOT (brightnessIncrease()), m_ac, "video_brightness_up");
+  action = new TDEAction (i18n("Increase &Brightness"), 0, CTRL + Key_4, this, SLOT (brightnessIncrease()), m_ac, "video_brightness_up");
   action -> setStatusText (i18n("Increases video brightness"));
   action -> setWhatsThis (i18n("Increase Brightness command increases the video brightness."));
-  action = new KAction (i18n("Decrease H&ue"), 0, CTRL + Key_5, this, SLOT (hueDecrease()), m_ac, "video_hue_down");
+  action = new TDEAction (i18n("Decrease H&ue"), 0, CTRL + Key_5, this, SLOT (hueDecrease()), m_ac, "video_hue_down");
   action -> setStatusText (i18n("Decreases video hue"));
   action -> setWhatsThis (i18n("Decrease Hue command decreases the video hue."));
-  action = new KAction (i18n("Increase &Hue"), 0, CTRL + Key_6, this, SLOT (hueIncrease()), m_ac, "video_hue_up");
+  action = new TDEAction (i18n("Increase &Hue"), 0, CTRL + Key_6, this, SLOT (hueIncrease()), m_ac, "video_hue_up");
   action -> setStatusText (i18n("Increases video hue"));
   action -> setWhatsThis (i18n("Increase Hue command increases the video hue."));
-  action = new KAction (i18n("Decrease S&aturation"), 0, CTRL + Key_7, this, SLOT (saturationDecrease()), m_ac, "video_saturation_down");
+  action = new TDEAction (i18n("Decrease S&aturation"), 0, CTRL + Key_7, this, SLOT (saturationDecrease()), m_ac, "video_saturation_down");
   action -> setStatusText (i18n("Decreases video saturation"));
   action -> setWhatsThis (i18n("Decrease Saturation command decreases the video saturation."));
-  action = new KAction (i18n("Increase &Saturation"), 0, CTRL + Key_8, this, SLOT (saturationIncrease()), m_ac, "video_saturation_up");
+  action = new TDEAction (i18n("Increase &Saturation"), 0, CTRL + Key_8, this, SLOT (saturationIncrease()), m_ac, "video_saturation_up");
   action -> setStatusText (i18n("Increases video saturation"));
   action -> setWhatsThis (i18n("Increase Saturation command increases the video saturation."));
 
@@ -678,25 +678,25 @@ void KPlayerEngine::setupActions (void)
   psa -> setStatusText (i18n("Shows the saturation popup slider"));
   psa -> setWhatsThis (i18n("Saturation button displays a slider that shows the current video saturation level and allows you to change it."));
 
-  toggle = new KToggleAction (i18n("S&oft Frame Dropping"), 0, 0, this, SLOT (softFrameDrop()), m_ac, "player_soft_frame_drop");
+  toggle = new TDEToggleAction (i18n("S&oft Frame Dropping"), 0, 0, this, SLOT (softFrameDrop()), m_ac, "player_soft_frame_drop");
   toggle -> setStatusText (i18n("Turns soft frame dropping on/off"));
   toggle -> setWhatsThis (i18n("Soft Frame Dropping command toggles the soft frame dropping option. If your system is too slow to play a file, MPlayer can drop some frames so playback does not slow down. The soft option drops frames less aggressively than the hard one, and should not cause playback problems. The Frame drop option can also be set on the Advanced page either globally in KPlayer Settings or for a particular file in the File Properties."));
   toggle -> setExclusiveGroup ("framedrop");
-  toggle = new KToggleAction (i18n("&Hard Frame Dropping"), 0, 0, this, SLOT (hardFrameDrop()), m_ac, "player_hard_frame_drop");
+  toggle = new TDEToggleAction (i18n("&Hard Frame Dropping"), 0, 0, this, SLOT (hardFrameDrop()), m_ac, "player_hard_frame_drop");
   toggle -> setStatusText (i18n("Turns hard frame dropping on/off"));
   toggle -> setWhatsThis (i18n("Hard Frame Dropping command toggles the hard frame dropping option. If your system is too slow to play a file, MPlayer can drop some frames so playback does not slow down. The hard option drops frames more aggressively than the soft one, and may sometimes break decoding. The Frame drop option can also be set on the Advanced page either globally in KPlayer Settings or for a particular file in the File Properties."));
   toggle -> setExclusiveGroup ("framedrop");
 
-  action = new KAction (i18n("Move &Down"), 0, CTRL + Key_Comma, this, SLOT (subtitlesMoveDown()), m_ac, "subtitles_move_down");
+  action = new TDEAction (i18n("Move &Down"), 0, CTRL + Key_Comma, this, SLOT (subtitlesMoveDown()), m_ac, "subtitles_move_down");
   action -> setStatusText (i18n("Moves subtitles down"));
   action -> setWhatsThis (i18n("Move Down command moves the subtitles down."));
-  action = new KAction (i18n("Move &Up"), 0, CTRL + Key_Period, this, SLOT (subtitlesMoveUp()), m_ac, "subtitles_move_up");
+  action = new TDEAction (i18n("Move &Up"), 0, CTRL + Key_Period, this, SLOT (subtitlesMoveUp()), m_ac, "subtitles_move_up");
   action -> setStatusText (i18n("Moves subtitles up"));
   action -> setWhatsThis (i18n("Move Up command moves the subtitles up."));
-  action = new KAction (i18n("D&ecrease Delay"), 0, CTRL + Key_Apostrophe, this, SLOT (subtitlesDelayDecrease()), m_ac, "subtitles_delay_decrease");
+  action = new TDEAction (i18n("D&ecrease Delay"), 0, CTRL + Key_Apostrophe, this, SLOT (subtitlesDelayDecrease()), m_ac, "subtitles_delay_decrease");
   action -> setStatusText (i18n("Decreases subtitle delay"));
   action -> setWhatsThis (i18n("Decrease Delay command decreases the delay of subtitles relative to video."));
-  action = new KAction (i18n("I&ncrease Delay"), 0, CTRL + Key_Semicolon, this, SLOT (subtitlesDelayIncrease()), m_ac, "subtitles_delay_increase");
+  action = new TDEAction (i18n("I&ncrease Delay"), 0, CTRL + Key_Semicolon, this, SLOT (subtitlesDelayIncrease()), m_ac, "subtitles_delay_increase");
   action -> setStatusText (i18n("Increases subtitle delay"));
   action -> setWhatsThis (i18n("Increase Delay command increases the delay of subtitles relative to video."));
 
@@ -1550,7 +1550,7 @@ void KPlayerEngine::pause (void)
     process() -> pause();
   else
   {
-    KToggleAction* action = toggleAction ("player_pause");
+    TDEToggleAction* action = toggleAction ("player_pause");
     if ( action -> isChecked() )
       action -> setChecked (false);
   }
@@ -1865,7 +1865,7 @@ void KPlayerEngine::saturationDecrease (void)
 KURL::List KPlayerEngine::openFiles (const TQString& title, TQWidget* parent)
 {
   static TQString filter = i18n("*|All files\n*.avi *.AVI|AVI files\n*.mpg *.mpeg *.MPG *.MPEG|MPEG files\n*.ogg *.OGG|OGG files\n*.mp3 *.MP3|MP3 files");
-  KConfig* config = kPlayerConfig();
+  TDEConfig* config = kPlayerConfig();
   config -> setGroup ("Dialog Options");
   TQString dir = config -> readPathEntry ("Open File Directory");
 //Saving dialog position did not work: dlg.pos() returns wrong position in TQt 3.1.1
@@ -1902,7 +1902,7 @@ KURL::List KPlayerEngine::openFiles (const TQString& title, TQWidget* parent)
 KURL::List KPlayerEngine::openUrl (const TQString& title, TQWidget* parent)
 {
   KURL::List list;
-  KConfig* config = kPlayerConfig();
+  TDEConfig* config = kPlayerConfig();
   config -> setGroup ("Dialog Options");
   TQString dir = config -> readEntry ("Open URL");
 //int x = config -> readNumEntry ("Open URL Left");
@@ -1919,7 +1919,7 @@ KURL::List KPlayerEngine::openUrl (const TQString& title, TQWidget* parent)
   if ( ! url.isEmpty() && url.isValid() )
   {
     list.append (url);
-    KRecentDocument::add (url);
+    TDERecentDocument::add (url);
   }
   if ( dlg.result() == TQDialog::Accepted )
     config -> writeEntry ("Open URL", url.isLocalFile() ? url.path() : url.url());
@@ -1933,7 +1933,7 @@ KURL::List KPlayerEngine::openUrl (const TQString& title, TQWidget* parent)
 KURL::List KPlayerEngine::openSubtitles (TQWidget* parent)
 {
   static TQString filter = i18n("*|All files\n*.aqt *.AQT *.ass *.ASS *.js *.JS *.jss *.JSS *.rt *.RT *.smi *.SMI *.srt *.SRT *.ssa *.SSA *.sub *.SUB *.txt *.TXT *.utf *.UTF *.idx *.IDX *.ifo *.IFO|All subtitle files\n*.aqt *.AQT|AQT files\n*.ass *.ASS|ASS files\n*.js *.JS|JS files\n*.jss *.JSS|JSS files\n*.rt *.RT|RT files\n*.smi *.SMI|SMI files\n*.srt *.SRT|SRT files\n*.ssa *.SSA|SSA files\n*.sub *.SUB|SUB files\n*.txt *.TXT|TXT files\n*.utf *.UTF *.utf8 *.UTF8 *.utf-8 *.UTF-8|UTF files\n*.idx *.IDX *.ifo *.IFO|VobSub files");
-  KConfig* config = kPlayerConfig();
+  TDEConfig* config = kPlayerConfig();
   config -> setGroup ("Dialog Options");
   TQString dir = config -> readEntry ("Open Subtitle Directory");
 //int x = config -> readNumEntry ("Open Subtitle Left");
@@ -1958,7 +1958,7 @@ KURL::List KPlayerEngine::openSubtitles (TQWidget* parent)
 
 /*KURL KPlayerEngine::openSubtitleUrl (TQWidget* parent)
 {
-  KConfig* config = kPlayerConfig();
+  TDEConfig* config = kPlayerConfig();
   config -> setGroup ("Dialog Options");
   TQString dir = config -> readEntry ("Open Subtitle URL");
 //int x = config -> readNumEntry ("Open Subtitle URL Left");
@@ -1973,7 +1973,7 @@ KURL::List KPlayerEngine::openSubtitles (TQWidget* parent)
   dlg.exec();
   KURL url (dlg.selectedURL());
   if ( ! url.isEmpty() && url.isValid() )
-    KRecentDocument::add (url);
+    TDERecentDocument::add (url);
   if ( dlg.result() == TQDialog::Accepted )
     config -> writeEntry ("Open Subtitle URL", url.isLocalFile() ? url.path() : url.url());
 //config -> writeEntry ("Open Subtitle URL Left", dlg.x());
@@ -1999,8 +1999,8 @@ void KPlayerEngine::getLists (TQString path)
     << "-vc" << "help" << "-vo" << "help" << "-demuxer" << "help";
   connect (player, SIGNAL (receivedStdoutLine (KPlayerLineOutputProcess*, char*, int)),
     SLOT (receivedOutput (KPlayerLineOutputProcess*, char*, int)));
-  connect (player, SIGNAL (processExited (KProcess*)), SLOT (processExited (KProcess*)));
-  player -> start (KProcess::NotifyOnExit, KProcess::All);
+  connect (player, SIGNAL (processExited (TDEProcess*)), SLOT (processExited (TDEProcess*)));
+  player -> start (TDEProcess::NotifyOnExit, TDEProcess::All);
 }
 
 void KPlayerEngine::receivedOutput (KPlayerLineOutputProcess*, char* str, int)
@@ -2124,7 +2124,7 @@ void KPlayerEngine::receivedOutput (KPlayerLineOutputProcess*, char* str, int)
   }
 }
 
-void KPlayerEngine::processExited (KProcess* proc)
+void KPlayerEngine::processExited (TDEProcess* proc)
 {
   delete proc;
   m_audio_codecs.sort();
@@ -2271,8 +2271,8 @@ void KPlayerEngine::runAmixer (const TQString& command, const TQString& paramete
   }
   connect (amixer, SIGNAL (receivedStdoutLine (KPlayerLineOutputProcess*, char*, int)),
     SLOT (amixerOutput (KPlayerLineOutputProcess*, char*, int)));
-  connect (amixer, SIGNAL (processExited (KProcess*)), SLOT (amixerExited (KProcess*)));
-  m_amixer_running = amixer -> start (KProcess::NotifyOnExit, KProcess::All);
+  connect (amixer, SIGNAL (processExited (TDEProcess*)), SLOT (amixerExited (TDEProcess*)));
+  m_amixer_running = amixer -> start (TDEProcess::NotifyOnExit, TDEProcess::All);
 }
 
 void KPlayerEngine::amixerOutput (KPlayerLineOutputProcess*, char* str, int)
@@ -2301,7 +2301,7 @@ void KPlayerEngine::amixerOutput (KPlayerLineOutputProcess*, char* str, int)
   }
 }
 
-void KPlayerEngine::amixerExited (KProcess* proc)
+void KPlayerEngine::amixerExited (TDEProcess* proc)
 {
 #ifdef DEBUG_KPLAYER_ENGINE
   kdDebugTime() << "KPlayerEngine::amixerExited\n";
diff --git a/kplayer/kplayerengine.h b/kplayer/kplayerengine.h
index 875145d..eec3655 100644
--- a/kplayer/kplayerengine.h
+++ b/kplayer/kplayerengine.h
@@ -16,9 +16,9 @@
 #ifndef KPLAYERENGINE_H
 #define KPLAYERENGINE_H
 
-#include <kaction.h>
-#include <kdiroperator.h>
-#include <kfiledialog.h>
+#include <tdeaction.h>
+#include <tdediroperator.h>
+#include <tdefiledialog.h>
 
 #include "kplayerprocess.h"
 
@@ -58,7 +58,7 @@ class KPlayerEngine : public TQObject
   Q_OBJECT
 
 public:
-  KPlayerEngine (KActionCollection* ac, TQWidget* parent, const char* name, KConfig*);
+  KPlayerEngine (TDEActionCollection* ac, TQWidget* parent, const char* name, TDEConfig*);
   virtual ~KPlayerEngine();
 
   /** Returns whether the engine is running in the KPart mode. */
@@ -111,11 +111,11 @@ public:
   //KURL openSubtitleUrl (TQWidget* = 0);
 
   /** Retrieves an action from the actionCollection by name. */
-  KAction* action (const char* name) const
+  TDEAction* action (const char* name) const
     { return m_ac -> action (name); }
   /** Retrieves a toggle action from the actionCollection by name. */
-  KToggleAction* toggleAction (const char* name) const
-    { return (KToggleAction*) action (name); }
+  TDEToggleAction* toggleAction (const char* name) const
+    { return (TDEToggleAction*) action (name); }
   /** Retrieves a slider action from the actionCollection by name. */
   KPlayerSliderAction* sliderAction (const char* name) const
     { return (KPlayerSliderAction*) action (name); }
@@ -148,7 +148,7 @@ public:
   void clearStoreSections (const TQString& section);
 
   /** Initializes the engine. */
-  static void initialize (KActionCollection* ac, TQWidget* parent, const char* name = 0, KConfig* = 0);
+  static void initialize (TDEActionCollection* ac, TQWidget* parent, const char* name = 0, TDEConfig* = 0);
   /** Terminates the engine. */
   static void terminate (void);
 
@@ -180,16 +180,16 @@ public:
     { return m_configuration; }
 
   /** Returns the config object. */
-  KConfig* config (void)
+  TDEConfig* config (void)
     { return m_config; }
   /** Returns the store object. */
-  KConfig* store (void)
+  TDEConfig* store (void)
     { return m_store; }
   /** Returns the meta information object. */
-  KConfig* meta (void)
+  TDEConfig* meta (void)
     { return m_meta; }
   /** Returns the meta information storage set to the given group. */
-  KConfig* meta (const TQString& group)
+  TDEConfig* meta (const TQString& group)
   {
     meta() -> setGroup (group);
     return meta();
@@ -198,9 +198,9 @@ public:
   TQString meta (const TQString& group, const TQString& key, const TQString& value = TQString::null)
     { return meta (group) -> readEntry (key, value); }
 
-  KActionCollection* actionCollection (void) const
+  TDEActionCollection* actionCollection (void) const
    { return m_ac; }
-  void setActionCollection (KActionCollection* collection)
+  void setActionCollection (TDEActionCollection* collection)
    { m_ac = collection; }
 
   void setDisplaySize (bool zoom = false, bool resize = false);
@@ -446,11 +446,11 @@ protected:
   /** The static engine object. */
   static KPlayerEngine* m_engine;
   /** Main config. */
-  KConfig* m_config;
+  TDEConfig* m_config;
   /** Store config. */
-  KConfig* m_store;
+  TDEConfig* m_store;
   /** Meta config. */
-  KConfig* m_meta;
+  TDEConfig* m_meta;
   /** Configuration properties. */
   KPlayerConfiguration* m_configuration;
   /** The settings object. */
@@ -462,7 +462,7 @@ protected:
   /** The workspace object. */
   KPlayerWorkspace* m_workspace;
   /** The action collection object. */
-  KActionCollection* m_ac;
+  TDEActionCollection* m_ac;
 
   // Following should be private
   /** Indicates what actions should be used. */
@@ -498,12 +498,12 @@ protected slots:
   /** Processes an MPlayer output line. */
   void receivedOutput (KPlayerLineOutputProcess*, char*, int);
   /** Finishes refreshing lists. */
-  void processExited (KProcess*);
+  void processExited (TDEProcess*);
 
   /** Processes an amixer output line. */
   void amixerOutput (KPlayerLineOutputProcess*, char*, int);
   /** Finishes refreshing ALSA volume. */
-  void amixerExited (KProcess*);
+  void amixerExited (TDEProcess*);
 };
 
 inline KPlayerEngine* kPlayerEngine (void)
@@ -516,7 +516,7 @@ inline KPlayerProcess* kPlayerProcess (void)
   return kPlayerEngine() -> process();
 }
 
-inline KConfig* kPlayerConfig (void)
+inline TDEConfig* kPlayerConfig (void)
 {
   return kPlayerEngine() -> config();
 }
diff --git a/kplayer/kplayerlogwindow.cpp b/kplayer/kplayerlogwindow.cpp
index 0a48ab4..04f006a 100644
--- a/kplayer/kplayerlogwindow.cpp
+++ b/kplayer/kplayerlogwindow.cpp
@@ -13,7 +13,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <tqpopupmenu.h>
 
@@ -26,7 +26,7 @@
 #include "kplayerengine.h"
 #include "kplayersettings.h"
 
-KPlayerLogWindow::KPlayerLogWindow (KActionCollection* ac, TQWidget* parent, const char* name)
+KPlayerLogWindow::KPlayerLogWindow (TDEActionCollection* ac, TQWidget* parent, const char* name)
   : TQDockWindow (parent, name)
 {
   setWidget (new KPlayerLogWidget (ac, this));
@@ -70,20 +70,20 @@ void KPlayerLogWindow::hideEvent (TQHideEvent* event)
     emit windowHidden();
 }
 
-KPlayerLogWidget::KPlayerLogWidget (KActionCollection* ac, TQWidget* parent, const char* name)
+KPlayerLogWidget::KPlayerLogWidget (TDEActionCollection* ac, TQWidget* parent, const char* name)
   : KTextEdit (parent, name)
 {
   m_ac = ac;
   setTextFormat (TQt::PlainText);
   setReadOnly (true);
   setError (false);
-  KAction* action = new KAction (i18n("&Select All"), 0, 0, this, SLOT (selectAll()), m_ac, "log_select_all");
+  TDEAction* action = new TDEAction (i18n("&Select All"), 0, 0, this, SLOT (selectAll()), m_ac, "log_select_all");
   action -> setStatusText (i18n("Selects all messages in the message log"));
   action -> setWhatsThis (i18n("Select All command selects all messages in the message log."));
-  action = new KAction (i18n("&Copy"), 0, 0, this, SLOT (copy()), m_ac, "log_copy");
+  action = new TDEAction (i18n("&Copy"), 0, 0, this, SLOT (copy()), m_ac, "log_copy");
   action -> setStatusText (i18n("Copies the text selected in the message log to the clipboard"));
   action -> setWhatsThis (i18n("Copy command copies the text selected in the message log to the clipboard."));
-  action = new KAction (i18n("C&lear"), 0, 0, this, SLOT (clear()), m_ac, "log_clear");
+  action = new TDEAction (i18n("C&lear"), 0, 0, this, SLOT (clear()), m_ac, "log_clear");
   action -> setStatusText (i18n("Clears all messages from the message log"));
   action -> setWhatsThis (i18n("Clear command removes all messages from the message log."));
   connect (this, SIGNAL (selectionChanged()), SLOT (updateActions()));
diff --git a/kplayer/kplayerlogwindow.h b/kplayer/kplayerlogwindow.h
index 6d353d6..de40463 100644
--- a/kplayer/kplayerlogwindow.h
+++ b/kplayer/kplayerlogwindow.h
@@ -16,7 +16,7 @@
 #ifndef KPLAYERLOGWINDOW_H
 #define KPLAYERLOGWINDOW_H
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <ktextedit.h>
 #include <tqdockwindow.h>
 
@@ -28,7 +28,7 @@ class KPlayerLogWidget : public KTextEdit
    Q_OBJECT
 
 public: 
-  KPlayerLogWidget (KActionCollection* ac, TQWidget* parent = 0, const char* name = 0);
+  KPlayerLogWidget (TDEActionCollection* ac, TQWidget* parent = 0, const char* name = 0);
 
   /** Returns whether there is an error in the log. */
   bool hasError (void)
@@ -44,7 +44,7 @@ public:
     { m_popup = menu; }
 
   /** Retrieves an action from the action collection by name. */
-  KAction* action (const char* name) const
+  TDEAction* action (const char* name) const
     { return m_ac -> action (name); }
 
 public slots:
@@ -61,7 +61,7 @@ protected:
   virtual void contextMenuEvent (TQContextMenuEvent*);
 
   /** Action collection. */
-  KActionCollection* m_ac;
+  TDEActionCollection* m_ac;
   /** Popup menu. */
   TQPopupMenu* m_popup;
   /** Error condition flag. */
@@ -78,7 +78,7 @@ class KPlayerLogWindow : public TQDockWindow
    Q_OBJECT
 
 public: 
-  KPlayerLogWindow (KActionCollection* ac, TQWidget* parent = 0, const char* name = 0);
+  KPlayerLogWindow (TDEActionCollection* ac, TQWidget* parent = 0, const char* name = 0);
 
   void initialize (TQPopupMenu* menu);
 
diff --git a/kplayer/kplayernode.cpp b/kplayer/kplayernode.cpp
index 157381b..311c989 100644
--- a/kplayer/kplayernode.cpp
+++ b/kplayer/kplayernode.cpp
@@ -14,9 +14,9 @@
  ***************************************************************************/
 
 #include <klargefile.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmdcodec.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <tqregexp.h>
 
 #ifdef DEBUG
@@ -35,16 +35,16 @@ bool KPlayerNode::m_sort_by_name = true;
 bool KPlayerNode::m_sort_ascending = true;
 
 #ifndef UDS_LOCAL_PATH
-#define UDS_LOCAL_PATH (72 | KIO::UDS_STRING)
+#define UDS_LOCAL_PATH (72 | TDEIO::UDS_STRING)
 #endif
 
 static TQString itemLocalPath (const KFileItem& item)
 {
-  KIO::UDSEntry::ConstIterator iterator = item.entry().begin();
-  const KIO::UDSEntry::ConstIterator end = item.entry().end();
+  TDEIO::UDSEntry::ConstIterator iterator = item.entry().begin();
+  const TDEIO::UDSEntry::ConstIterator end = item.entry().end();
   while ( iterator != end )
   {
-    const KIO::UDSAtom& atom = *iterator;
+    const TDEIO::UDSAtom& atom = *iterator;
     if ( atom.m_uds == UDS_LOCAL_PATH )
       return atom.m_str;
     ++ iterator;
@@ -1951,7 +1951,7 @@ void KPlayerPlaylistNode::setupSource (void)
   if ( ! parent() -> parent() && id() == "playlists" && ! media() -> hasChildren() )
   {
     TQString group ("Playlist Entries");
-    KConfig* meta = KPlayerEngine::engine() -> meta();
+    TDEConfig* meta = KPlayerEngine::engine() -> meta();
     meta -> setGroup (group);
     int entries = meta -> readNumEntry ("Entries");
     if ( entries )
@@ -1964,7 +1964,7 @@ void KPlayerPlaylistNode::setupSource (void)
         children.append (name);
         media() -> setChildren (children);
         media() -> commit();
-        KConfig* config = media() -> config();
+        TDEConfig* config = media() -> config();
         TQString urls (url (name).url());
         config -> setGroup (urls);
         for ( int i = 0; i < entries; i ++ )
@@ -2264,7 +2264,7 @@ void KPlayerRecentsNode::setupSource (void)
   if ( ! media() -> hasChildren() )
   {
     TQString group ("Recent Files");
-    KConfig* config = KPlayerEngine::engine() -> config();
+    TDEConfig* config = KPlayerEngine::engine() -> config();
     config -> setGroup (group);
     int limit = configuration() -> recentListSize();
     TQStringList children;
@@ -2656,9 +2656,9 @@ void KPlayerDevicesNode::refreshItem (KFileItem* item)
   kdDebugTime() << " User   " << item -> user() << "\n";
   kdDebugTime() << " Group  " << item -> group() << "\n";
   kdDebugTime() << " Size   " << item -> size() << "\n";
-  kdDebugTime() << " Modification Time " << item -> time (KIO::UDS_MODIFICATION_TIME) << "\n";
-  kdDebugTime() << " Access Time " << item -> time (KIO::UDS_ACCESS_TIME) << "\n";
-  kdDebugTime() << " Creation Time " << item -> time (KIO::UDS_CREATION_TIME) << "\n";
+  kdDebugTime() << " Modification Time " << item -> time (TDEIO::UDS_MODIFICATION_TIME) << "\n";
+  kdDebugTime() << " Access Time " << item -> time (TDEIO::UDS_ACCESS_TIME) << "\n";
+  kdDebugTime() << " Creation Time " << item -> time (TDEIO::UDS_CREATION_TIME) << "\n";
   kdDebugTime() << " Overlays " << item -> overlays() << "\n";
   kdDebugTime() << " Status " << item -> getStatusBarInfo() << "\n";
   kdDebugTime() << " Drops  " << item -> acceptsDrops() << "\n";
@@ -3012,11 +3012,11 @@ void KPlayerDiskNode::getLocalPath (void)
   if ( hasLocalPath() || ! dataDisk() || ! ready() )
     return;
   m_url = "list://";
-  KIO::ListJob* job = KIO::listDir ("media:/" + url().fileName(), false, false);
-  connect (job, SIGNAL(result(KIO::Job*)), SLOT(listResult(KIO::Job*)));
+  TDEIO::ListJob* job = TDEIO::listDir ("media:/" + url().fileName(), false, false);
+  connect (job, SIGNAL(result(TDEIO::Job*)), SLOT(listResult(TDEIO::Job*)));
 }
 
-void KPlayerDiskNode::listResult (KIO::Job* job)
+void KPlayerDiskNode::listResult (TDEIO::Job* job)
 {
 #ifdef DEBUG_KPLAYER_NODE
   kdDebugTime() << "KPlayerDiskNode::listResult\n";
@@ -3027,18 +3027,18 @@ void KPlayerDiskNode::listResult (KIO::Job* job)
     kdDebugTime() << " Error  " << job -> error() << " " << job -> errorString() << "\n";
 #endif
     m_url = "mount://";
-    KIO::SimpleJob* job = KIO::mount (true, 0, id(), TQString::null, false);
-    connect (job, SIGNAL(result(KIO::Job*)), SLOT(mountResult(KIO::Job*)));
+    TDEIO::SimpleJob* job = TDEIO::mount (true, 0, id(), TQString::null, false);
+    connect (job, SIGNAL(result(TDEIO::Job*)), SLOT(mountResult(TDEIO::Job*)));
   }
   else
   {
     m_url = "path://";
-    KIO::StatJob* job = KIO::stat ("media:/" + url().fileName(), false);
-    connect (job, SIGNAL(result(KIO::Job*)), SLOT(pathResult(KIO::Job*)));
+    TDEIO::StatJob* job = TDEIO::stat ("media:/" + url().fileName(), false);
+    connect (job, SIGNAL(result(TDEIO::Job*)), SLOT(pathResult(TDEIO::Job*)));
   }
 }
 
-void KPlayerDiskNode::mountResult (KIO::Job* job)
+void KPlayerDiskNode::mountResult (TDEIO::Job* job)
 {
 #ifdef DEBUG_KPLAYER_NODE
   kdDebugTime() << "KPlayerDiskNode::mountResult\n";
@@ -3046,11 +3046,11 @@ void KPlayerDiskNode::mountResult (KIO::Job* job)
     kdDebugTime() << " Error  " << job -> error() << " " << job -> errorString() << "\n";
 #endif
   m_url = "path://";
-  job = KIO::stat ("media:/" + url().fileName(), false);
-  connect (job, SIGNAL(result(KIO::Job*)), SLOT(pathResult(KIO::Job*)));
+  job = TDEIO::stat ("media:/" + url().fileName(), false);
+  connect (job, SIGNAL(result(TDEIO::Job*)), SLOT(pathResult(TDEIO::Job*)));
 }
 
-void KPlayerDiskNode::pathResult (KIO::Job* job)
+void KPlayerDiskNode::pathResult (TDEIO::Job* job)
 {
 #ifdef DEBUG_KPLAYER_NODE
   kdDebugTime() << "KPlayerDiskNode::pathResult\n";
@@ -3066,7 +3066,7 @@ void KPlayerDiskNode::pathResult (KIO::Job* job)
   }
   else
   {
-    KFileItem item (((KIO::StatJob*) job) -> statResult(), "media:/" + url().fileName());
+    KFileItem item (((TDEIO::StatJob*) job) -> statResult(), "media:/" + url().fileName());
     if ( ! itemLocalPath (item).isEmpty() )
       parent() -> refreshItem (&item);
   }
@@ -3125,8 +3125,8 @@ void KPlayerDiskNode::autodetect (void)
     || m_fast_autodetect && disk() -> type().startsWith ("Data ") && m_url != "data://" )
   {
     m_url = "data://";
-    KIO::StatJob* job = KIO::stat ("media:/" + url().fileName(), false);
-    connect (job, SIGNAL(result(KIO::Job*)), SLOT(statResult(KIO::Job*)));
+    TDEIO::StatJob* job = TDEIO::stat ("media:/" + url().fileName(), false);
+    connect (job, SIGNAL(result(TDEIO::Job*)), SLOT(statResult(TDEIO::Job*)));
     return;
   }
   else if ( ! m_fast_autodetect && m_url == "data://"
@@ -3149,8 +3149,8 @@ void KPlayerDiskNode::autodetect (void)
     *process << m_url;
   connect (process, SIGNAL (receivedStdoutLine (KPlayerLineOutputProcess*, char*, int)),
     SLOT (receivedOutput (KPlayerLineOutputProcess*, char*, int)));
-  connect (process, SIGNAL (processExited (KProcess*)), SLOT (processExited (KProcess*)));
-  process -> start (KProcess::NotifyOnExit, KProcess::All);
+  connect (process, SIGNAL (processExited (TDEProcess*)), SLOT (processExited (TDEProcess*)));
+  process -> start (TDEProcess::NotifyOnExit, TDEProcess::All);
 }
 
 void KPlayerDiskNode::receivedOutput (KPlayerLineOutputProcess*, char* str, int)
@@ -3181,7 +3181,7 @@ void KPlayerDiskNode::receivedOutput (KPlayerLineOutputProcess*, char* str, int)
   }
 }
 
-void KPlayerDiskNode::processExited (KProcess* process)
+void KPlayerDiskNode::processExited (TDEProcess* process)
 {
 #ifdef DEBUG_KPLAYER_NODE
   kdDebugTime() << "KPlayerDiskNode::processExited\n";
@@ -3204,8 +3204,8 @@ void KPlayerDiskNode::processExited (KProcess* process)
       << "-identify" << "-ao" << "null" << "-vo" << "null" << "-frames" << "0" << "cddb://";
     connect (process, SIGNAL (receivedStdoutLine (KPlayerLineOutputProcess*, char*, int)),
       SLOT (receivedCddbOutput (KPlayerLineOutputProcess*, char*, int)));
-    connect (process, SIGNAL (processExited (KProcess*)), SLOT (cddbProcessExited (KProcess*)));
-    process -> start (KProcess::NotifyOnExit, KProcess::All);
+    connect (process, SIGNAL (processExited (TDEProcess*)), SLOT (cddbProcessExited (TDEProcess*)));
+    process -> start (TDEProcess::NotifyOnExit, TDEProcess::All);
     return;
   }
   if ( m_autodetected || m_url == "cdda://" && ! m_fast_autodetect )
@@ -3286,7 +3286,7 @@ void KPlayerDiskNode::updateTracks (void)
   }
 }
 
-void KPlayerDiskNode::statResult (KIO::Job* job)
+void KPlayerDiskNode::statResult (TDEIO::Job* job)
 {
 #ifdef DEBUG_KPLAYER_NODE
   kdDebugTime() << "KPlayerDiskNode::statResult\n";
@@ -3299,7 +3299,7 @@ void KPlayerDiskNode::statResult (KIO::Job* job)
   }
   else
   {
-    KFileItem item (((KIO::StatJob*) job) -> statResult(), "media:/" + url().fileName());
+    KFileItem item (((TDEIO::StatJob*) job) -> statResult(), "media:/" + url().fileName());
     if ( ! itemLocalPath (item).isEmpty() )
       parent() -> refreshItem (&item);
   }
@@ -3375,7 +3375,7 @@ void KPlayerDiskNode::receivedCddbOutput (KPlayerLineOutputProcess*, char* str,
   }
 }
 
-void KPlayerDiskNode::cddbProcessExited (KProcess* process)
+void KPlayerDiskNode::cddbProcessExited (TDEProcess* process)
 {
 #ifdef DEBUG_KPLAYER_NODE
   kdDebugTime() << "KPlayerDiskNode::cddbProcessExited\n";
@@ -3525,8 +3525,8 @@ KPlayerNodeList KPlayerNodeList::fromUrlList (const KURL::List& urls)
         node = KPlayerNode::root() -> getNodeByUrl ("kplayer:/devices/dev" + (media ? url.path() : url.path().mid(6)));
       if ( ! node )
       {
-        KIO::UDSEntry entry;
-        if ( KIO::NetAccess::stat (url, entry, 0) )
+        TDEIO::UDSEntry entry;
+        if ( TDEIO::NetAccess::stat (url, entry, 0) )
         {
           KFileItem item (entry, url);
 #ifdef DEBUG_KPLAYER_NODE
@@ -3543,7 +3543,7 @@ KPlayerNodeList KPlayerNodeList::fromUrlList (const KURL::List& urls)
         }
 #ifdef DEBUG_KPLAYER_NODE
         else
-          kdDebugTime() << " Error  " << KIO::NetAccess::lastErrorString() << "\n";
+          kdDebugTime() << " Error  " << TDEIO::NetAccess::lastErrorString() << "\n";
 #endif
       }
     }
diff --git a/kplayer/kplayernode.h b/kplayer/kplayernode.h
index 2317272..89d8b1a 100644
--- a/kplayer/kplayernode.h
+++ b/kplayer/kplayernode.h
@@ -1229,23 +1229,23 @@ public:
 
 protected slots:
   /** Processes the result of a list job. */
-  void listResult (KIO::Job* job);
+  void listResult (TDEIO::Job* job);
   /** Processes the result of a mount job. */
-  void mountResult (KIO::Job* job);
+  void mountResult (TDEIO::Job* job);
   /** Processes the result of a stat job. */
-  void pathResult (KIO::Job* job);
+  void pathResult (TDEIO::Job* job);
   /** Processes the result of a stat job. */
-  void statResult (KIO::Job* job);
+  void statResult (TDEIO::Job* job);
 
   /** Processes an MPlayer output line. */
   void receivedOutput (KPlayerLineOutputProcess*, char*, int);
   /** Finishes refreshing lists. */
-  void processExited (KProcess*);
+  void processExited (TDEProcess*);
 
   /** Processes an MPlayer output line. */
   void receivedCddbOutput (KPlayerLineOutputProcess*, char*, int);
   /** Deletes the process. */
-  void cddbProcessExited (KProcess*);
+  void cddbProcessExited (TDEProcess*);
 
 protected:
   /** Initializes the node media. */
diff --git a/kplayer/kplayernodeaction.cpp b/kplayer/kplayernodeaction.cpp
index a69eac0..fce7941 100644
--- a/kplayer/kplayernodeaction.cpp
+++ b/kplayer/kplayernodeaction.cpp
@@ -13,7 +13,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #ifdef DEBUG
 #define DEBUG_KPLAYER_NODEACTION
@@ -115,8 +115,8 @@ void KPlayerNodeActionList::updated (KPlayerContainerNode*, KPlayerNode* node)
   kdDebugTime() << "KPlayerNodeActionList::updated\n";
   kdDebugTime() << " Node   " << node -> url().url() << "\n";
 #endif
-  TQPtrListIterator<KAction> actit (actions());
-  while ( KAction* action = actit.current() )
+  TQPtrListIterator<TDEAction> actit (actions());
+  while ( TDEAction* action = actit.current() )
   {
     if ( action -> parent() == node )
     {
@@ -135,7 +135,7 @@ void KPlayerNodeActionList::updated (KPlayerContainerNode*, KPlayerNode* node)
   }
 }
 
-KAction* KPlayerNodeActionList::createAction (KPlayerNode* node)
+TDEAction* KPlayerNodeActionList::createAction (KPlayerNode* node)
 {
 #ifdef DEBUG_KPLAYER_NODEACTION
   kdDebugTime() << "KPlayerNodeActionList::createAction\n";
@@ -145,7 +145,7 @@ KAction* KPlayerNodeActionList::createAction (KPlayerNode* node)
 #ifdef DEBUG_KPLAYER_NODEACTION
   kdDebugTime() << " Name   " << name << "\n";
 #endif
-  KAction* action = new KAction (m_text.arg (name), 0, this, SLOT (actionActivated()), node);
+  TDEAction* action = new TDEAction (m_text.arg (name), 0, this, SLOT (actionActivated()), node);
   updateAction (action);
   return action;
 }
@@ -161,7 +161,7 @@ void KPlayerNodeActionList::updateActions (void)
   kdDebugTime() << "KPlayerNodeActionList::updateActions\n";
   kdDebugTime() << " Name   " << name() << "\n";
 #endif
-  TQPtrList<KAction> actions (m_actions);
+  TQPtrList<TDEAction> actions (m_actions);
   unplug();
   int count = 0;
   KPlayerNodeListByName nodes ((const KPlayerNodeListByName&) node() -> nodes());
@@ -176,8 +176,8 @@ void KPlayerNodeActionList::updateActions (void)
 #ifdef DEBUG_KPLAYER_NODEACTION
       kdDebugTime() << " Node   " << node -> url().url() << "\n";
 #endif
-      TQPtrListIterator<KAction> actit (actions);
-      KAction* action;
+      TQPtrListIterator<TDEAction> actit (actions);
+      TDEAction* action;
       while ( (action = actit.current()) )
       {
         if ( action -> parent() == node )
@@ -268,7 +268,7 @@ KPlayerDevicesActionList::~KPlayerDevicesActionList()
 #endif
 }
 
-KAction* KPlayerDevicesActionList::createAction (KPlayerNode* node)
+TDEAction* KPlayerDevicesActionList::createAction (KPlayerNode* node)
 {
 #ifdef DEBUG_KPLAYER_NODEACTION
   kdDebugTime() << "KPlayerDevicesActionList::createAction\n";
@@ -290,7 +290,7 @@ KAction* KPlayerDevicesActionList::createAction (KPlayerNode* node)
 }
 
 KPlayerDeviceActionMenu::KPlayerDeviceActionMenu (KPlayerDeviceNode* device)
-  : KActionMenu (device -> name(), device)
+  : TDEActionMenu (device -> name(), device)
 {
 #ifdef DEBUG_KPLAYER_NODEACTION
   kdDebugTime() << "Creating device action menu\n";
@@ -346,10 +346,10 @@ void KPlayerDeviceActionMenu::updateActions (void)
 #ifdef DEBUG_KPLAYER_NODEACTION
   kdDebugTime() << "KPlayerDeviceActionMenu::updateActions\n";
 #endif
-  TQPtrList<KAction> actions (m_actions);
+  TQPtrList<TDEAction> actions (m_actions);
   m_actions.clear();
-  TQPtrListIterator<KAction> actlit (actions);
-  KAction* action;
+  TQPtrListIterator<TDEAction> actlit (actions);
+  TDEAction* action;
   while ( (action = actlit.current()) )
   {
     remove (action);
@@ -361,7 +361,7 @@ void KPlayerDeviceActionMenu::updateActions (void)
 #ifdef DEBUG_KPLAYER_NODEACTION
     kdDebugTime() << " Track  " << node -> url().url() << "\n";
 #endif
-    TQPtrListIterator<KAction> actit (actions);
+    TQPtrListIterator<TDEAction> actit (actions);
     while ( (action = actit.current()) )
     {
       if ( action -> parent() == node )
@@ -372,11 +372,11 @@ void KPlayerDeviceActionMenu::updateActions (void)
       ++ actit;
     }
     if ( ! action )
-      action = new KAction (i18n("Play %1").arg (node -> name()), 0, this, SLOT (play()), node);
+      action = new TDEAction (i18n("Play %1").arg (node -> name()), 0, this, SLOT (play()), node);
     m_actions.append (action);
     ++ iterator;
   }
-  TQPtrListIterator<KAction> actmit (m_actions);
+  TQPtrListIterator<TDEAction> actmit (m_actions);
   while ( (action = actmit.current()) )
   {
     insert (action);
@@ -412,8 +412,8 @@ void KPlayerDeviceActionMenu::updated (KPlayerContainerNode*, KPlayerNode* node)
   kdDebugTime() << "KPlayerDeviceActionMenu::updated\n";
   kdDebugTime() << " URL    " << node -> url().url() << "\n";
 #endif
-  TQPtrListIterator<KAction> actit (m_actions);
-  while ( KAction* action = actit.current() )
+  TQPtrListIterator<TDEAction> actit (m_actions);
+  while ( TDEAction* action = actit.current() )
   {
     if ( action -> parent() == node )
     {
@@ -435,8 +435,8 @@ KPlayerDiskActionMenu::KPlayerDiskActionMenu (KPlayerDeviceNode* device)
   kdDebugTime() << " URL    " << device -> url().url() << "\n";
 #endif
   m_play_disk = false;
-  m_load_action = new KAction (i18n("&Load Disk"), 0, this, SLOT (loadDisk()), device);
-  m_play_action = new KAction (i18n("&Play Disk"), 0, this, SLOT (playDisk()), device);
+  m_load_action = new TDEAction (i18n("&Load Disk"), 0, this, SLOT (loadDisk()), device);
+  m_play_action = new TDEAction (i18n("&Play Disk"), 0, this, SLOT (playDisk()), device);
 }
 
 KPlayerDiskActionMenu::~KPlayerDiskActionMenu()
diff --git a/kplayer/kplayernodeaction.h b/kplayer/kplayernodeaction.h
index 394ca06..961c2a6 100644
--- a/kplayer/kplayernodeaction.h
+++ b/kplayer/kplayernodeaction.h
@@ -16,7 +16,7 @@
 #ifndef KPLAYERNODEACTION_H
 #define KPLAYERNODEACTION_H
 
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 
 #include "kplayeractionlist.h"
 
@@ -79,7 +79,7 @@ protected:
   /** Updates the node list. */
   void updateActions (void);
   /** Creates an action for the given node. */
-  virtual KAction* createAction (KPlayerNode* node);
+  virtual TDEAction* createAction (KPlayerNode* node);
 
   /** Container node. */
   KPlayerContainerNode* m_node;
@@ -130,13 +130,13 @@ public:
 
 protected:
   /** Creates an action for the given node. */
-  virtual KAction* createAction (KPlayerNode* node);
+  virtual TDEAction* createAction (KPlayerNode* node);
 };
 
 /**Device action menu class.
   *@author kiriuja
   */
-class KPlayerDeviceActionMenu : public KActionMenu
+class KPlayerDeviceActionMenu : public TDEActionMenu
 {
   Q_OBJECT
 
@@ -169,7 +169,7 @@ protected:
   virtual void updateActions (void);
 
   /** Device actions. */
-  TQPtrList<KAction> m_actions;
+  TQPtrList<TDEAction> m_actions;
   /** Indicates whether the device node was populated. */
   bool m_populated;
 
@@ -212,9 +212,9 @@ protected:
   virtual void updateActions (void);
 
   /** Load disk action. */
-  KAction* m_load_action;
+  TDEAction* m_load_action;
   /** Play disk action. */
-  KAction* m_play_action;
+  TDEAction* m_play_action;
   /** Indicates disk being loaded for playing. */
   bool m_play_disk;
 };
diff --git a/kplayer/kplayernodeview.cpp b/kplayer/kplayernodeview.cpp
index f1d4b39..824ef74 100644
--- a/kplayer/kplayernodeview.cpp
+++ b/kplayer/kplayernodeview.cpp
@@ -16,7 +16,7 @@
 #include <kiconloader.h>
 #include <kinputdialog.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurldrag.h>
 #include <tqcursor.h>
 #include <tqheader.h>
@@ -250,7 +250,7 @@ void KPlayerListViewItem::update (void)
   kdDebugTime() << "KPlayerListViewItem::update\n";
   kdDebugTime() << " URL    " << node() -> url().url() << "\n";
 #endif
-  setPixmap (0, DesktopIcon (icon(), KIcon::SizeSmall));
+  setPixmap (0, DesktopIcon (icon(), TDEIcon::SizeSmall));
   TQStringList::ConstIterator iterator (nodeView() -> attributeNames().begin());
   for ( int i = 0; iterator != nodeView() -> attributeNames().end(); ++ iterator, ++ i )
   {
@@ -421,7 +421,7 @@ void KPlayerListViewFolderItem::setOpen (bool open)
   KPlayerListViewGroupItem::setOpen (open);
   if ( change )
   {
-    setPixmap (0, DesktopIcon (icon(), KIcon::SizeSmall));
+    setPixmap (0, DesktopIcon (icon(), TDEIcon::SizeSmall));
     if ( open )
       added (node() -> nodes());
     updateColumns();
@@ -632,7 +632,7 @@ void KPlayerHistoryActionList::update (void)
       -- iterator;
       if ( actions().count() == limit )
         m_actions.removeFirst();
-      KToggleAction* action = new KToggleAction ((*iterator).m_name, 0, this, SLOT(actionActivated()), this);
+      TDEToggleAction* action = new TDEToggleAction ((*iterator).m_name, 0, this, SLOT(actionActivated()), this);
       if ( iterator == m_current )
       {
         action -> setChecked (true);
@@ -648,7 +648,7 @@ void KPlayerHistoryActionList::update (void)
   }
 }
 
-void KPlayerHistoryActionList::actionActivated (KAction*, int index)
+void KPlayerHistoryActionList::actionActivated (TDEAction*, int index)
 {
 #ifdef DEBUG_KPLAYER_ACTIONLIST
   kdDebugTime() << "KPlayerHistoryActionList::actionActivated\n";
@@ -669,7 +669,7 @@ void KPlayerHistoryActionList::actionActivated (KAction*, int index)
 }
 
 KPlayerNodeView::KPlayerNodeView (TQWidget* parent, const char* name)
-  : KListView (parent, name)
+  : TDEListView (parent, name)
 {
 #ifdef DEBUG_KPLAYER_NODEVIEW
   kdDebugTime() << "Creating node view\n";
@@ -711,8 +711,8 @@ void KPlayerNodeView::initialize (void)
   connect (this, SIGNAL (selectionChanged()), SLOT (itemSelectionChanged()));
   connect (this, SIGNAL (executed (TQListViewItem*)), SLOT (itemExecuted (TQListViewItem*)));
   if ( library() -> popupMenu() )
-    connect (this, SIGNAL (contextMenu (KListView*, TQListViewItem*, const TQPoint&)),
-      SLOT (showContextMenu (KListView*, TQListViewItem*, const TQPoint&)));
+    connect (this, SIGNAL (contextMenu (TDEListView*, TQListViewItem*, const TQPoint&)),
+      SLOT (showContextMenu (TDEListView*, TQListViewItem*, const TQPoint&)));
   connect (this, SIGNAL (itemRenamed (TQListViewItem*, const TQString&, int)),
     SLOT (edited (TQListViewItem*, const TQString&, int)));
   header() -> installEventFilter (this);
@@ -1036,7 +1036,7 @@ void KPlayerNodeView::setColumnWidth (int column, int width)
   kdDebugTime() << " Column " << column << "\n";
   kdDebugTime() << " Width  " << width << "\n";
 #endif
-  KListView::setColumnWidth (column, width);
+  TDEListView::setColumnWidth (column, width);
   moveLineEdit();
 }
 
@@ -1219,7 +1219,7 @@ bool KPlayerNodeView::eventFilter (TQObject* object, TQEvent* event)
       return true;
     }
   }
-  return KListView::eventFilter (object, event);
+  return TDEListView::eventFilter (object, event);
 }
 
 void KPlayerNodeView::findDropTarget (const TQPoint& pos, TQListViewItem*& parent, TQListViewItem*& after)
@@ -1412,7 +1412,7 @@ void KPlayerNodeView::contentsDragMoveEvent (TQDragMoveEvent* event)
   kdDebugTime() << "KPlayerNodeView::contentsDragMoveEvent\n";
 #endif
   //if ( acceptDrag (event) )
-  KListView::contentsDragMoveEvent (event);
+  TDEListView::contentsDragMoveEvent (event);
   if ( event -> isAccepted() )
     event -> accept (TQRect (TQCursor::pos(), TQCursor::pos()));
   qt_dnd_manager -> killTimers();
@@ -1428,7 +1428,7 @@ void KPlayerNodeView::contentsDragEnterEvent (TQDragEnterEvent* event)
   m_drag_node_list.clear();
   kPlayerSettings() -> resetControl();
   kPlayerSettings() -> resetShift();
-  KListView::contentsDragEnterEvent (event);
+  TDEListView::contentsDragEnterEvent (event);
 }
 
 void KPlayerNodeView::contentsDragLeaveEvent (TQDragLeaveEvent* event)
@@ -1440,7 +1440,7 @@ void KPlayerNodeView::contentsDragLeaveEvent (TQDragLeaveEvent* event)
   m_drag_node_list.clear();
   kPlayerSettings() -> resetControl();
   kPlayerSettings() -> resetShift();
-  KListView::contentsDragLeaveEvent (event);
+  TDEListView::contentsDragLeaveEvent (event);
 }
 
 void KPlayerNodeView::contentsDropEvent (TQDropEvent* event)
@@ -1485,7 +1485,7 @@ void KPlayerNodeView::contentsDropEvent (TQDropEvent* event)
     }
   }
   event -> setPoint (TQPoint (-1, -1));
-  KListView::contentsDropEvent (event);
+  TDEListView::contentsDropEvent (event);
   m_drag_node_list.releaseAll();
   m_drag_node_list.clear();
   setCurrentItem (m_last_item);
@@ -1514,7 +1514,7 @@ bool KPlayerNodeView::event (TQEvent* e)
       return true;
     }
   }
-  return KListView::event (e);
+  return TDEListView::event (e);
 }
 
 void KPlayerNodeView::keyPressEvent (TQKeyEvent* keyevent)
@@ -1535,7 +1535,7 @@ void KPlayerNodeView::keyPressEvent (TQKeyEvent* keyevent)
     keyevent -> accept();
   }
   else
-    KListView::keyPressEvent (keyevent);
+    TDEListView::keyPressEvent (keyevent);
 }
 
 void KPlayerNodeView::setNodeOrder (KPlayerContainerNode*)
@@ -1574,7 +1574,7 @@ void KPlayerNodeView::connectActions (void)
   connect (action ("library_go_to_origin"), SIGNAL(activated()), SLOT(goToOrigin()));
 }
 
-void KPlayerNodeView::showContextMenu (KListView*, TQListViewItem*, const TQPoint& point)
+void KPlayerNodeView::showContextMenu (TDEListView*, TQListViewItem*, const TQPoint& point)
 {
 #ifdef DEBUG_KPLAYER_NODEVIEW
   kdDebugTime() << "Showing node view popup menu\n";
@@ -1597,7 +1597,7 @@ void KPlayerNodeView::focusInEvent (TQFocusEvent* event)
 #ifdef DEBUG_KPLAYER_NODEVIEW
   kdDebugTime() << "List view getting focus\n";
 #endif
-  KListView::focusInEvent (event);
+  TDEListView::focusInEvent (event);
 #ifdef DEBUG_KPLAYER_NODEVIEW
   kdDebugTime() << "List view got focus\n";
 #endif
@@ -1612,7 +1612,7 @@ void KPlayerNodeView::focusOutEvent (TQFocusEvent* event)
 #ifdef DEBUG_KPLAYER_NODEVIEW
   kdDebugTime() << "List view loosing focus\n";
 #endif
-  KListView::focusOutEvent (event);
+  TDEListView::focusOutEvent (event);
 #ifdef DEBUG_KPLAYER_NODEVIEW
   kdDebugTime() << "List view lost focus\n";
 #endif
@@ -1629,7 +1629,7 @@ void KPlayerNodeView::contentsMousePressEvent (TQMouseEvent* e)
   m_mouse_pressed = true;
   m_popup_menu_shown = e -> button() == TQt::RightButton;
   m_last_node = currentNode();
-  KListView::contentsMousePressEvent (e);
+  TDEListView::contentsMousePressEvent (e);
 #ifdef DEBUG_KPLAYER_NODEVIEW
   kdDebugTime() << "KPlayerNodeView::contentsMousePressEvent leave\n";
 #endif
@@ -1642,7 +1642,7 @@ void KPlayerNodeView::contentsMouseReleaseEvent (TQMouseEvent* e)
   kdDebugTime() << " Button " << e -> button() << "\n";
   kdDebugTime() << " State  " << e -> stateAfter() << "\n";
 #endif
-  KListView::contentsMouseReleaseEvent (e);
+  TDEListView::contentsMouseReleaseEvent (e);
   m_mouse_pressed = (e -> stateAfter() & TQt::MouseButtonMask) != TQt::NoButton;
   if ( ! m_mouse_pressed && ! m_popup_menu_shown )
   {
@@ -1744,7 +1744,7 @@ void KPlayerNodeView::setOpen (TQListViewItem* item, bool open)
     return;
   if ( ! open )
     keepUpCurrentItem (item, item);
-  KListView::setOpen (item, open);
+  TDEListView::setOpen (item, open);
 }
 
 void KPlayerNodeView::play (void)
@@ -2297,7 +2297,7 @@ void KPlayerListView::updateActions (void)
   action ("library_add_files") -> setEnabled (enable);
   action ("library_add_url") -> setEnabled (enable);
   enable = container && container -> canAddBranches();
-  KAction* a = action ("library_add_group");
+  TDEAction* a = action ("library_add_group");
   a -> setEnabled (enable);
   if ( container && container -> isDevices() )
   {
@@ -2342,7 +2342,7 @@ void KPlayerListView::selectAll (void)
 #ifdef DEBUG_KPLAYER_NODEVIEW
   kdDebugTime() << "KPlayerListView::selectAll\n";
 #endif
-  KListView::selectAll (true);
+  TDEListView::selectAll (true);
 }
 
 void KPlayerListView::goUp (void)
@@ -3128,7 +3128,7 @@ void KPlayerTreeView::updateActions (void)
   action ("library_add_files") -> setEnabled (enable);
   action ("library_add_url") -> setEnabled (enable);
   enable = selection && node -> canAddBranches();
-  KAction* a = action ("library_add_group");
+  TDEAction* a = action ("library_add_group");
   a -> setEnabled (enable);
   if ( node && node -> isDevices() )
   {
@@ -3307,7 +3307,7 @@ void KPlayerTreeView::activateCurrentItem (void)
     setActiveNode (activeNode());
 }
 
-KPlayerLibrary::KPlayerLibrary (KActionCollection* ac, TQWidget* parent, const char* name)
+KPlayerLibrary::KPlayerLibrary (TDEActionCollection* ac, TQWidget* parent, const char* name)
   : TQSplitter (parent, name)
 {
 #ifdef DEBUG_KPLAYER_NODEVIEW
@@ -3315,76 +3315,76 @@ KPlayerLibrary::KPlayerLibrary (KActionCollection* ac, TQWidget* parent, const c
 #endif
   m_ac = ac;
   KPlayerNode::initialize();
-  KAction* action = new KAction (i18n("&Play"), 0, CTRL + Key_Return, m_ac, "library_play");
+  TDEAction* action = new TDEAction (i18n("&Play"), 0, CTRL + Key_Return, m_ac, "library_play");
   action -> setStatusText (i18n("Plays the selected items"));
   action -> setWhatsThis (i18n("Play command plays the selected items."));
-  action = new KAction (i18n("Play &Next"), 0, 0, m_ac, "library_play_next");
+  action = new TDEAction (i18n("Play &Next"), 0, 0, m_ac, "library_play_next");
   action -> setStatusText (i18n("Plays the selected items after the currently played item"));
   action -> setWhatsThis (i18n("Play next command plays the selected items after the currently played item finishes playing."));
-  action = new KAction (i18n("&Queue"), 0, 0, m_ac, "library_queue");
+  action = new TDEAction (i18n("&Queue"), 0, 0, m_ac, "library_queue");
   action -> setStatusText (i18n("Queues the selected items"));
   action -> setWhatsThis (i18n("Queue command queues the selected items for playing."));
-  action = new KAction (i18n("Queue Ne&xt"), 0, 0, m_ac, "library_queue_next");
+  action = new TDEAction (i18n("Queue Ne&xt"), 0, 0, m_ac, "library_queue_next");
   action -> setStatusText (i18n("Queues the selected items for playing after the currently played item"));
   action -> setWhatsThis (i18n("Queue next command queues the selected items for playing after the currently played item finishes playing."));
-  action = new KAction (i18n("&Files..."), 0, 0, m_ac, "library_add_files");
+  action = new TDEAction (i18n("&Files..."), 0, 0, m_ac, "library_add_files");
   action -> setStatusText (i18n("Adds files to the selected folder"));
   action -> setWhatsThis (i18n("Add files command displays the standard Open File dialog and lets you choose a file or several files to add to the selected folder."));
-  action = new KAction (i18n("&URL..."), 0, 0, m_ac, "library_add_url");
+  action = new TDEAction (i18n("&URL..."), 0, 0, m_ac, "library_add_url");
   action -> setStatusText (i18n("Adds a URL to the selected folder"));
   action -> setWhatsThis (i18n("Add URL command displays the standard Open URL dialog and lets you type or paste in a URL to add to the selected folder."));
-  action = new KAction (i18n("F&older..."), 0, 0, m_ac, "library_add_group");
+  action = new TDEAction (i18n("F&older..."), 0, 0, m_ac, "library_add_group");
   action -> setStatusText (i18n("Adds a new subfolder to the selected folder"));
   action -> setWhatsThis (i18n("Add folder command allows you to add a new subfolder to the selected folder. You will need to give the new subfolder a unique name."));
-  action = new KAction (i18n("&New Playlist..."), 0, 0, m_ac, "library_add_to_new_playlist");
+  action = new TDEAction (i18n("&New Playlist..."), 0, 0, m_ac, "library_add_to_new_playlist");
   action -> setStatusText (i18n("Adds selected items to a new playlist"));
   action -> setWhatsThis (i18n("Add to new playlist command prompts for a new playlist name and adds the selected items to the new playlist."));
-  action = new KAction (i18n("&Playlists"), 0, 0, m_ac, "library_add_to_playlists");
+  action = new TDEAction (i18n("&Playlists"), 0, 0, m_ac, "library_add_to_playlists");
   action -> setStatusText (i18n("Adds selected items to the root playlist"));
   action -> setWhatsThis (i18n("Add to playlists command adds the selected items to the root playlist."));
   m_playlists = new KPlayerContainerActionList ("%1", i18n("Adds selected items to %1 playlist"),
     i18n("Add to playlist command adds the selected items to the %1 playlist."), this, "library_add_to_playlist");
   playlistActionList() -> setMaximumSize (configuration() -> playlistMenuSize());
-  action = new KAction (i18n("&Collection"), 0, 0, m_ac, "library_add_to_collection");
+  action = new TDEAction (i18n("&Collection"), 0, 0, m_ac, "library_add_to_collection");
   action -> setStatusText (i18n("Adds selected items to the collection"));
   action -> setWhatsThis (i18n("Add to collection command adds the selected items to the multimedia collection."));
-  action = new KAction (i18n("&Rename"), 0, Key_F2, m_ac, "library_rename");
+  action = new TDEAction (i18n("&Rename"), 0, Key_F2, m_ac, "library_rename");
   action -> setStatusText (i18n("Lets you rename the selected item"));
   action -> setWhatsThis (i18n("Rename command starts edit mode for the current item in the multimedia library so you can change the item name."));
-  action = new KAction (i18n("Propert&ies..."), 0, 0, m_ac, "library_properties");
+  action = new TDEAction (i18n("Propert&ies..."), 0, 0, m_ac, "library_properties");
   action -> setStatusText (i18n("Opens Properties dialog for the selected item"));
   action -> setWhatsThis (i18n("Properties command opens File Properties dialog for the current item in the multimedia library. See the File properties micro-HOWTO for details."));
-  action = new KAction (i18n("&Select All"), 0, 0, m_ac, "library_select_all");
+  action = new TDEAction (i18n("&Select All"), 0, 0, m_ac, "library_select_all");
   action -> setStatusText (i18n("Selects all items in the current folder"));
   action -> setWhatsThis (i18n("Select all command selects all items in the current folder of the multimedia library."));
-  action = new KAction (i18n("Move &Up"), "1uparrow", 0, m_ac, "library_move_up");
+  action = new TDEAction (i18n("Move &Up"), "1uparrow", 0, m_ac, "library_move_up");
   action -> setStatusText (i18n("Moves the selected items up in the playlist"));
   action -> setWhatsThis (i18n("Move Up command moves the selected items up in a playlist. You can also move items around by clicking and dragging them with the left mouse button."));
-  action = new KAction (i18n("Move &Down"), "1downarrow", 0, m_ac, "library_move_down");
+  action = new TDEAction (i18n("Move &Down"), "1downarrow", 0, m_ac, "library_move_down");
   action -> setStatusText (i18n("Moves the selected items down in the playlist"));
   action -> setWhatsThis (i18n("Move Down command moves the selected items down in a playlist. You can also move items around by clicking and dragging them with the left mouse button."));
-  action = new KAction (i18n("Re&move"), "editdelete", Key_Delete, m_ac, "library_remove");
+  action = new TDEAction (i18n("Re&move"), "editdelete", Key_Delete, m_ac, "library_remove");
   action -> setStatusText (i18n("Removes the selected items from the multimedia library"));
   action -> setWhatsThis (i18n("Remove command removes the selected items from the multimedia library."));
   m_go_to = new KPlayerContainerActionList ("%1", i18n("Opens %1 in the library window"),
     i18n("Go to %1 command opens the corresponding folder in the library window."), this, "library_go_to_list");
   connect (goToActionList(), SIGNAL(activated(KPlayerNode*)), SLOT(open(KPlayerNode*)));
-  action = new KAction (i18n("&Back"), "back", ALT + Key_Left, m_ac, "library_go_back");
+  action = new TDEAction (i18n("&Back"), "back", ALT + Key_Left, m_ac, "library_go_back");
   action -> setStatusText (i18n("Opens the previous folder"));
   action -> setWhatsThis (i18n("Go back command opens the previous folder from the history."));
-  action = new KAction (i18n("&Forward"), "forward", ALT + Key_Right, m_ac, "library_go_forward");
+  action = new TDEAction (i18n("&Forward"), "forward", ALT + Key_Right, m_ac, "library_go_forward");
   action -> setStatusText (i18n("Opens the next folder"));
   action -> setWhatsThis (i18n("Go forward command opens the next folder from the history."));
-  action = new KAction (i18n("&Up"), "up", ALT + SHIFT + Key_Up, m_ac, "library_go_up");
+  action = new TDEAction (i18n("&Up"), "up", ALT + SHIFT + Key_Up, m_ac, "library_go_up");
   action -> setStatusText (i18n("Opens the parent folder"));
   action -> setWhatsThis (i18n("Go up command opens the parent folder of the current folder."));
-  action = new KAction (i18n("&Down"), "down", ALT + SHIFT + Key_Down, m_ac, "library_go_down");
+  action = new TDEAction (i18n("&Down"), "down", ALT + SHIFT + Key_Down, m_ac, "library_go_down");
   action -> setStatusText (i18n("Opens the selected folder"));
   action -> setWhatsThis (i18n("Go down command opens the selected folder."));
-  action = new KAction (i18n("&To Origin"), 0, ALT + SHIFT + Key_Left, m_ac, "library_go_to_origin");
+  action = new TDEAction (i18n("&To Origin"), 0, ALT + SHIFT + Key_Left, m_ac, "library_go_to_origin");
   action -> setStatusText (i18n("Opens the origin of the current folder"));
   action -> setWhatsThis (i18n("Go to origin command opens the origin folder of the current folder."));
-  action = new KAction (i18n("&Edit"), 0, 0, this, SLOT (editPlaylist()), m_ac, "playlist_edit");
+  action = new TDEAction (i18n("&Edit"), 0, 0, this, SLOT (editPlaylist()), m_ac, "playlist_edit");
   action -> setStatusText (i18n("Opens the playlist in the multimedia library"));
   action -> setWhatsThis (i18n("Edit command opens the playlist in the multimedia library and allows you to edit it."));
   m_tree = new KPlayerTreeView (this);
@@ -3455,7 +3455,7 @@ void KPlayerLibrary::disconnectActions (void)
 #ifdef DEBUG_KPLAYER_NODEVIEW
   kdDebugTime() << "Disconnecting actions\n";
 #endif
-  KAction* a = action ("library_play");
+  TDEAction* a = action ("library_play");
   a -> disconnect();
   a -> setEnabled (false);
   a = action ("library_play_next");
@@ -3549,7 +3549,7 @@ void KPlayerLibrary::editPlaylist (void)
   open (treeView() -> playlist() -> nowplaying());
 }
 
-KPlayerLibraryWindow::KPlayerLibraryWindow (KActionCollection* ac, TQWidget* parent, const char* name)
+KPlayerLibraryWindow::KPlayerLibraryWindow (TDEActionCollection* ac, TQWidget* parent, const char* name)
   : TQDockWindow (parent, name)
 {
   setWidget (new KPlayerLibrary (ac, this));
diff --git a/kplayer/kplayernodeview.h b/kplayer/kplayernodeview.h
index f718773..d20d3ec 100644
--- a/kplayer/kplayernodeview.h
+++ b/kplayer/kplayernodeview.h
@@ -17,7 +17,7 @@
 #define KPLAYERNODEVIEW_H
 
 #include <kdialogbase.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqdockwindow.h>
 #include <tqvalidator.h>
 
@@ -103,18 +103,18 @@ public:
 /**Node view item. Represents a node in a node view.
   *@author kiriuja
   */
-class KPlayerListViewItem : public KListViewItem
+class KPlayerListViewItem : public TDEListViewItem
 {
 public:
   /** KPlayerListViewItem constructor. Adds a new item for the given node. */
-  KPlayerListViewItem (KListView* parent, KPlayerNode* node)
-    : KListViewItem (parent), m_node (node) { }
+  KPlayerListViewItem (TDEListView* parent, KPlayerNode* node)
+    : TDEListViewItem (parent), m_node (node) { }
   /** KPlayerListViewItem constructor. Adds a new item for the given node after the given item. */
-  KPlayerListViewItem (KListView* parent, KPlayerListViewItem* after, KPlayerNode* node)
-    : KListViewItem (parent, after), m_node (node) { }
+  KPlayerListViewItem (TDEListView* parent, KPlayerListViewItem* after, KPlayerNode* node)
+    : TDEListViewItem (parent, after), m_node (node) { }
   /** KPlayerListViewItem constructor. Adds a new item for the given node after the given item. */
   KPlayerListViewItem (KPlayerListViewItem* parent, KPlayerListViewItem* after, KPlayerNode* node)
-    : KListViewItem (parent, after), m_node (node) { }
+    : TDEListViewItem (parent, after), m_node (node) { }
   /** The KPlayerListViewItem destructor. */
   virtual ~KPlayerListViewItem();
 
@@ -133,7 +133,7 @@ public:
 
   /** Returns the node view. */
   KPlayerNodeView* nodeView (void) const
-    { return (KPlayerNodeView*) KListViewItem::listView(); }
+    { return (KPlayerNodeView*) TDEListViewItem::listView(); }
 
   /** Returns icon name. */
   virtual TQString icon (void) const;
@@ -168,10 +168,10 @@ class KPlayerListViewGroupItem : public KPlayerListViewItem
 {
 public:
   /** KPlayerListViewGroupItem constructor. Adds a new item for the given node. */
-  KPlayerListViewGroupItem (KListView* parent, KPlayerNode* node)
+  KPlayerListViewGroupItem (TDEListView* parent, KPlayerNode* node)
     : KPlayerListViewItem (parent, node) { }
   /** KPlayerListViewGroupItem constructor. Adds a new item for the given node after the given item. */
-  KPlayerListViewGroupItem (KListView* parent, KPlayerListViewItem* after, KPlayerNode* node)
+  KPlayerListViewGroupItem (TDEListView* parent, KPlayerListViewItem* after, KPlayerNode* node)
     : KPlayerListViewItem (parent, after, node) { }
   /** KPlayerListViewGroupItem constructor. Adds a new item for the given node after the given item. */
   KPlayerListViewGroupItem (KPlayerListViewItem* parent, KPlayerListViewItem* after, KPlayerNode* node)
@@ -184,7 +184,7 @@ public:
 
   /** Returns the node view. */
   KPlayerListView* listView (void) const
-    { return (KPlayerListView*) KListViewItem::listView(); }
+    { return (KPlayerListView*) TDEListViewItem::listView(); }
 
   /** Returns the node. */
   KPlayerContainerNode* node (void) const
@@ -198,10 +198,10 @@ class KPlayerListViewFolderItem : public KPlayerListViewGroupItem
 {
 public:
   /** KPlayerListViewFolderItem constructor. Adds a new item for the given node. */
-  KPlayerListViewFolderItem (KListView* parent, KPlayerNode* node)
+  KPlayerListViewFolderItem (TDEListView* parent, KPlayerNode* node)
     : KPlayerListViewGroupItem (parent, node) { }
   /** KPlayerListViewFolderItem constructor. Adds a new item for the given node after the given item. */
-  KPlayerListViewFolderItem (KListView* parent, KPlayerListViewItem* after, KPlayerNode* node)
+  KPlayerListViewFolderItem (TDEListView* parent, KPlayerListViewItem* after, KPlayerNode* node)
     : KPlayerListViewGroupItem (parent, after, node) { }
   /** KPlayerListViewFolderItem constructor. Adds a new item for the given node after the given item. */
   KPlayerListViewFolderItem (KPlayerListViewItem* parent, KPlayerListViewItem* after, KPlayerNode* node)
@@ -264,10 +264,10 @@ class KPlayerTreeViewFolderItem : public KPlayerListViewFolderItem
 {
 public:
   /** KPlayerTreeViewFolderItem constructor. Adds a new item for the given node. */
-  KPlayerTreeViewFolderItem (KListView* parent, KPlayerNode* node)
+  KPlayerTreeViewFolderItem (TDEListView* parent, KPlayerNode* node)
     : KPlayerListViewFolderItem (parent, node) { }
   /** KPlayerTreeViewFolderItem constructor. Adds a new item for the given node after the given item. */
-  KPlayerTreeViewFolderItem (KListView* parent, KPlayerListViewItem* after, KPlayerNode* node)
+  KPlayerTreeViewFolderItem (TDEListView* parent, KPlayerListViewItem* after, KPlayerNode* node)
     : KPlayerListViewFolderItem (parent, after, node) { }
   /** KPlayerTreeViewFolderItem constructor. Adds a new item for the given node after the given item. */
   KPlayerTreeViewFolderItem (KPlayerListViewItem* parent, KPlayerListViewItem* after, KPlayerNode* node)
@@ -351,7 +351,7 @@ signals:
 
 protected:
   /** Selects the item with the given index by emitting the activated signal. */
-  virtual void actionActivated (KAction* action, int index);
+  virtual void actionActivated (TDEAction* action, int index);
 
   /** History. */
   KPlayerHistory& m_history;
@@ -362,7 +362,7 @@ protected:
 /**The node view.
   *@author kiriuja
   */
-class KPlayerNodeView : public KListView
+class KPlayerNodeView : public TDEListView
 {
   Q_OBJECT
 
@@ -378,7 +378,7 @@ public:
   virtual void terminate (void);
 
   /** Main config. */
-  KConfig* config (void) const
+  TDEConfig* config (void) const
     { return KPlayerEngine::engine() -> config(); }
 
   /** Indicates whether the view has focus. */
@@ -444,7 +444,7 @@ public:
   KPlayerPlaylist* playlist (void);
 
   /** Retrieves an action from the action collection by name. */
-  KAction* action (const char* name) const;
+  TDEAction* action (const char* name) const;
 
   /** Checks whether the current item is being hidden and sets a new one. */
   virtual void setOpen (TQListViewItem* item, bool open);
@@ -481,7 +481,7 @@ protected slots:
   /** Expands, collapses or drills down a group node. */
   void itemExecuted (TQListViewItem* item);
   /** Shows the context menu. */
-  void showContextMenu (KListView*, TQListViewItem*, const TQPoint&);
+  void showContextMenu (TDEListView*, TQListViewItem*, const TQPoint&);
 
   /** Updates the edited field of the current item. */
   void edited (TQListViewItem* item, const TQString& value, int column);
@@ -855,7 +855,7 @@ protected:
   /** Fills the given list with selected nodes. */
   virtual KPlayerNodeList getSelectedNodes (void) const;
 
-  /** Prevents KListView from resetting the alternate background. */
+  /** Prevents TDEListView from resetting the alternate background. */
   virtual bool event (TQEvent*);
 
   /** Sets custom node order by name. */
@@ -878,7 +878,7 @@ class KPlayerLibrary : public TQSplitter
 
 public: 
   /** Sets up the view widget. Adds tree and list children. */
-  KPlayerLibrary (KActionCollection* ac, TQWidget* parent = 0, const char* name = 0);
+  KPlayerLibrary (TDEActionCollection* ac, TQWidget* parent = 0, const char* name = 0);
   /** Frees up resources. */
   virtual ~KPlayerLibrary();
 
@@ -899,11 +899,11 @@ public:
     { return m_popup; }
 
   /** Configuration. */
-  KConfig* config (void) const
+  TDEConfig* config (void) const
     { return KPlayerEngine::engine() -> config(); }
 
   /** Retrieves an action from the action collection by name. */
-  KAction* action (const char* name) const
+  TDEAction* action (const char* name) const
     { return m_ac -> action (name); }
 
   /** Returns the playlist action list. */
@@ -958,7 +958,7 @@ public slots:
 
 protected:
   /** Action collection. */
-  KActionCollection* m_ac;
+  TDEActionCollection* m_ac;
   /** Popup menu. */
   TQPopupMenu* m_popup;
   /** Tree view. */
@@ -988,7 +988,7 @@ class KPlayerLibraryWindow : public TQDockWindow
 
 public: 
   /** Constructor. */
-  KPlayerLibraryWindow (KActionCollection* ac, TQWidget* parent, const char* name = 0);
+  KPlayerLibraryWindow (TDEActionCollection* ac, TQWidget* parent, const char* name = 0);
 
   /** Returns the library. */
   KPlayerLibrary* library (void)
@@ -1006,7 +1006,7 @@ signals:
   void windowHidden (void);
 };
 
-inline KAction* KPlayerNodeView::action (const char* name) const
+inline TDEAction* KPlayerNodeView::action (const char* name) const
 {
   return library() -> action (name);
 }
diff --git a/kplayer/kplayerpart.cpp b/kplayer/kplayerpart.cpp
index 19c4717..0a7d4e1 100644
--- a/kplayer/kplayerpart.cpp
+++ b/kplayer/kplayerpart.cpp
@@ -13,10 +13,10 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <kapplication.h>
-#include <ktoolbar.h>
+#include <tdeapplication.h>
+#include <tdetoolbar.h>
 #include <kxmlguifactory.h>
-#include <kparts/genericfactory.h>
+#include <tdeparts/genericfactory.h>
 #include <tqpopupmenu.h>
 #include <dcopclient.h>
 
@@ -79,13 +79,13 @@ KPlayerPart::KPlayerPart (TQWidget* wparent, const char* wname, TQObject* parent
   action ("view_maintain_aspect") -> plug (m_popup_menu);
   m_popup_menu -> insertSeparator();
   action ("file_properties") -> plug (m_popup_menu);
-  //if ( KGlobalSettings::insertTearOffHandle() )
+  //if ( TDEGlobalSettings::insertTearOffHandle() )
   //  m_popup_menu -> insertTearOffHandle();
 #ifdef DEBUG_KPLAYER_KPART
   kdDebugTime() << "KPlayerPart: created popup menu with " << m_popup_menu -> count() << "items\n";
 #endif
 /*readOptions();
-  KToolBar* toolbar = toolBar (PROGRESS_TOOLBAR);
+  TDEToolBar* toolbar = toolBar (PROGRESS_TOOLBAR);
   if ( toolbar )
   {
     toolbar -> setCaption (i18n("Progress"));
@@ -119,9 +119,9 @@ KPlayerPart::~KPlayerPart()
 
 TQString resourcePath (const TQString& filename);
 
-KAboutData* KPlayerPart::createAboutData (void)
+TDEAboutData* KPlayerPart::createAboutData (void)
 {
-  KAboutData* aboutData = new KAboutData ("kplayer", "KPlayerPart", VERSION, description, KAboutData::License_File,
+  TDEAboutData* aboutData = new TDEAboutData ("kplayer", "KPlayerPart", VERSION, description, TDEAboutData::License_File,
     "(C) 2002-2007, kiriuja", license, "http://kplayer.sourceforge.net/", "http://kplayer.sourceforge.net/email.html");
   aboutData -> setLicenseTextFile (resourcePath ("COPYING"));
   aboutData -> addAuthor ("kiriuja", 0, "http://kplayer.sourceforge.net/email.html");
@@ -149,19 +149,19 @@ bool KPlayerPart::closeURL (void)
 }
 */
 
-//KToolBar* KPlayerPart::toolBar (int index)
+//TDEToolBar* KPlayerPart::toolBar (int index)
 //{
 //index -= PROGRESS_TOOLBAR;
 /*TQObject* toolbar = sliderAction (m_toolbar_actions [index]) -> slider() -> parent();
 #ifdef DEBUG_KPLAYER_KPART
   kdDebugTime() << "Name: '" << toolbar -> name() << "'\n";
-  if ( toolbar && toolbar -> inherits ("KToolBar") )
+  if ( toolbar && toolbar -> inherits ("TDEToolBar") )
     kdDebugTime() << "Got parent\n";
   if ( toolbar )
     kdDebugTime() << "KPlayerSlider parent class name: " << toolbar -> className() << "\n";
 #endif
-  if ( toolbar && toolbar -> inherits ("KToolBar") )
-    return (KToolBar*) toolbar;*/
+  if ( toolbar && toolbar -> inherits ("TDEToolBar") )
+    return (TDEToolBar*) toolbar;*/
 #ifdef DEBUG_KPLAYER_KPART
   /*if ( tqApp )
     kdDebugTime() << "App OK\n";
@@ -173,15 +173,15 @@ bool KPlayerPart::closeURL (void)
 #ifdef DEBUG_KPLAYER_KPART
   /*if ( tqApp -> mainWidget() -> child (m_toolbar_names [index]) )
     kdDebugTime() << "Child OK\n";
-  if ( tqApp -> mainWidget() -> child (m_toolbar_names [index], "KToolBar") )
-    kdDebugTime() << "KToolBar OK\n";*/
+  if ( tqApp -> mainWidget() -> child (m_toolbar_names [index], "TDEToolBar") )
+    kdDebugTime() << "TDEToolBar OK\n";*/
 #endif
-//return (KToolBar*) tqApp -> mainWidget() -> child (m_toolbar_names [index], "KToolBar");
+//return (TDEToolBar*) tqApp -> mainWidget() -> child (m_toolbar_names [index], "TDEToolBar");
 //}
 
 void KPlayerPart::initActions (void)
 {
-  KAction* action = new KAction (i18n("Start &KPlayer"), 0, 0, this, SLOT (launchKPlayer()), actionCollection(), "player_launch");
+  TDEAction* action = new TDEAction (i18n("Start &KPlayer"), 0, 0, this, SLOT (launchKPlayer()), actionCollection(), "player_launch");
   action -> setStatusText (i18n("Stops playback and starts KPlayer with the current URL"));
   action -> setWhatsThis (i18n("Start KPlayer command stops playback, opens the full KPlayer, puts the multimedia file or URL on the playlist and starts playing it. It is always recommended that you choose this command, since it will give you better interface and more options when playing the multimedia."));
   kPlayerEngine() -> setActionCollection (actionCollection());
@@ -194,7 +194,7 @@ void KPlayerPart::saveOptions (void)
 #ifdef DEBUG_KPLAYER_KPART
   kdDebugTime() << "Saving options\n";
 #endif
-  KConfig* config = kPlayerConfig();
+  TDEConfig* config = kPlayerConfig();
   config -> setGroup ("Part Options");
   config -> writeEntry (TQString (m_toolbar_names [0]) + " Part Visible", m_toolbar_visible [0]);
   config -> writeEntry (TQString (m_toolbar_names [1]) + " Part Visible", m_toolbar_visible [1]);
@@ -206,7 +206,7 @@ void KPlayerPart::readOptions (void)
   kdDebugTime() << "Reading options\n";
 #endif
   KPlayerSettings* settings = kPlayerSettings();
-  KConfig* config = kPlayerConfig();
+  TDEConfig* config = kPlayerConfig();
   config -> setGroup ("Part Options");
   m_toolbar_visible[0] = config -> readBoolEntry (TQString (m_toolbar_names[0]) + " Part Visible", m_toolbar_visible[0]);
   toggleAction (m_toolbar_actions [0]) -> setChecked (m_toolbar_visible [0]);
@@ -214,7 +214,7 @@ void KPlayerPart::readOptions (void)
   if ( toolBar (PROGRESS_TOOLBAR) )
     kdDebugTime() << "Toolbar OK\n";
 #endif
-  KToolBar* toolbar = toolBar (PROGRESS_TOOLBAR);
+  TDEToolBar* toolbar = toolBar (PROGRESS_TOOLBAR);
   if ( toolbar )
   {
     if ( m_toolbar_visible[0] )
@@ -237,12 +237,12 @@ void KPlayerPart::readOptions (void)
 void KPlayerPart::enableToolbar (int index)
 {
   index -= PROGRESS_TOOLBAR;
-  KToggleAction* action = toggleAction (m_toolbar_actions [index]);
+  TDEToggleAction* action = toggleAction (m_toolbar_actions [index]);
   action -> setEnabled (true);
   if ( m_toolbar_visible [index] )
   {
     action -> setChecked (true);
-    KToolBar* toolbar = toolBar (index + PROGRESS_TOOLBAR);
+    TDEToolBar* toolbar = toolBar (index + PROGRESS_TOOLBAR);
     if ( toolbar )
       toolbar -> show();
   }
@@ -251,11 +251,11 @@ void KPlayerPart::enableToolbar (int index)
 void KPlayerPart::disableToolbar (int index)
 {
   index -= PROGRESS_TOOLBAR;
-  KToggleAction* action = toggleAction (m_toolbar_actions [index]);
+  TDEToggleAction* action = toggleAction (m_toolbar_actions [index]);
   if ( action -> isChecked() )
   {
     action -> setChecked (false);
-    KToolBar* toolbar = toolBar (index + PROGRESS_TOOLBAR);
+    TDEToolBar* toolbar = toolBar (index + PROGRESS_TOOLBAR);
     if ( toolbar )
       toolbar -> hide();
   }
@@ -277,9 +277,9 @@ void KPlayerPart::enablePlayerActions (void)
 void KPlayerPart::launchKPlayer (void)
 {
   kPlayerEngine() -> stop();
-  KProcess process;
+  TDEProcess process;
   process << "kplayer" << KPlayerEngine::engine() -> properties() -> url().url();
-  process.start (KProcess::DontCare);
+  process.start (TDEProcess::DontCare);
   process.detach();
 }
 
@@ -305,7 +305,7 @@ void KPlayerPart::widgetContextMenu (const TQPoint& global_position)
 /*
 void KPlayerPart::viewProgressToolbar (void)
 {
-  KToolBar* toolbar = toolBar (PROGRESS_TOOLBAR);
+  TDEToolBar* toolbar = toolBar (PROGRESS_TOOLBAR);
   if ( ! toolbar )
     return;
   bool visible = toggleAction ("settings_progress_toolbar") -> isChecked();
@@ -318,7 +318,7 @@ void KPlayerPart::viewProgressToolbar (void)
 
 void KPlayerPart::viewVolumeToolbar (void)
 {
-  KToolBar* toolbar = toolBar (VOLUME_TOOLBAR);
+  TDEToolBar* toolbar = toolBar (VOLUME_TOOLBAR);
   if ( ! toolbar )
     return;
   bool visible = toggleAction ("settings_volume_toolbar") -> isChecked();
diff --git a/kplayer/kplayerpart.desktop b/kplayer/kplayerpart.desktop
index 63c47b8..97bdbb1 100644
--- a/kplayer/kplayerpart.desktop
+++ b/kplayer/kplayerpart.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Encoding=UTF-8
 Type=Service
-X-KDE-Library=libkplayerpart
+X-TDE-Library=libkplayerpart
 Icon=kplayer
 Name=KPlayer
-ServiceTypes=KParts/ReadOnlyPart
+X-TDE-ServiceTypes=KParts/ReadOnlyPart
 MimeType=audio/mp3;audio/mpeg3;audio/mpeg4;audio/mpg;audio/mpeg;audio/mpegurl;audio/m3u;audio/mp4;audio/wav;video/msvideo;video/mpeg4;video/mpeg;video/x-m4v;video/x-mpeg;video/x-mpeg2;video/mp4;video/x-msmpeg;video/vnd.mpegurl;video/x-mpegurl;video/x-msvideo;video/quicktime;video/x-qtc;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wma;audio/x-ms-wax;audio/x-ms-wmp;audio/x-ms-wmv;video/x-ms-asf;video/x-ms-asf-plugin;video/x-ms-asx;video/x-ms-wax;video/x-ms-wmp;video/x-ms-wmv;video/x-ms-wma;video/x-ms-wvx;video/x-ms-wmx;video/x-ms-wm;application/asx;application/x-ms-asf;application/vnd.ms-asf;application/x-ms-wmd;application/x-ms-wmz;audio/scpls;audio/x-scpls;audio/x-pls;audio/vnd.mpegurl;audio/x-mpg;audio/x-mpeg;audio/x-mpeg3;audio/x-mpegurl;audio/x-realaudio;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;application/x-pn-realaudio;audio/vnd.rn-realaudio;video/x-realvideo;video/x-pn-realvideo;video/vnd.rn-realvideo;video/x-pn-realvideo-plugin;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;application/vnd.rn-realplayer;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;video/nsv;audio/x-mp3;video/x-ogm;video/x-theora;audio/vorbis;audio/x-vorbis;audio/x-oggflac;application/x-ogg;application/ogg;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/x-wav;video/avi;video/x-avi;video/x-divx;video/x-fli;video/x-matroska;audio/x-matroska;application/x-mplayer2;application/x-cda;audio/aac;audio/ac3;audio/basic;audio/m4a;audio/x-aac;audio/x-adpcm;audio/x-flac;audio/x-m3u;audio/x-m4a;audio/x-musepack;audio/x-pn-windows-pcm;video/x-3gpp;video/x-3gpp2;video/mediaplayer;uri/mms;uri/mmst;uri/mmsu;uri/pnm;uri/rtsp;uri/rtspt;uri/rtspu
diff --git a/kplayer/kplayerpart.h b/kplayer/kplayerpart.h
index b8a117e..b62317c 100644
--- a/kplayer/kplayerpart.h
+++ b/kplayer/kplayerpart.h
@@ -20,8 +20,8 @@
 #include <config.h>
 #endif
 
-#include <kaction.h>
-#include <kparts/browserextension.h>
+#include <tdeaction.h>
+#include <tdeparts/browserextension.h>
 
 #include "kplayerprocess.h"
 
@@ -57,7 +57,7 @@ public:
   virtual ~KPlayerPart();
 
   /** Returns the data for the About dialog. **/
-  static KAboutData* createAboutData (void);
+  static TDEAboutData* createAboutData (void);
 
   virtual bool openURL (const KURL&);
 
@@ -74,7 +74,7 @@ public:
 //void disableToolbar (int index);
 
   /** Returns a pointer to the toolbar with the given index. */
-  //KToolBar* toolBar (int);
+  //TDEToolBar* toolBar (int);
 
 public slots:
   /** Stops playback, starts KPlayer and gives it the URL. */
@@ -96,7 +96,7 @@ public slots:
   void widgetContextMenu (const TQPoint& global_position);
 
 protected:
-  /** Initializes the KActions of the KPart. */
+  /** Initializes the TDEActions of the KPart. */
   void initActions (void);
   /** Dummy openFile required because of KParts::ReadOnlyPart design flaw. */
   virtual bool openFile (void)
diff --git a/kplayer/kplayerplaylist.cpp b/kplayer/kplayerplaylist.cpp
index 953fb57..dc5a0c3 100644
--- a/kplayer/kplayerplaylist.cpp
+++ b/kplayer/kplayerplaylist.cpp
@@ -15,7 +15,7 @@
 
 #include <kinputdialog.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <krandomsequence.h>
 #include <kurl.h>
 #include <kurldrag.h>
@@ -36,7 +36,7 @@
 #include "kplayerpropertiesdialog.h"
 #include "kplayersettings.h"
 
-KPlayerPlaylist::KPlayerPlaylist (KActionCollection* ac, TQObject* parent, const char* name)
+KPlayerPlaylist::KPlayerPlaylist (TDEActionCollection* ac, TQObject* parent, const char* name)
   : TQObject (parent, name)
 {
 #ifdef DEBUG_KPLAYER_PLAYLIST
@@ -45,11 +45,11 @@ KPlayerPlaylist::KPlayerPlaylist (KActionCollection* ac, TQObject* parent, const
   m_ac = ac;
   m_current = 0;
   m_play_requested = false;
-  KAction* action = KStdAction::open (this, SLOT (filePlay()), m_ac);
+  TDEAction* action = KStdAction::open (this, SLOT (filePlay()), m_ac);
   action -> setText (i18n("&Play..."));
   action -> setStatusText (i18n("Plays an existing file"));
   action -> setWhatsThis (i18n("Play command displays the standard Open File dialog and lets you choose a file or several files to put on the playlist and start playing."));
-  action = new KAction (i18n("Play &URL..."), "fileopenurl", CTRL + Key_U, this, SLOT (filePlayUrl()), m_ac, "file_open_url");
+  action = new TDEAction (i18n("Play &URL..."), "fileopenurl", CTRL + Key_U, this, SLOT (filePlayUrl()), m_ac, "file_open_url");
   action -> setStatusText (i18n("Plays a URL"));
   action -> setWhatsThis (i18n("Play URL command displays the standard URL dialog and lets you type or paste in a URL to put on the playlist and start playing. The URL can be a remote network location, a local file path, or a KDE I/O Slave URL."));
   m_playlists = new KPlayerContainerActionList ("%1", i18n("Plays the %1 list"),
@@ -61,10 +61,10 @@ KPlayerPlaylist::KPlayerPlaylist (KActionCollection* ac, TQObject* parent, const
   refreshSettings();
   m_devices = new KPlayerDevicesActionList ("%1", i18n("Shows commands and options available for %1"),
     i18n("Submenu that shows commands and options available for %1."), this, "file_devices");
-  action = new KAction (i18n("&Next"), "1rightarrow", ALT + Key_Down, this, SLOT (next()), m_ac, "player_next");
+  action = new TDEAction (i18n("&Next"), "1rightarrow", ALT + Key_Down, this, SLOT (next()), m_ac, "player_next");
   action -> setStatusText (i18n("Plays the next item on the playlist"));
   action -> setWhatsThis (i18n("Next command starts playing the next item on the current playlist."));
-  action = new KAction (i18n("P&revious"), "1leftarrow", ALT + Key_Up, this, SLOT (previous()), m_ac, "player_previous");
+  action = new TDEAction (i18n("P&revious"), "1leftarrow", ALT + Key_Up, this, SLOT (previous()), m_ac, "player_previous");
   action -> setStatusText (i18n("Plays the previous item on the playlist"));
   action -> setWhatsThis (i18n("Previous command starts playing the previous item on the current playlist."));
   KWidgetAction* widget = new KWidgetAction (new KPlayerPlaylistCombobox, i18n("Playlist"), 0, 0, 0, m_ac, "player_list");
@@ -74,29 +74,29 @@ KPlayerPlaylist::KPlayerPlaylist (KActionCollection* ac, TQObject* parent, const
   widget -> setWhatsThis (i18n("Playlist combo box in the closed state displays the current playlist item. You can drop down the combo box to see the entire list and select a different item to load and play."));
   connect (playlist(), SIGNAL (activated(int)), SLOT (play(int)));
   TQToolTip::add (playlist(), i18n("Playlist"));
-  KToggleAction* toggle = new KToggleAction (i18n("&Loop"), "loop", 0, this, SLOT (loop()), m_ac, "player_loop");
+  TDEToggleAction* toggle = new TDEToggleAction (i18n("&Loop"), "loop", 0, this, SLOT (loop()), m_ac, "player_loop");
   toggle -> setStatusText (i18n("Turns the option to loop through the list on/off"));
   toggle -> setWhatsThis (i18n("Loop command toggles the option to start playing items from the beginning of the playlist after playing the last item on the playlist."));
   if ( configuration() -> loop() )
     toggle -> setChecked (true);
-  toggle = new KToggleAction (i18n("S&huffle"), "shuffle", 0, this, SLOT (shuffle()), m_ac, "player_shuffle");
+  toggle = new TDEToggleAction (i18n("S&huffle"), "shuffle", 0, this, SLOT (shuffle()), m_ac, "player_shuffle");
   toggle -> setStatusText (i18n("Turns the option to play items in random order on or off"));
   toggle -> setWhatsThis (i18n("Shuffle command toggles the option to play items in a random order."));
   if ( configuration() -> shuffle() )
     toggle -> setChecked (true);
-  action = new KAction (i18n("&Files..."), 0, 0, this, SLOT (addFiles()), m_ac, "playlist_add_files");
+  action = new TDEAction (i18n("&Files..."), 0, 0, this, SLOT (addFiles()), m_ac, "playlist_add_files");
   action -> setStatusText (i18n("Adds files to the playlist"));
   action -> setWhatsThis (i18n("Add files command displays the standard Open File dialog and lets you choose a file or several files to add to the playlist."));
-  action = new KAction (i18n("&URL..."), 0, 0, this, SLOT (addUrl()), m_ac, "playlist_add_url");
+  action = new TDEAction (i18n("&URL..."), 0, 0, this, SLOT (addUrl()), m_ac, "playlist_add_url");
   action -> setStatusText (i18n("Adds a URL to the playlist"));
   action -> setWhatsThis (i18n("Add URL command displays the standard Open URL dialog and lets you type or paste in a URL to add to the playlist."));
-  action = new KAction (i18n("&Playlists..."), 0, 0, this, SLOT (addToPlaylists()), m_ac, "playlist_add_to_playlists");
+  action = new TDEAction (i18n("&Playlists..."), 0, 0, this, SLOT (addToPlaylists()), m_ac, "playlist_add_to_playlists");
   action -> setStatusText (i18n("Saves the playlist under a new name"));
   action -> setWhatsThis (i18n("Add to new playlist command prompts for a new playlist name and saves the playlist under the new name."));
   m_playlists_add = new KPlayerContainerActionList ("%1", i18n("Adds playlist items to %1 playlist"),
     i18n("Add to playlist command adds the playlist items to the %1 playlist."), this, "playlist_add_to_playlist");
   playlistAddActionList() -> setMaximumSize (configuration() -> playlistMenuSize());
-  action = new KAction (i18n("&Collection..."), 0, 0, this, SLOT (addToCollection()), m_ac, "playlist_add_to_collection");
+  action = new TDEAction (i18n("&Collection..."), 0, 0, this, SLOT (addToCollection()), m_ac, "playlist_add_to_collection");
   action -> setStatusText (i18n("Saves the playlist in the collection"));
   action -> setWhatsThis (i18n("Add to collection command prompts for a new folder name and saves the playlist under the new name in the multimedia collection."));
   connect (process(), SIGNAL (stateChanged(KPlayerProcess::State, KPlayerProcess::State)),
diff --git a/kplayer/kplayerplaylist.h b/kplayer/kplayerplaylist.h
index cefa97e..e4b8dda 100644
--- a/kplayer/kplayerplaylist.h
+++ b/kplayer/kplayerplaylist.h
@@ -16,7 +16,7 @@
 #ifndef KPLAYERPLAYLIST_H
 #define KPLAYERPLAYLIST_H
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcombobox.h>
 
 #include "kplayerprocess.h"
@@ -67,7 +67,7 @@ class KPlayerPlaylist : public TQObject
 
 public:
   /** The KPlayerPlaylist constructor. Creates an empty playlist. */
-  KPlayerPlaylist (KActionCollection* ac, TQObject* parent = 0, const char* name = 0);
+  KPlayerPlaylist (TDEActionCollection* ac, TQObject* parent = 0, const char* name = 0);
   /** The KPlayerPlaylist destructor. */
   virtual ~KPlayerPlaylist();
 
@@ -94,11 +94,11 @@ public:
     { return m_nowplaying; }
 
   /** Retrieves an action from the actionCollection by name. */
-  KAction* action (const char* name) const
+  TDEAction* action (const char* name) const
     { return m_ac -> action (name); }
   /** Retrieves a toggle action from the actionCollection by name. */
-  KToggleAction* toggleAction (const char* name) const
-    { return (KToggleAction*) action (name); }
+  TDEToggleAction* toggleAction (const char* name) const
+    { return (TDEToggleAction*) action (name); }
 
   /** Returns the playlist action list. */
   KPlayerContainerActionList* playlistActionList (void) const
@@ -260,7 +260,7 @@ protected:
   /** List of nodes. */
   KPlayerPlaylistNodeList m_nodes;
   /** Action collection. */
-  KActionCollection* m_ac;
+  TDEActionCollection* m_ac;
   /** Set next node indicator. */
   bool m_set_next;
   /** Playlist action list. */
diff --git a/kplayer/kplayerprocess.cpp b/kplayer/kplayerprocess.cpp
index 02b2f30..2af3bff 100644
--- a/kplayer/kplayerprocess.cpp
+++ b/kplayer/kplayerprocess.cpp
@@ -18,10 +18,10 @@
 #endif
 
 #include <fcntl.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocctrl.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tqdir.h>
 #include <tqfileinfo.h>
 #include <tqregexp.h>
@@ -50,7 +50,7 @@
 #define NO_SEEK_ORIGIN -5
 
 #ifdef DEBUG_KPLAYER_DUMP
-static TQFile s_dump (TQDir::homeDirPath() + "/kioslave.dump");
+static TQFile s_dump (TQDir::homeDirPath() + "/tdeioslave.dump");
 #endif
 
 static TQRegExp re_ext ("^[A-Za-z0-9]+$");
@@ -89,8 +89,8 @@ KPlayerLineOutputProcess::KPlayerLineOutputProcess (void)
 #if 0
   m_merge = false;
 #endif
-  connect (this, SIGNAL (receivedStdout (KProcess*, char*, int)), SLOT (slotReceivedStdout (KProcess*, char*, int)));
-  connect (this, SIGNAL (receivedStderr (KProcess*, char*, int)), SLOT (slotReceivedStderr (KProcess*, char*, int)));
+  connect (this, SIGNAL (receivedStdout (TDEProcess*, char*, int)), SLOT (slotReceivedStdout (TDEProcess*, char*, int)));
+  connect (this, SIGNAL (receivedStderr (TDEProcess*, char*, int)), SLOT (slotReceivedStderr (TDEProcess*, char*, int)));
 }
 
 KPlayerLineOutputProcess::~KPlayerLineOutputProcess()
@@ -115,7 +115,7 @@ void KPlayerLineOutputProcess::processHasExited (int state)
     emit processExited (this);
 }
 
-void KPlayerLineOutputProcess::slotReceivedStdout (KProcess* proc, char* str, int len)
+void KPlayerLineOutputProcess::slotReceivedStdout (TDEProcess* proc, char* str, int len)
 {
 #ifdef DEBUG_KPLAYER_LINEOUT
   kdDebugTime() << "StdOut: " << len << " '" << str << "'\n";
@@ -123,7 +123,7 @@ void KPlayerLineOutputProcess::slotReceivedStdout (KProcess* proc, char* str, in
   receivedOutput (proc, str, len, m_stdout_buffer, m_stdout_buffer_length, m_stdout_line_length, true);
 }
 
-void KPlayerLineOutputProcess::slotReceivedStderr (KProcess* proc, char* str, int len)
+void KPlayerLineOutputProcess::slotReceivedStderr (TDEProcess* proc, char* str, int len)
 {
 #if 0
   if ( m_merge )
@@ -133,7 +133,7 @@ void KPlayerLineOutputProcess::slotReceivedStderr (KProcess* proc, char* str, in
     receivedOutput (proc, str, len, m_stderr_buffer, m_stderr_buffer_length, m_stderr_line_length, false);
 }
 
-void KPlayerLineOutputProcess::receivedOutput (KProcess* proc, char* str, int len, char* buf, int blen, int llen, bool bstdout)
+void KPlayerLineOutputProcess::receivedOutput (TDEProcess* proc, char* str, int len, char* buf, int blen, int llen, bool bstdout)
 {
   static int avlen = 0;
   static char* av = 0;
@@ -334,13 +334,13 @@ void KPlayerProcess::transferTemporaryFile (void)
     }
     kdDebugTime() << "Process: Creating temp job\n";
 #endif
-    m_temp_job = KIO::get (properties() -> url(), false, false);
+    m_temp_job = TDEIO::get (properties() -> url(), false, false);
     m_temp_job -> setWindow (kPlayerWorkspace());
     m_temp_job -> addMetaData ("PropagateHttpHeader", "true");
-    connect (m_temp_job, SIGNAL (data (KIO::Job*, const TQByteArray&)), SLOT (transferTempData (KIO::Job*, const TQByteArray&)));
-    connect (m_temp_job, SIGNAL (result (KIO::Job*)), SLOT (transferTempDone (KIO::Job*)));
-    connect (m_temp_job, SIGNAL (percent (KIO::Job*, unsigned long)), SLOT (transferProgress (KIO::Job*, unsigned long)));
-    connect (m_temp_job, SIGNAL (infoMessage (KIO::Job*, const TQString&)), SLOT (transferInfoMessage (KIO::Job*, const TQString&)));
+    connect (m_temp_job, SIGNAL (data (TDEIO::Job*, const TQByteArray&)), SLOT (transferTempData (TDEIO::Job*, const TQByteArray&)));
+    connect (m_temp_job, SIGNAL (result (TDEIO::Job*)), SLOT (transferTempDone (TDEIO::Job*)));
+    connect (m_temp_job, SIGNAL (percent (TDEIO::Job*, unsigned long)), SLOT (transferProgress (TDEIO::Job*, unsigned long)));
+    connect (m_temp_job, SIGNAL (infoMessage (TDEIO::Job*, const TQString&)), SLOT (transferInfoMessage (TDEIO::Job*, const TQString&)));
     transferProgress (m_temp_job, 0);
     m_delayed_helper = true;
   }
@@ -468,12 +468,12 @@ TQString resourcePath (const TQString& filename)
 #ifdef DEBUG_KPLAYER_PROCESS
   kdDebugTime() << "Looking for " << filename << "\n";
 #endif
-  TQString path (KGlobal::dirs() -> findResource ("appdata", filename));
+  TQString path (TDEGlobal::dirs() -> findResource ("appdata", filename));
 #ifdef DEBUG_KPLAYER_PROCESS
   kdDebugTime() << " appdata '" << path << "'\n";
 #endif
   if ( path.isEmpty() )
-    path = KGlobal::dirs() -> findResource ("data", "kplayer/" + filename);
+    path = TDEGlobal::dirs() -> findResource ("data", "kplayer/" + filename);
 #ifdef DEBUG_KPLAYER_PROCESS
   kdDebugTime() << " found '" << path << "'\n";
 #endif
@@ -701,12 +701,12 @@ void KPlayerProcess::start (void)
     kdDebugTime() << "Process: Will send get_time_length for '" << properties() -> url().url() << "'\n";
     kdDebugTime() << "Process: Creating slave job\n";
 #endif
-    m_slave_job = KIO::get (properties() -> url(), false, false);
+    m_slave_job = TDEIO::get (properties() -> url(), false, false);
     m_slave_job -> setWindow (kPlayerWorkspace());
     m_slave_job -> addMetaData ("PropagateHttpHeader", "true");
-    connect (m_slave_job, SIGNAL (data (KIO::Job*, const TQByteArray&)), SLOT (transferData (KIO::Job*, const TQByteArray&)));
-    connect (m_slave_job, SIGNAL (result (KIO::Job*)), SLOT (transferDone (KIO::Job*)));
-    connect (m_slave_job, SIGNAL (infoMessage (KIO::Job*, const TQString&)), SLOT (transferInfoMessage (KIO::Job*, const TQString&)));
+    connect (m_slave_job, SIGNAL (data (TDEIO::Job*, const TQByteArray&)), SLOT (transferData (TDEIO::Job*, const TQByteArray&)));
+    connect (m_slave_job, SIGNAL (result (TDEIO::Job*)), SLOT (transferDone (TDEIO::Job*)));
+    connect (m_slave_job, SIGNAL (infoMessage (TDEIO::Job*, const TQString&)), SLOT (transferInfoMessage (TDEIO::Job*, const TQString&)));
     m_cache_size = properties() -> cache() == 2 ? properties() -> cacheSize() * 1024 : 1048576;
     m_first_chunk = true;
 #ifdef DEBUG_KPLAYER_PROCESS
@@ -769,11 +769,11 @@ bool KPlayerProcess::run (KPlayerLineOutputProcess* player)
     *player << (properties() -> useTemporaryFile() && m_temporary_file ? TQFile::encodeName (m_temporary_file -> name()) : m_fifo_name);
   else
     *player << properties() -> urlString();
-  connect (player, SIGNAL (processExited (KProcess*)), SLOT (playerProcessExited (KProcess*)));
+  connect (player, SIGNAL (processExited (TDEProcess*)), SLOT (playerProcessExited (TDEProcess*)));
 #if 0
   player -> setMerge (true);
 #endif
-  return player -> start (KProcess::NotifyOnExit, KProcess::All);
+  return player -> start (TDEProcess::NotifyOnExit, TDEProcess::All);
 }
 
 void KPlayerProcess::pause (void)
@@ -808,12 +808,12 @@ void KPlayerProcess::stop (KPlayerLineOutputProcess** player, bool* quit, bool s
 #ifdef DEBUG_KPLAYER_PROCESS
         kdDebugTime() << "Process: MPlayer is running. Waiting...\n";
 #endif
-        KProcessController::theKProcessController -> waitForProcessExit (1);
+        TDEProcessController::theTDEProcessController -> waitForProcessExit (1);
       }
       //if ( *player && (*player) -> isRunning() )
-      //  KProcessController::theKProcessController -> waitForProcessExit (1);
+      //  TDEProcessController::theTDEProcessController -> waitForProcessExit (1);
       //if ( *player && (*player) -> isRunning() )
-      //  KProcessController::theKProcessController -> waitForProcessExit (1);
+      //  TDEProcessController::theTDEProcessController -> waitForProcessExit (1);
     }
     if ( *quit && *player && (*player) -> isRunning() )
     {
@@ -821,14 +821,14 @@ void KPlayerProcess::stop (KPlayerLineOutputProcess** player, bool* quit, bool s
       kdDebugTime() << "Process: Closing MPlayer...\n";
 #endif
       (*player) -> kill();
-      KProcessController::theKProcessController -> waitForProcessExit (1);
+      TDEProcessController::theTDEProcessController -> waitForProcessExit (1);
       if ( *quit && *player && (*player) -> isRunning() )
       {
 #ifdef DEBUG_KPLAYER_PROCESS
         kdDebugTime() << "Process: Killing MPlayer...\n";
 #endif
         (*player) -> kill (SIGKILL);
-        KProcessController::theKProcessController -> waitForProcessExit (1);
+        TDEProcessController::theTDEProcessController -> waitForProcessExit (1);
         if ( *quit && *player && (*player) -> isRunning() )
         {
 #ifdef DEBUG_KPLAYER_PROCESS
@@ -1233,7 +1233,7 @@ void KPlayerProcess::audioID (int id)
   m_send_audio_id = false;
 }
 
-void KPlayerProcess::transferData (KIO::Job* job, const TQByteArray& data)
+void KPlayerProcess::transferData (TDEIO::Job* job, const TQByteArray& data)
 {
   if ( job && job == m_slave_job && m_player )
   {
@@ -1286,7 +1286,7 @@ void KPlayerProcess::transferData (KIO::Job* job, const TQByteArray& data)
   }
 }
 
-void KPlayerProcess::transferTempData (KIO::Job* job, const TQByteArray& data)
+void KPlayerProcess::transferTempData (TDEIO::Job* job, const TQByteArray& data)
 {
   if ( job && job == m_temp_job && m_temporary_file )
   {
@@ -1308,7 +1308,7 @@ void KPlayerProcess::transferTempData (KIO::Job* job, const TQByteArray& data)
   }
 }
 
-void KPlayerProcess::transferProgress (KIO::Job* job, unsigned long progress)
+void KPlayerProcess::transferProgress (TDEIO::Job* job, unsigned long progress)
 {
   if ( job && job == m_temp_job )
   {
@@ -1323,13 +1323,13 @@ void KPlayerProcess::transferProgress (KIO::Job* job, unsigned long progress)
 #endif
 }
 
-void KPlayerProcess::transferInfoMessage (KIO::Job* job, const TQString& message)
+void KPlayerProcess::transferInfoMessage (TDEIO::Job* job, const TQString& message)
 {
   if ( job && (job == m_slave_job || job == m_temp_job) )
     emit messageReceived (message);
 }
 
-void KPlayerProcess::transferDone (KIO::Job* job)
+void KPlayerProcess::transferDone (TDEIO::Job* job)
 {
   if ( job && job == m_slave_job )
   {
@@ -1354,8 +1354,8 @@ void KPlayerProcess::transferDone (KIO::Job* job)
       {
         m_cache.clear();
 /*#ifdef DEBUG_KPLAYER_PROCESS
-        KIO::MetaData metadata (job -> metaData());
-        for ( KIO::MetaData::Iterator it = metadata.begin(); it != metadata.end(); ++ it )
+        TDEIO::MetaData metadata (job -> metaData());
+        for ( TDEIO::MetaData::Iterator it = metadata.begin(); it != metadata.end(); ++ it )
           kdDebugTime() << "Process: Error page metadata: key '" << it.key() << "' data '" << it.data() << "'\n";
 #endif*/
         errorString = job -> queryMetaData ("HTTP-Headers");
@@ -1389,7 +1389,7 @@ void KPlayerProcess::transferDone (KIO::Job* job)
 #endif
 }
 
-void KPlayerProcess::transferTempDone (KIO::Job* job)
+void KPlayerProcess::transferTempDone (TDEIO::Job* job)
 {
   if ( job && job == m_temp_job )
   {
@@ -1406,8 +1406,8 @@ void KPlayerProcess::transferTempDone (KIO::Job* job)
         errorString = job -> queryMetaData ("HTTP-Headers");
 /*    {
 #ifdef DEBUG_KPLAYER_PROCESS
-        KIO::MetaData metadata (job -> metaData());
-        for ( KIO::MetaData::Iterator it = metadata.begin(); it != metadata.end(); ++ it )
+        TDEIO::MetaData metadata (job -> metaData());
+        for ( TDEIO::MetaData::Iterator it = metadata.begin(); it != metadata.end(); ++ it )
           kdDebugTime() << "Process: Error page metadata: key '" << it.key() << "' data '" << it.data() << "'\n";
 #endif
       }*/
@@ -1597,7 +1597,7 @@ void KPlayerProcess::playerDataWritten (int fd)
 #endif
 }
 
-void KPlayerProcess::playerProcessExited (KProcess *proc)
+void KPlayerProcess::playerProcessExited (TDEProcess *proc)
 {
   if ( proc == m_player )
   {
diff --git a/kplayer/kplayerprocess.h b/kplayer/kplayerprocess.h
index 77b4db3..1603748 100644
--- a/kplayer/kplayerprocess.h
+++ b/kplayer/kplayerprocess.h
@@ -16,8 +16,8 @@
 #ifndef KPLAYERPROCESS_H
 #define KPLAYERPROCESS_H
 
-#include <kio/jobclasses.h>
-#include <kio/job.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/job.h>
 #include <kprocess.h>
 #include <kurl.h>
 #include <tqfile.h>
@@ -29,10 +29,10 @@ class KPlayerTrackProperties;
 class KPlayerSettings;
 class KTempFile;
 
-/**KProcess extension, handles line output.
+/**TDEProcess extension, handles line output.
   *@author kiriuja
   */
-class KPlayerLineOutputProcess : public KProcess
+class KPlayerLineOutputProcess : public TDEProcess
 {
   Q_OBJECT
 
@@ -58,11 +58,11 @@ public:
 protected slots:
   /** Handles the process stdout output. Emits the receivedStdoutLine signal.
     */
-  void slotReceivedStdout (KProcess*, char*, int);
+  void slotReceivedStdout (TDEProcess*, char*, int);
   /** Handles the process stderr output. Emits the receivedStderrLine signal.
     */
-  void slotReceivedStderr (KProcess*, char*, int);
-  /** Reimplemented from KProcess. Emits receivedStd*Line signals
+  void slotReceivedStderr (TDEProcess*, char*, int);
+  /** Reimplemented from TDEProcess. Emits receivedStd*Line signals
       if the respective buffers are not empty. */
   virtual void processHasExited (int);
 
@@ -77,7 +77,7 @@ signals:
 protected:
   /** Handles the process output, splits it into lines and emits the appropriate signals.
    */
-  void receivedOutput (KProcess* proc, char* str, int len, char* buf, int blen, int llen, bool bstdout);
+  void receivedOutput (TDEProcess* proc, char* str, int len, char* buf, int blen, int llen, bool bstdout);
 
   /** Current stdout line or part thereof.
     */
@@ -273,9 +273,9 @@ protected:
   TQTimer* m_fifo_timer;
 
   /** Transfer job. */
-  KIO::TransferJob* m_slave_job;
+  TDEIO::TransferJob* m_slave_job;
   /** Temporary file transfer job. */
-  KIO::TransferJob* m_temp_job;
+  TDEIO::TransferJob* m_temp_job;
   /** Cached transfer data. */
   TQPtrList<TQByteArray> m_cache;
   /** Temporary file from KIOSlave. */
@@ -314,7 +314,7 @@ protected:
 
 protected slots:
   /** Receives notification when the mplayer process exits. */
-  void playerProcessExited (KProcess*);
+  void playerProcessExited (TDEProcess*);
   /** Receives notification when mplayer sends something to stdout. */
   void receivedOutputLine (KPlayerLineOutputProcess*, char*, int);
   /** Receives notification when the mplayer helper process sends something to stdout. */
@@ -324,17 +324,17 @@ protected slots:
   /** Receives notification when the data has been written to the fifo. */
   void playerDataWritten (int);
   /** Transfers data from a KIOSlave to an MPlayer process. */
-  void transferData (KIO::Job*, const TQByteArray&);
+  void transferData (TDEIO::Job*, const TQByteArray&);
   /** Transfers data from a KIOSlave to a temporary file. */
-  void transferTempData (KIO::Job*, const TQByteArray&);
+  void transferTempData (TDEIO::Job*, const TQByteArray&);
   /** Emits file transfer progress signal. */
-  void transferProgress (KIO::Job*, unsigned long);
+  void transferProgress (TDEIO::Job*, unsigned long);
   /** Emits message received signal. */
-  void transferInfoMessage (KIO::Job*, const TQString&);
+  void transferInfoMessage (TDEIO::Job*, const TQString&);
   /** Processes the result of a slave transfer job. */
-  void transferDone (KIO::Job*);
+  void transferDone (TDEIO::Job*);
   /** Processes the result of a temporary file transfer job. */
-  void transferTempDone (KIO::Job*);
+  void transferTempDone (TDEIO::Job*);
   /** Receives the refresh signal from KPlayerSettings. Stops temporary file transfer if needed. */
   //void refreshSettings (void);
   /** Sends data to MPlayer through named pipe. */
diff --git a/kplayer/kplayerproperties.cpp b/kplayer/kplayerproperties.cpp
index 3d7d2ab..1805327 100644
--- a/kplayer/kplayerproperties.cpp
+++ b/kplayer/kplayerproperties.cpp
@@ -14,8 +14,8 @@
  ***************************************************************************/
 
 #include <fcntl.h>
-#include <kconfig.h>
-#include <klocale.h>
+#include <tdeconfig.h>
+#include <tdelocale.h>
 #include <tqfileinfo.h>
 #include <tqregexp.h>
 
@@ -475,11 +475,11 @@ int KPlayerProperty::compare (KPlayerProperty*) const
   return 0;
 }
 
-void KPlayerProperty::read (KConfig*, const TQString&)
+void KPlayerProperty::read (TDEConfig*, const TQString&)
 {
 }
 
-void KPlayerProperty::save (KConfig*, const TQString&) const
+void KPlayerProperty::save (TDEConfig*, const TQString&) const
 {
 }
 
@@ -502,12 +502,12 @@ int KPlayerBooleanProperty::compare (KPlayerProperty* property) const
   return value() == ((KPlayerBooleanProperty*) property) -> value() ? 0 : value() ? 1 : -1;
 }
 
-void KPlayerBooleanProperty::read (KConfig* config, const TQString& name)
+void KPlayerBooleanProperty::read (TDEConfig* config, const TQString& name)
 {
   setValue (config -> readBoolEntry (name, value()));
 }
 
-void KPlayerBooleanProperty::save (KConfig* config, const TQString& name) const
+void KPlayerBooleanProperty::save (TDEConfig* config, const TQString& name) const
 {
   config -> writeEntry (name, value());
 }
@@ -532,12 +532,12 @@ int KPlayerIntegerProperty::compare (KPlayerProperty* property) const
   return value() == property_value ? 0 : value() > property_value ? 1 : -1;
 }
 
-void KPlayerIntegerProperty::read (KConfig* config, const TQString& name)
+void KPlayerIntegerProperty::read (TDEConfig* config, const TQString& name)
 {
   setValue (config -> readNumEntry (name, value()));
 }
 
-void KPlayerIntegerProperty::save (KConfig* config, const TQString& name) const
+void KPlayerIntegerProperty::save (TDEConfig* config, const TQString& name) const
 {
   config -> writeEntry (name, value());
 }
@@ -584,13 +584,13 @@ int KPlayerRelativeProperty::compare (KPlayerProperty* property) const
   return result;
 }
 
-void KPlayerRelativeProperty::read (KConfig* config, const TQString& name)
+void KPlayerRelativeProperty::read (TDEConfig* config, const TQString& name)
 {
   KPlayerIntegerProperty::read (config, name);
   setOption (config -> readNumEntry (name + " Option"));
 }
 
-void KPlayerRelativeProperty::save (KConfig* config, const TQString& name) const
+void KPlayerRelativeProperty::save (TDEConfig* config, const TQString& name) const
 {
   if ( option() )
   {
@@ -614,7 +614,7 @@ int KPlayerCacheProperty::compare (KPlayerProperty* property) const
   return value() == property_value || value() < 4 && property_value < 4 ? 0 : value() > property_value ? 1 : -1;
 }
 
-void KPlayerCacheProperty::read (KConfig* config, const TQString& name)
+void KPlayerCacheProperty::read (TDEConfig* config, const TQString& name)
 {
   KPlayerIntegerProperty::read (config, name);
   if ( value() == 2 )
@@ -637,7 +637,7 @@ int KPlayerFrequencyProperty::compare (KPlayerProperty* property) const
   return my_value == property_value ? 0 : my_value > property_value ? 1 : -1;
 }
 
-void KPlayerFrequencyProperty::save (KConfig* config, const TQString& name) const
+void KPlayerFrequencyProperty::save (TDEConfig* config, const TQString& name) const
 {
   if ( m_value )
     KPlayerIntegerProperty::save (config, name);
@@ -664,12 +664,12 @@ int KPlayerFloatProperty::compare (KPlayerProperty* property) const
   return value() == property_value ? 0 : value() > property_value ? 1 : -1;
 }
 
-void KPlayerFloatProperty::read (KConfig* config, const TQString& name)
+void KPlayerFloatProperty::read (TDEConfig* config, const TQString& name)
 {
   setValue (config -> readDoubleNumEntry (name, value()));
 }
 
-void KPlayerFloatProperty::save (KConfig* config, const TQString& name) const
+void KPlayerFloatProperty::save (TDEConfig* config, const TQString& name) const
 {
   config -> writeEntry (name, value());
 }
@@ -700,12 +700,12 @@ int KPlayerSizeProperty::compare (KPlayerProperty* property) const
   return area == property_area ? 0 : area > property_area ? 1 : -1;
 }
 
-void KPlayerSizeProperty::read (KConfig* config, const TQString& name)
+void KPlayerSizeProperty::read (TDEConfig* config, const TQString& name)
 {
   setValue (config -> readSizeEntry (name, &m_value));
 }
 
-void KPlayerSizeProperty::save (KConfig* config, const TQString& name) const
+void KPlayerSizeProperty::save (TDEConfig* config, const TQString& name) const
 {
   config -> writeEntry (name, value());
 }
@@ -738,13 +738,13 @@ int KPlayerDisplaySizeProperty::compare (KPlayerProperty* property) const
   return option() == property_option ? KPlayerSizeProperty::compare (property) : option() > property_option ? 1 : -1;
 }
 
-void KPlayerDisplaySizeProperty::read (KConfig* config, const TQString& name)
+void KPlayerDisplaySizeProperty::read (TDEConfig* config, const TQString& name)
 {
   KPlayerSizeProperty::read (config, name);
   setOption (config -> readNumEntry (name + " Option", 1));
 }
 
-void KPlayerDisplaySizeProperty::save (KConfig* config, const TQString& name) const
+void KPlayerDisplaySizeProperty::save (TDEConfig* config, const TQString& name) const
 {
   KPlayerSizeProperty::save (config, name);
   if ( option() != 1 )
@@ -770,12 +770,12 @@ int KPlayerStringProperty::compare (KPlayerProperty* property) const
   return compareStrings (asString(), property -> asString());
 }
 
-void KPlayerStringProperty::read (KConfig* config, const TQString& name)
+void KPlayerStringProperty::read (TDEConfig* config, const TQString& name)
 {
   m_value = config -> readEntry (name, value());
 }
 
-void KPlayerStringProperty::save (KConfig* config, const TQString& name) const
+void KPlayerStringProperty::save (TDEConfig* config, const TQString& name) const
 {
   if ( ! value().isEmpty() )
     config -> writeEntry (name, value());
@@ -790,13 +790,13 @@ TQString KPlayerComboStringProperty::asString (void) const
   return option().isNull() ? value() : option();
 }
 
-void KPlayerComboStringProperty::read (KConfig* config, const TQString& name)
+void KPlayerComboStringProperty::read (TDEConfig* config, const TQString& name)
 {
   KPlayerStringProperty::read (config, name);
   setOption (config -> readEntry (name + " Option", option()));
 }
 
-void KPlayerComboStringProperty::save (KConfig* config, const TQString& name) const
+void KPlayerComboStringProperty::save (TDEConfig* config, const TQString& name) const
 {
   KPlayerStringProperty::save (config, name);
   if ( ! option().isNull() )
@@ -846,7 +846,7 @@ void KPlayerStringHistoryProperty::setValue (const TQString& value)
   }
 }
 
-void KPlayerStringHistoryProperty::read (KConfig* config, const TQString& name)
+void KPlayerStringHistoryProperty::read (TDEConfig* config, const TQString& name)
 {
 #ifdef DEBUG_KPLAYER_PROPERTIES
   kdDebugTime() << "KPlayerStringHistoryProperty::read\n";
@@ -869,7 +869,7 @@ void KPlayerStringHistoryProperty::read (KConfig* config, const TQString& name)
   }
 }
 
-void KPlayerStringHistoryProperty::save (KConfig* config, const TQString& name) const
+void KPlayerStringHistoryProperty::save (TDEConfig* config, const TQString& name) const
 {
 #ifdef DEBUG_KPLAYER_PROPERTIES
   kdDebugTime() << "KPlayerStringHistoryProperty::save\n";
@@ -897,7 +897,7 @@ TQString KPlayerNameProperty::asString (void) const
   return value().isEmpty() ? m_properties -> defaultName() : value();
 }
 
-void KPlayerNameProperty::save (KConfig* config, const TQString& name) const
+void KPlayerNameProperty::save (TDEConfig* config, const TQString& name) const
 {
   if ( ! value().isEmpty() && value() != m_properties -> defaultName() )
     KPlayerStringProperty::save (config, name);
@@ -926,13 +926,13 @@ void KPlayerAppendableProperty::setAppendableValue (const TQString& value, bool
   setValue (value);
 }
 
-void KPlayerAppendableProperty::read (KConfig* config, const TQString& name)
+void KPlayerAppendableProperty::read (TDEConfig* config, const TQString& name)
 {
   KPlayerStringProperty::read (config, name);
   setOption (config -> readBoolEntry (name + " Option", false));
 }
 
-void KPlayerAppendableProperty::save (KConfig* config, const TQString& name) const
+void KPlayerAppendableProperty::save (TDEConfig* config, const TQString& name) const
 {
   KPlayerStringProperty::save (config, name);
   if ( option() )
@@ -948,13 +948,13 @@ bool KPlayerStringListProperty::defaults (bool)
   return false;
 }
 
-void KPlayerStringListProperty::read (KConfig* config, const TQString& name)
+void KPlayerStringListProperty::read (TDEConfig* config, const TQString& name)
 {
   for ( int i = 0; i < config -> readNumEntry (name); i ++ )
     m_value.append (config -> readEntry ("Child" + TQString::number (i)));
 }
 
-void KPlayerStringListProperty::save (KConfig* config, const TQString& name) const
+void KPlayerStringListProperty::save (TDEConfig* config, const TQString& name) const
 {
   int i = 0;
   TQStringList::ConstIterator iterator (value().begin());
@@ -972,7 +972,7 @@ KPlayerIntegerStringMapProperty::~KPlayerIntegerStringMapProperty()
 {
 }
 
-void KPlayerIntegerStringMapProperty::read (KConfig* config, const TQString& name)
+void KPlayerIntegerStringMapProperty::read (TDEConfig* config, const TQString& name)
 {
   static TQRegExp re_indexvalue ("^(\\d+)=(.*)$");
   TQStringList values (TQStringList::split (':', config -> readEntry (name)));
@@ -987,7 +987,7 @@ void KPlayerIntegerStringMapProperty::read (KConfig* config, const TQString& nam
   }
 }
 
-void KPlayerIntegerStringMapProperty::save (KConfig* config, const TQString& name) const
+void KPlayerIntegerStringMapProperty::save (TDEConfig* config, const TQString& name) const
 {
   if ( value().count() > 1 || ! value().isEmpty()
     && ! ((KPlayerIntegerStringMapPropertyInfo*) KPlayerProperties::info (name)) -> multipleEntriesRequired() )
@@ -1026,12 +1026,12 @@ KPlayerPersistentUrlProperty::~KPlayerPersistentUrlProperty()
 {
 }
 
-void KPlayerPersistentUrlProperty::read (KConfig* config, const TQString& name)
+void KPlayerPersistentUrlProperty::read (TDEConfig* config, const TQString& name)
 {
   setValue (KURL::fromPathOrURL (config -> readEntry (name, value().url())));
 }
 
-void KPlayerPersistentUrlProperty::save (KConfig* config, const TQString& name) const
+void KPlayerPersistentUrlProperty::save (TDEConfig* config, const TQString& name) const
 {
   config -> writeEntry (name, value().url());
 }
@@ -2190,7 +2190,7 @@ KPlayerConfiguration::~KPlayerConfiguration()
 #endif
 }
 
-KConfig* KPlayerConfiguration::config (void) const
+TDEConfig* KPlayerConfiguration::config (void) const
 {
   return KPlayerEngine::engine() -> config();
 }
@@ -2688,7 +2688,7 @@ KPlayerGenericProperties::~KPlayerGenericProperties()
 #endif
 }
 
-KConfig* KPlayerGenericProperties::config (void) const
+TDEConfig* KPlayerGenericProperties::config (void) const
 {
   return KPlayerEngine::engine() -> store();
 }
@@ -3073,7 +3073,7 @@ TQString KPlayerTVProperties::channelListFromCountry (void)
 #ifdef DEBUG_KPLAYER_PROPERTIES
   kdDebugTime() << "KPlayerTVProperties::channelListFromCountry\n";
 #endif
-  TQString country (KGlobal::locale() -> country().lower());
+  TQString country (TDEGlobal::locale() -> country().lower());
 #ifdef DEBUG_KPLAYER_PROPERTIES
   kdDebugTime() << " Country " << country << "\n";
 #endif
@@ -3280,7 +3280,7 @@ void KPlayerDiskProperties::setupMeta (void)
 #endif
 }
 
-KConfig* KPlayerDiskProperties::config (void) const
+TDEConfig* KPlayerDiskProperties::config (void) const
 {
   return KPlayerEngine::engine() -> meta();
 }
@@ -3309,7 +3309,7 @@ void KPlayerTrackProperties::setDisplaySize (const TQSize& size, int option)
     KPlayerMediaProperties::setDisplaySize (size, option);
 }
 
-KConfig* KPlayerTrackProperties::config (void) const
+TDEConfig* KPlayerTrackProperties::config (void) const
 {
   return KPlayerEngine::engine() -> meta();
 }
diff --git a/kplayer/kplayerproperties.h b/kplayer/kplayerproperties.h
index 57acbe1..34e14af 100644
--- a/kplayer/kplayerproperties.h
+++ b/kplayer/kplayerproperties.h
@@ -118,9 +118,9 @@ public:
   virtual int compare (KPlayerProperty*) const;
 
   /** Reads the value from the given config under the given name. */
-  virtual void read (KConfig* config, const TQString& name);
+  virtual void read (TDEConfig* config, const TQString& name);
   /** Saves the value to the given config under the given name. */
-  virtual void save (KConfig* config, const TQString& name) const;
+  virtual void save (TDEConfig* config, const TQString& name) const;
 
   /** Resets the value to the default and returns true if the property can be deleted. */
   virtual bool defaults (bool can_reset);
@@ -150,9 +150,9 @@ public:
   virtual int compare (KPlayerProperty*) const;
 
   /** Reads the value from the given config under the given name. */
-  virtual void read (KConfig*, const TQString&);
+  virtual void read (TDEConfig*, const TQString&);
   /** Saves the value to the given config under the given name. */
-  virtual void save (KConfig*, const TQString&) const;
+  virtual void save (TDEConfig*, const TQString&) const;
 
 protected:
   /** Property value. */
@@ -185,9 +185,9 @@ public:
   virtual int compare (KPlayerProperty*) const;
 
   /** Reads the value from the given config under the given name. */
-  virtual void read (KConfig*, const TQString&);
+  virtual void read (TDEConfig*, const TQString&);
   /** Saves the value to the given config under the given name. */
-  virtual void save (KConfig*, const TQString&) const;
+  virtual void save (TDEConfig*, const TQString&) const;
 
 protected:
   /** Property value. */
@@ -230,9 +230,9 @@ public:
   virtual int compare (KPlayerProperty*) const;
 
   /** Reads the value from the given config under the given name. */
-  virtual void read (KConfig*, const TQString&);
+  virtual void read (TDEConfig*, const TQString&);
   /** Saves the value to the given config under the given name. */
-  virtual void save (KConfig*, const TQString&) const;
+  virtual void save (TDEConfig*, const TQString&) const;
 
 protected:
   /** Property option. */
@@ -256,7 +256,7 @@ public:
   virtual int compare (KPlayerProperty*) const;
 
   /** Reads the value from the given config under the given name. */
-  virtual void read (KConfig*, const TQString&);
+  virtual void read (TDEConfig*, const TQString&);
 };
 
 /** The frequency property.
@@ -285,7 +285,7 @@ public:
   virtual int compare (KPlayerProperty*) const;
 
   /** Saves the value to the given config under the given name. */
-  virtual void save (KConfig*, const TQString&) const;
+  virtual void save (TDEConfig*, const TQString&) const;
 
   /** Resets the value to the default and returns true if the property can be deleted. */
   virtual bool defaults (bool can_reset);
@@ -319,9 +319,9 @@ public:
   virtual int compare (KPlayerProperty*) const;
 
   /** Reads the value from the given config under the given name. */
-  virtual void read (KConfig*, const TQString&);
+  virtual void read (TDEConfig*, const TQString&);
   /** Saves the value to the given config under the given name. */
-  virtual void save (KConfig*, const TQString&) const;
+  virtual void save (TDEConfig*, const TQString&) const;
 
 protected:
   /** Property value. */
@@ -367,9 +367,9 @@ public:
   virtual int compare (KPlayerProperty*) const;
 
   /** Reads the value from the given config under the given name. */
-  virtual void read (KConfig*, const TQString&);
+  virtual void read (TDEConfig*, const TQString&);
   /** Saves the value to the given config under the given name. */
-  virtual void save (KConfig*, const TQString&) const;
+  virtual void save (TDEConfig*, const TQString&) const;
 
 protected:
   /** Property value. */
@@ -412,9 +412,9 @@ public:
   virtual int compare (KPlayerProperty*) const;
 
   /** Reads the value from the given config under the given name. */
-  virtual void read (KConfig*, const TQString&);
+  virtual void read (TDEConfig*, const TQString&);
   /** Saves the value to the given config under the given name. */
-  virtual void save (KConfig*, const TQString&) const;
+  virtual void save (TDEConfig*, const TQString&) const;
 
 protected:
   /** Property option. */
@@ -447,9 +447,9 @@ public:
   virtual int compare (KPlayerProperty*) const;
 
   /** Reads the value from the given config under the given name. */
-  virtual void read (KConfig*, const TQString&);
+  virtual void read (TDEConfig*, const TQString&);
   /** Saves the value to the given config under the given name. */
-  virtual void save (KConfig*, const TQString&) const;
+  virtual void save (TDEConfig*, const TQString&) const;
 
 protected:
   /** Property value. */
@@ -478,9 +478,9 @@ public:
   virtual TQString asString (void) const;
 
   /** Reads the value from the given config under the given name. */
-  virtual void read (KConfig*, const TQString&);
+  virtual void read (TDEConfig*, const TQString&);
   /** Saves the value to the given config under the given name. */
-  virtual void save (KConfig*, const TQString&) const;
+  virtual void save (TDEConfig*, const TQString&) const;
 
   /** Resets the value to the default and returns true if the property can be deleted. */
   virtual bool defaults (bool can_reset);
@@ -525,9 +525,9 @@ public:
     { return m_history; }
 
   /** Reads the value from the given config under the given name. */
-  virtual void read (KConfig*, const TQString&);
+  virtual void read (TDEConfig*, const TQString&);
   /** Saves the value to the given config under the given name. */
-  virtual void save (KConfig*, const TQString&) const;
+  virtual void save (TDEConfig*, const TQString&) const;
 
 protected:
   /** String history. */
@@ -551,7 +551,7 @@ public:
   virtual TQString asString (void) const;
 
   /** Saves the value to the given config under the given name. */
-  virtual void save (KConfig* config, const TQString& name) const;
+  virtual void save (TDEConfig* config, const TQString& name) const;
 
   /** Resets the value to the default and returns true if the property can be deleted. */
   virtual bool defaults (bool can_reset);
@@ -585,9 +585,9 @@ public:
     { m_option = option; }
 
   /** Reads the value from the given config under the given name. */
-  virtual void read (KConfig*, const TQString&);
+  virtual void read (TDEConfig*, const TQString&);
   /** Saves the value to the given config under the given name. */
-  virtual void save (KConfig*, const TQString&) const;
+  virtual void save (TDEConfig*, const TQString&) const;
 
 protected:
   /** Property option. */
@@ -616,9 +616,9 @@ public:
     { m_value = value; }
 
   /** Reads the value from the given config under the given name. */
-  virtual void read (KConfig* config, const TQString& name);
+  virtual void read (TDEConfig* config, const TQString& name);
   /** Saves the value to the given config under the given name. */
-  virtual void save (KConfig* config, const TQString& name) const;
+  virtual void save (TDEConfig* config, const TQString& name) const;
 
   /** Resets the value to the default and returns true if the property can be deleted. */
   virtual bool defaults (bool can_reset);
@@ -647,9 +647,9 @@ public:
     { m_value.insert (key, value); }
 
   /** Reads the value from the given config under the given name. */
-  virtual void read (KConfig* config, const TQString& name);
+  virtual void read (TDEConfig* config, const TQString& name);
   /** Saves the value to the given config under the given name. */
-  virtual void save (KConfig* config, const TQString& name) const;
+  virtual void save (TDEConfig* config, const TQString& name) const;
 
 protected:
   /** Property value. */
@@ -696,9 +696,9 @@ public:
   virtual ~KPlayerPersistentUrlProperty();
 
   /** Reads the value from the given config under the given name. */
-  virtual void read (KConfig*, const TQString&);
+  virtual void read (TDEConfig*, const TQString&);
   /** Saves the value to the given config under the given name. */
-  virtual void save (KConfig*, const TQString&) const;
+  virtual void save (TDEConfig*, const TQString&) const;
 
   /** Resets the value to the default and returns true if the property can be deleted. */
   virtual bool defaults (bool can_reset);
@@ -1224,7 +1224,7 @@ public:
   void commit (void);
 
   /** Returns the config storage. */
-  virtual KConfig* config (void) const = 0;
+  virtual TDEConfig* config (void) const = 0;
   /** Returns the config group. */
   virtual TQString configGroup (void) const = 0;
 
@@ -1631,7 +1631,7 @@ public:
   virtual ~KPlayerConfiguration();
 
   /** Returns the config storage. */
-  virtual KConfig* config (void) const;
+  virtual TDEConfig* config (void) const;
   /** Returns the config group. */
   virtual TQString configGroup (void) const;
 
@@ -2331,7 +2331,7 @@ public:
   virtual ~KPlayerGenericProperties();
 
   /** Returns the config storage. */
-  virtual KConfig* config (void) const;
+  virtual TDEConfig* config (void) const;
 
   TQString name (void) const
     { return asString ("Name"); }
@@ -2885,7 +2885,7 @@ public:
   virtual void setupMeta (void);
 
   /** Returns the config storage. */
-  virtual KConfig* config (void) const;
+  virtual TDEConfig* config (void) const;
 
   int tracks (void) const
     { return getInteger ("Tracks"); }
@@ -2915,7 +2915,7 @@ public:
   virtual void setupMeta (void);
 
   /** Returns the config storage. */
-  virtual KConfig* config (void) const;
+  virtual TDEConfig* config (void) const;
 
   /** Returns device option. */
   virtual TQString deviceOption (void) const;
diff --git a/kplayer/kplayerpropertiesadvanced.ui b/kplayer/kplayerpropertiesadvanced.ui
index 3a9cf7b..b932235 100644
--- a/kplayer/kplayerpropertiesadvanced.ui
+++ b/kplayer/kplayerpropertiesadvanced.ui
@@ -388,7 +388,7 @@
                         </widget>
                         <widget class="TQLabel" row="4" column="0">
                             <property name="name">
-                                <cstring>l_use_kioslave</cstring>
+                                <cstring>l_use_tdeioslave</cstring>
                             </property>
                             <property name="text">
                                 <string>Use &amp;KIOSlave</string>
@@ -397,7 +397,7 @@
                                 <set>AlignVCenter|AlignLeft</set>
                             </property>
                             <property name="buddy" stdset="0">
-                                <cstring>c_use_kioslave</cstring>
+                                <cstring>c_use_tdeioslave</cstring>
                             </property>
                             <property name="toolTip" stdset="0">
                                 <string>Choose whether to use a KDE I/O Slave to play this file</string>
@@ -423,7 +423,7 @@
                                 </property>
                             </item>
                             <property name="name">
-                                <cstring>c_use_kioslave</cstring>
+                                <cstring>c_use_tdeioslave</cstring>
                             </property>
                             <property name="toolTip" stdset="0">
                                 <string>Choose whether to use a KDE I/O Slave to play this file</string>
diff --git a/kplayer/kplayerpropertiesdialog.cpp b/kplayer/kplayerpropertiesdialog.cpp
index fc46dfc..ee7014a 100644
--- a/kplayer/kplayerpropertiesdialog.cpp
+++ b/kplayer/kplayerpropertiesdialog.cpp
@@ -13,9 +13,9 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <klistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelistview.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
@@ -57,7 +57,7 @@ KPlayerPropertiesDialog::KPlayerPropertiesDialog (void)
 
 KPlayerPropertiesDialog::~KPlayerPropertiesDialog (void)
 {
-  KConfig* config = kPlayerConfig();
+  TDEConfig* config = kPlayerConfig();
   config -> setGroup ("Dialog Options");
 #ifdef DEBUG_KPLAYER_PROPERTIES_DIALOG
   kdDebugTime() << "KPFP " << x() << "x" << y() << " " << width() << "x" << height() << " Hint " << sizeHint().width() << "x" << sizeHint().height() << "\n";
@@ -113,13 +113,13 @@ void KPlayerPropertiesDialog::setup (const KURL& url)
   m_advanced = createAdvancedPage (frame, "advanced");
   m_advanced -> setup (url);
   setHelp ("properties");
-  KListView* view = (KListView*) child (0, "KListView");
+  TDEListView* view = (TDEListView*) child (0, "TDEListView");
   if ( view )
     view -> setMinimumSize (view -> sizeHint());
   layout = (TQBoxLayout*) child (0, "TQHBoxLayout");
   if ( layout )
     layout -> insertSpacing (0, 6);
-  KConfig* config = kPlayerConfig();
+  TDEConfig* config = kPlayerConfig();
   config -> setGroup ("Dialog Options");
   TQString name (config -> readEntry ("Properties Dialog Page"));
   if ( ! name.isEmpty() )
@@ -177,7 +177,7 @@ void KPlayerPropertiesDialog::pageAboutToShow (TQWidget* page)
   kdDebugTime() << "KPlayerPropertiesDialog::pageAboutToShow\n";
 #endif
   TQObject* object = page -> child (0, "TQFrame");
-  KConfig* config = kPlayerConfig();
+  TDEConfig* config = kPlayerConfig();
   config -> setGroup ("Dialog Options");
   TQString name;
   if ( object )
@@ -2006,8 +2006,8 @@ void KPlayerPropertiesAdvanced::hideKioslave (void)
 #ifdef DEBUG_KPLAYER_PROPERTIES_DIALOG
   kdDebugTime() << "KPlayerPropertiesAdvanced::hideKioslave\n";
 #endif
-  l_use_kioslave -> hide();
-  c_use_kioslave -> hide();
+  l_use_tdeioslave -> hide();
+  c_use_tdeioslave -> hide();
   l_use_temporary_file -> hide();
   c_use_temporary_file -> hide();
 }
@@ -2161,14 +2161,14 @@ void KPlayerPropertiesItemAdvanced::setupControls (void)
 
 void KPlayerPropertiesItemAdvanced::load (void)
 {
-  c_use_kioslave -> setCurrentItem (properties() -> useKioslaveOption());
+  c_use_tdeioslave -> setCurrentItem (properties() -> useKioslaveOption());
   c_use_temporary_file -> setCurrentItem (properties() -> useTemporaryFileOption());
   KPlayerPropertiesTrackAdvanced::load();
 }
 
 void KPlayerPropertiesItemAdvanced::save (void)
 {
-  properties() -> setUseKioslaveOption (c_use_kioslave -> currentItem());
+  properties() -> setUseKioslaveOption (c_use_tdeioslave -> currentItem());
   properties() -> setUseTemporaryFileOption (c_use_temporary_file -> currentItem());
   KPlayerPropertiesTrackAdvanced::save();
 }
diff --git a/kplayer/kplayersettings.cpp b/kplayer/kplayersettings.cpp
index 41f9369..34354ac 100644
--- a/kplayer/kplayersettings.cpp
+++ b/kplayer/kplayersettings.cpp
@@ -17,7 +17,7 @@
 #include <config.h>
 #endif
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqfileinfo.h>
 #include <tqregexp.h>
 
diff --git a/kplayer/kplayersettingsadvanced.ui b/kplayer/kplayersettingsadvanced.ui
index 7de3a87..5be75aa 100644
--- a/kplayer/kplayersettingsadvanced.ui
+++ b/kplayer/kplayersettingsadvanced.ui
@@ -406,7 +406,7 @@
                         </property>
                         <widget class="TQLabel">
                             <property name="name">
-                                <cstring>l_use_kioslave</cstring>
+                                <cstring>l_use_tdeioslave</cstring>
                             </property>
                             <property name="text">
                                 <string>Use KIOSlave for</string>
@@ -423,7 +423,7 @@
                         </widget>
                         <widget class="TQCheckBox">
                             <property name="name">
-                                <cstring>c_use_kioslave_for_http</cstring>
+                                <cstring>c_use_tdeioslave_for_http</cstring>
                             </property>
                             <property name="text">
                                 <string>H&amp;TTP</string>
@@ -437,7 +437,7 @@
                         </widget>
                         <widget class="TQCheckBox">
                             <property name="name">
-                                <cstring>c_use_kioslave_for_ftp</cstring>
+                                <cstring>c_use_tdeioslave_for_ftp</cstring>
                             </property>
                             <property name="text">
                                 <string>FT&amp;P</string>
@@ -451,7 +451,7 @@
                         </widget>
                         <widget class="TQCheckBox">
                             <property name="name">
-                                <cstring>c_use_kioslave_for_smb</cstring>
+                                <cstring>c_use_tdeioslave_for_smb</cstring>
                             </property>
                             <property name="text">
                                 <string>&amp;SMB</string>
diff --git a/kplayer/kplayersettingsdialog.cpp b/kplayer/kplayersettingsdialog.cpp
index 2628f72..d6efcd5 100644
--- a/kplayer/kplayersettingsdialog.cpp
+++ b/kplayer/kplayersettingsdialog.cpp
@@ -13,10 +13,10 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <kfontcombo.h>
-#include <klistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdefontcombo.h>
+#include <tdelistview.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqfontdatabase.h>
@@ -99,7 +99,7 @@ KPlayerSettingsDialog::KPlayerSettingsDialog (TQWidget* parent)
   layout -> setAutoAdd (true);
   m_sliders = new KPlayerSettingsSliders (frame, "sliders");
   setHelp ("settings");
-  KListView* view = (KListView*) child (0, "KListView");
+  TDEListView* view = (TDEListView*) child (0, "TDEListView");
   if ( view )
   {
     for ( TQListViewItem* item = view -> firstChild(); item; item = item -> nextSibling() )
@@ -109,7 +109,7 @@ KPlayerSettingsDialog::KPlayerSettingsDialog (TQWidget* parent)
   layout = (TQBoxLayout*) child (0, "TQHBoxLayout");
   if ( layout )
     layout -> insertSpacing (0, 6);
-  KConfig* config = kPlayerConfig();
+  TDEConfig* config = kPlayerConfig();
   config -> setGroup ("Dialog Options");
   TQString name (config -> readEntry ("Settings Dialog Page"));
   if ( ! name.isEmpty() )
@@ -154,7 +154,7 @@ KPlayerSettingsDialog::KPlayerSettingsDialog (TQWidget* parent)
 KPlayerSettingsDialog::~KPlayerSettingsDialog (void)
 {
   kPlayerEngine() -> getLists();
-  KConfig* config = kPlayerConfig();
+  TDEConfig* config = kPlayerConfig();
   config -> setGroup ("Dialog Options");
 #ifdef DEBUG_KPLAYER_SETTINGS_DIALOG
   kdDebugTime() << "KPlayerSettingsDialog " << x() << "x" << y() << " " << width() << "x" << height() << " Hint " << sizeHint().width() << "x" << sizeHint().height() << "\n";
@@ -182,7 +182,7 @@ KPlayerSettingsDialog::~KPlayerSettingsDialog (void)
   if ( m_initial_move )
     return;
   m_initial_move = true;
-  KConfig* config = kPlayerConfig();
+  TDEConfig* config = kPlayerConfig();
   config -> setGroup ("Dialog Options");
   int x = config -> readNumEntry ("Settings Dialog Left", -1);
   int y = config -> readNumEntry ("Settings Dialog Top", -1);
@@ -256,7 +256,7 @@ void KPlayerSettingsDialog::pageAboutToShow (TQWidget* page)
 #endif
   m_advanced -> refreshLists();
   TQObject* object = page -> child (0, "TQFrame");
-  KConfig* config = kPlayerConfig();
+  TDEConfig* config = kPlayerConfig();
   config -> setGroup ("Dialog Options");
   TQString name;
   if ( object )
@@ -350,9 +350,9 @@ void KPlayerSettingsAdvanced::load (void)
   c_build_index -> setCurrentItem (configuration() -> buildNewIndex());
   c_osd_level -> setCurrentItem (configuration() -> osdLevel());
   c_use_temporary_file -> setChecked (configuration() -> useTemporaryFile());
-  c_use_kioslave_for_http -> setChecked (configuration() -> useKioslaveForHttp());
-  c_use_kioslave_for_ftp -> setChecked (configuration() -> useKioslaveForFtp());
-  c_use_kioslave_for_smb -> setChecked (configuration() -> useKioslaveForSmb());
+  c_use_tdeioslave_for_http -> setChecked (configuration() -> useKioslaveForHttp());
+  c_use_tdeioslave_for_ftp -> setChecked (configuration() -> useKioslaveForFtp());
+  c_use_tdeioslave_for_smb -> setChecked (configuration() -> useKioslaveForSmb());
 }
 
 void KPlayerSettingsAdvanced::save (void)
@@ -365,9 +365,9 @@ void KPlayerSettingsAdvanced::save (void)
   configuration() -> setBuildNewIndex (c_build_index -> currentItem());
   configuration() -> setOsdLevel (c_osd_level -> currentItem());
   configuration() -> setUseTemporaryFile (c_use_temporary_file -> isChecked());
-  configuration() -> setUseKioslaveForHttp (c_use_kioslave_for_http -> isChecked());
-  configuration() -> setUseKioslaveForFtp (c_use_kioslave_for_ftp -> isChecked());
-  configuration() -> setUseKioslaveForSmb (c_use_kioslave_for_smb -> isChecked());
+  configuration() -> setUseKioslaveForHttp (c_use_tdeioslave_for_http -> isChecked());
+  configuration() -> setUseKioslaveForFtp (c_use_tdeioslave_for_ftp -> isChecked());
+  configuration() -> setUseKioslaveForSmb (c_use_tdeioslave_for_smb -> isChecked());
 }
 
 void KPlayerSettingsAdvanced::refreshLists (void)
@@ -517,8 +517,8 @@ void KPlayerSettingsAudio::runAmixer (void)
   *amixer << "scontents";
   connect (amixer, SIGNAL (receivedStdoutLine (KPlayerLineOutputProcess*, char*, int)),
     SLOT (amixerOutput (KPlayerLineOutputProcess*, char*, int)));
-  connect (amixer, SIGNAL (processExited (KProcess*)), SLOT (amixerExited (KProcess*)));
-  m_amixer_running = amixer -> start (KProcess::NotifyOnExit, KProcess::All);
+  connect (amixer, SIGNAL (processExited (TDEProcess*)), SLOT (amixerExited (TDEProcess*)));
+  m_amixer_running = amixer -> start (TDEProcess::NotifyOnExit, TDEProcess::All);
   if ( ! m_amixer_running )
     defaultAlsaChannels();
 }
@@ -549,7 +549,7 @@ void KPlayerSettingsAudio::amixerOutput (KPlayerLineOutputProcess*, char* str, i
   }
 }
 
-void KPlayerSettingsAudio::amixerExited (KProcess* proc)
+void KPlayerSettingsAudio::amixerExited (TDEProcess* proc)
 {
 #ifdef DEBUG_KPLAYER_SETTINGS_DIALOG
   kdDebugTime() << "KPlayerSettingsAudio::amixerExited\n";
diff --git a/kplayer/kplayersettingsdialog.h b/kplayer/kplayersettingsdialog.h
index 2c7710b..3a72dc9 100644
--- a/kplayer/kplayersettingsdialog.h
+++ b/kplayer/kplayersettingsdialog.h
@@ -81,7 +81,7 @@ protected slots:
   /** Processes an amixer output line. */
   void amixerOutput (KPlayerLineOutputProcess*, char*, int);
   /** Finishes refreshing ALSA mixer channel list. */
-  void amixerExited (KProcess*);
+  void amixerExited (TDEProcess*);
 
 protected:
   void loadLists (void);
diff --git a/kplayer/kplayersettingssubtitles.ui b/kplayer/kplayersettingssubtitles.ui
index 3104efc..8b946b9 100644
--- a/kplayer/kplayersettingssubtitles.ui
+++ b/kplayer/kplayersettingssubtitles.ui
@@ -70,7 +70,7 @@
                         <string>Option to specify the name of the font for displaying subtitles and other OSD text.</string>
                     </property>
                 </widget>
-                <widget class="KFontCombo" row="0" column="1">
+                <widget class="TDEFontCombo" row="0" column="1">
                     <property name="name">
                         <cstring>c_font_name</cstring>
                     </property>
diff --git a/kplayer/kplayerslideraction.cpp b/kplayer/kplayerslideraction.cpp
index dd18263..a1a8a80 100644
--- a/kplayer/kplayerslideraction.cpp
+++ b/kplayer/kplayerslideraction.cpp
@@ -13,9 +13,9 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <kapplication.h>
-#include <ktoolbar.h>
-#include <ktoolbarbutton.h>
+#include <tdeapplication.h>
+#include <tdetoolbar.h>
+#include <tdetoolbarbutton.h>
 #include <tqcursor.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
@@ -51,9 +51,9 @@ void KPlayerPopupFrame::keyPressEvent (TQKeyEvent* ev)
 }
 
 KPlayerPopupSliderAction::KPlayerPopupSliderAction (const TQString& text,
-    const TQString& pix, const KShortcut& shortcut, const TQObject* receiver,
+    const TQString& pix, const TDEShortcut& shortcut, const TQObject* receiver,
     const char* slot, TQObject* parent, const char* name)
-  : KAction (text, pix, shortcut, parent, name)
+  : TDEAction (text, pix, shortcut, parent, name)
 {
   m_frame = new KPlayerPopupFrame;
   m_frame -> setFrameStyle (TQFrame::PopupPanel | TQFrame::Raised);
@@ -78,20 +78,20 @@ KPlayerPopupSliderAction::~KPlayerPopupSliderAction()
 
 void KPlayerPopupSliderAction::slotActivated (void)
 {
-  KAction::slotActivated();
+  TDEAction::slotActivated();
   TQWidget* button = 0;
 #ifdef DEBUG_KPLAYER_SLIDERS
   if ( sender() )
     kdDebugTime() << "Sender class name: " << sender() -> className() << "\n";
 #endif
-  if ( sender() && sender() -> inherits ("KToolBarButton") )
+  if ( sender() && sender() -> inherits ("TDEToolBarButton") )
     button = (TQWidget*) sender();
   else
   {
-    KToolBar* toolbar = 0;
+    TDEToolBar* toolbar = 0;
     int index;
-    if ( sender() -> inherits ("KToolBar") )
-      toolbar = (KToolBar*) sender();
+    if ( sender() -> inherits ("TDEToolBar") )
+      toolbar = (TDEToolBar*) sender();
     else
       for ( index = 0; index < containerCount() && (! toolbar || ! toolbar -> isVisible()); index ++ )
 	toolbar = toolBar (index);
@@ -131,8 +131,8 @@ void KPlayerPopupSliderAction::slotActivated (void)
   m_slider -> setFocus();
 }
 
-KPlayerSliderAction::KPlayerSliderAction (const TQString& text, const KShortcut& cut,
-    const TQObject* receiver, const char* slot, KActionCollection* parent, const char* name)
+KPlayerSliderAction::KPlayerSliderAction (const TQString& text, const TDEShortcut& cut,
+    const TQObject* receiver, const char* slot, TDEActionCollection* parent, const char* name)
   : KWidgetAction (new KPlayerSlider (TQt::Horizontal, 0, name), text, cut, 0, 0, parent, name)
 {
   setAutoSized (true);
@@ -152,7 +152,7 @@ int KPlayerSliderAction::plug (TQWidget* widget, int index)
   int result = KWidgetAction::plug (widget, index);
   if ( result < 0 )
     return result;
-  KToolBar* toolbar = (KToolBar*) widget;
+  TDEToolBar* toolbar = (TDEToolBar*) widget;
   if ( ! text().isEmpty() )
     TQToolTip::add (slider(), text());
   orientationChanged (toolbar -> orientation());
diff --git a/kplayer/kplayerslideraction.h b/kplayer/kplayerslideraction.h
index bc5137b..3e53446 100644
--- a/kplayer/kplayerslideraction.h
+++ b/kplayer/kplayerslideraction.h
@@ -16,7 +16,7 @@
 #ifndef KPLAYERSLIDERACTION_H
 #define KPLAYERSLIDERACTION_H
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tqhbox.h>
 #include <tqslider.h>
 
@@ -114,13 +114,13 @@ protected:
 /**Action representing a popup slider activated by a toolbar button.
   *@author kiriuja
   */
-class KPlayerPopupSliderAction : public KAction
+class KPlayerPopupSliderAction : public TDEAction
 {
   Q_OBJECT
 
 public:
-  /** The KPlayerPopupSliderAction constructor. Parameters are passed on to KAction. */
-  KPlayerPopupSliderAction (const TQString& text, const TQString& pix, const KShortcut& shortcut,
+  /** The KPlayerPopupSliderAction constructor. Parameters are passed on to TDEAction. */
+  KPlayerPopupSliderAction (const TQString& text, const TQString& pix, const TDEShortcut& shortcut,
     const TQObject* receiver, const char* slot, TQObject* parent = 0, const char* name = 0);
   /** The KPlayerPopupSliderAction destructor. */
   virtual ~KPlayerPopupSliderAction();
@@ -148,9 +148,9 @@ class KPlayerSliderAction : public KWidgetAction
   Q_OBJECT
 
 public:
-  /** The KPlayerSliderAction constructor. Parameters are passed on to KAction. */
-  KPlayerSliderAction (const TQString& text, const KShortcut&, const TQObject* receiver,
-    const char* slot, KActionCollection* parent = 0, const char* name = 0);
+  /** The KPlayerSliderAction constructor. Parameters are passed on to TDEAction. */
+  KPlayerSliderAction (const TQString& text, const TDEShortcut&, const TQObject* receiver,
+    const char* slot, TDEActionCollection* parent = 0, const char* name = 0);
   /** The KPlayerSliderAction destructor. */
   virtual ~KPlayerSliderAction();
 
diff --git a/kplayer/kplayersource.cpp b/kplayer/kplayersource.cpp
index cc2670c..024917d 100644
--- a/kplayer/kplayersource.cpp
+++ b/kplayer/kplayersource.cpp
@@ -13,7 +13,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqregexp.h>
 
 #ifdef DEBUG
diff --git a/kplayer/kplayerwidget.cpp b/kplayer/kplayerwidget.cpp
index c3f374b..aae619b 100644
--- a/kplayer/kplayerwidget.cpp
+++ b/kplayer/kplayerwidget.cpp
@@ -14,7 +14,7 @@
  ***************************************************************************/
 
 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqtimer.h>
 #include <tqwhatsthis.h>
 
diff --git a/kplayer/main.cpp b/kplayer/main.cpp
index d6ef6bf..d26de5c 100644
--- a/kplayer/main.cpp
+++ b/kplayer/main.cpp
@@ -13,17 +13,17 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
-#include <klocale.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdelocale.h>
 
 #include "kplayer.h"
 
 static const char* description = I18N_NOOP("KPlayer, a KDE media player");
 static const char* license = I18N_NOOP("This program is distributed under the terms of the GPL version 3 or later.");
-KAboutData* about;
+TDEAboutData* about;
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
   { "play", I18N_NOOP("Play the files immediately (default)"), 0 },
   { "queue", I18N_NOOP("Queue the files for playing"), 0 },
@@ -38,12 +38,12 @@ static KCmdLineOptions options[] =
 
 int main (int argc, char *argv[])
 {
-  about = new KAboutData ("kplayer", "KPlayer", VERSION, description, KAboutData::License_File,
+  about = new TDEAboutData ("kplayer", "KPlayer", VERSION, description, TDEAboutData::License_File,
     "(C) 2002-2007, kiriuja", license, "http://kplayer.sourceforge.net/", "http://kplayer.sourceforge.net/email.html");
   about -> setLicenseText (license);
   about -> addAuthor ("kiriuja", 0, "http://kplayer.sourceforge.net/email.html");
-  KCmdLineArgs::init (argc, argv, about);
-  KCmdLineArgs::addCmdLineOptions (options);  // Add our own options.
+  TDECmdLineArgs::init (argc, argv, about);
+  TDECmdLineArgs::addCmdLineOptions (options);  // Add our own options.
   KPlayerApplication::addCmdLineOptions();
   return KPlayerApplication().exec();
 }
diff --git a/po/et.po b/po/et.po
index 6659b65..8896f0e 100644
--- a/po/et.po
+++ b/po/et.po
@@ -1446,7 +1446,7 @@ msgstr "sunnitakse peale"
 #: rc.cpp:272
 #, no-c-format
 msgid "Use &KIOSlave"
-msgstr "&KIO-mooduli kasutamine"
+msgstr "&TDEIO-mooduli kasutamine"
 
 #. i18n: file kplayerpropertiesadvanced.ui line 406
 #: rc.cpp:275 rc.cpp:290
@@ -2780,7 +2780,7 @@ msgstr ""
 #: rc.cpp:1685
 #, no-c-format
 msgid "&Use temporary file for playing from KIOSlave"
-msgstr "Aj&utise faili kasutamine KIO-mooduli esitamise korral"
+msgstr "Aj&utise faili kasutamine TDEIO-mooduli esitamise korral"
 
 #. i18n: file kplayersettingsadvanced.ui line 396
 #: rc.cpp:1691
@@ -2799,7 +2799,7 @@ msgstr ""
 #: rc.cpp:1694
 #, no-c-format
 msgid "Use KIOSlave for"
-msgstr "KIO-moodulit kasutatakse järgmiste URL-ide korral: "
+msgstr "TDEIO-moodulit kasutatakse järgmiste URL-ide korral: "
 
 #. i18n: file kplayersettingsadvanced.ui line 418
 #: rc.cpp:1697
diff --git a/po/gl.po b/po/gl.po
index 28b29e0..ae9ad37 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -588,7 +588,7 @@ msgstr ""
 "O comando Abrir un URL mostra o diálogo estándar para Abrir un URL e "
 "permite-lle escreber ou pegar un URL para colocá-lo na lista de reproduzón e "
 "comezar a reproduzón. O URL pode ser unha localizazón remota na rede, a rota a "
-"un ficheiro local, un URL dun kioslave ou un URL especial para reproducir a "
+"un ficheiro local, un URL dun tdeioslave ou un URL especial para reproducir a "
 "partir de vários tipos de dispositivos, como DVD, CD de vídeo, CD de áudio, TV "
 "ou DVB."
 
diff --git a/po/it.po b/po/it.po
index 6d7fb6d..9e61c71 100644
--- a/po/it.po
+++ b/po/it.po
@@ -2843,7 +2843,7 @@ msgstr ""
 #: rc.cpp:1685
 #, no-c-format
 msgid "&Use temporary file for playing from KIOSlave"
-msgstr "&Usa un file temporaneo per riprodurre da slave KIO"
+msgstr "&Usa un file temporaneo per riprodurre da slave TDEIO"
 
 #. i18n: file kplayersettingsadvanced.ui line 396
 #: rc.cpp:1691
@@ -2862,7 +2862,7 @@ msgstr ""
 #: rc.cpp:1694
 #, no-c-format
 msgid "Use KIOSlave for"
-msgstr "Usa slave KIO per"
+msgstr "Usa slave TDEIO per"
 
 #. i18n: file kplayersettingsadvanced.ui line 418
 #: rc.cpp:1697
diff --git a/po/nl.po b/po/nl.po
index e99c4f3..1949fe5 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -598,7 +598,7 @@ msgstr ""
 "Het commando 'URL-adres afspelen' opent een dialoog waarin u een URL-adres kunt "
 "typen of plakken. Dit adres wordt toegevoegd aan de afspeellijst en afgespeeld. "
 "Het URL-adres kan een externe locatie over een netwerk zijn, een lokaal "
-"bestandspad of een URL-adres van een KDE KIO-slave."
+"bestandspad of een URL-adres van een KDE TDEIO-slave."
 
 #: kplayerplaylist.cpp:55
 msgid "Plays the %1 list"
@@ -1488,7 +1488,7 @@ msgstr "&KIOSlave gebruiken"
 #: rc.cpp:275 rc.cpp:290
 #, no-c-format
 msgid "Choose whether to use a KDE I/O Slave to play this file"
-msgstr "Kies of u een KDE KIO-slave wilt gebruiken om dit bestand af te spelen"
+msgstr "Kies of u een KDE TDEIO-slave wilt gebruiken om dit bestand af te spelen"
 
 #. i18n: file kplayerpropertiesadvanced.ui line 409
 #: rc.cpp:278 rc.cpp:293
@@ -1497,7 +1497,7 @@ msgid ""
 "Option to choose whether to use a KDE I/O Slave to play this file. Auto decides "
 "it automatically using options set in KPlayer Settings."
 msgstr ""
-"Hier kunt u kiezen of u een KDE KIO-slave wilt gebruiken om dit bestand af te "
+"Hier kunt u kiezen of u een KDE TDEIO-slave wilt gebruiken om dit bestand af te "
 "spelen. Auto bepaalt dit automatisch aan de hand van de instellingen van "
 "KPlayer."
 
@@ -1513,7 +1513,7 @@ msgstr "&Tijdelijk bestand gebruiken"
 msgid "Choose whether to use a temporary file for playing from KDE I/O Slave"
 msgstr ""
 "Kies of u een tijdelijk bestand wilt gebruiken voor het afspelen vanaf een KDE "
-"KIO-slave"
+"TDEIO-slave"
 
 #. i18n: file kplayerpropertiesadvanced.ui line 455
 #: rc.cpp:302 rc.cpp:317
@@ -1524,7 +1524,7 @@ msgid ""
 "for URLs passed directly to MPlayer."
 msgstr ""
 "Hier kunt u kiezen of u een tijdelijk bestand wilt gebruiken voor het afspelen "
-"vanaf een KDE KIO-slave. Standaard gebruikt de optie uit de instellingen van "
+"vanaf een KDE TDEIO-slave. Standaard gebruikt de optie uit de instellingen van "
 "KPlayer. Deze optie heeft geen effect op URL-adressen die rechtstreeks aan "
 "MPlayer worden doorgegeven."
 
diff --git a/po/pl.po b/po/pl.po
index a3825de..b3b9f8a 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -572,7 +572,7 @@ msgid ""
 msgstr ""
 "Polecenie odtworzenia URL umożliwia dodanie adresu URL do listy odtwarzania i "
 "odtworzenie go. URL może zawierać ścieżkę sieciową, lokalną lub być adresem "
-"obsługiwanym przez wtyczkę protokołu KIO."
+"obsługiwanym przez wtyczkę protokołu TDEIO."
 
 #: kplayerplaylist.cpp:55
 msgid "Plays the %1 list"
diff --git a/po/tr.po b/po/tr.po
index 64e63d5..1bbc5f8 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1444,7 +1444,7 @@ msgstr "zorla"
 #: rc.cpp:272
 #, no-c-format
 msgid "Use &KIOSlave"
-msgstr "KIO Köle &Kullan"
+msgstr "TDEIO Köle &Kullan"
 
 #. i18n: file kplayerpropertiesadvanced.ui line 406
 #: rc.cpp:275 rc.cpp:290