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

36 files changed, 85 insertions, 85 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index 0ea3119..f7ddb78 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2090,16 +2090,16 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
    AC_SUBST(LIB_TDEPIM, "-ltdepim")
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2107,13 +2107,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_TDECORE, "-ltdecore")
    AC_SUBST(LIB_TDEUI, "-ltdeui")
    AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-lkfile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
 else
    AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
@@ -2559,7 +2559,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3502,7 +3502,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 AC_SUBST(KDE_CHECK_PLUGIN)
 
diff --git a/configure.in b/configure.in
index 2135ff1..b2e6511 100644
--- a/configure.in
+++ b/configure.in
@@ -92,7 +92,7 @@ KDE_CHECK_HEADER(knotifyclient.h,
 KDE_CHECK_HEADER(kimiface.h,
 	[
 	AC_DEFINE(HAVE_KIMIFACE, 1, [Define if you have Kimiface headers] )
-	LIB_KIMIFACE="-lkimproxy"
+	LIB_KIMIFACE="-ltdeimproxy"
 	AC_SUBST(LIB_KIMIFACE)
 	])
 
diff --git a/doc/da/index.docbook b/doc/da/index.docbook
index b17382b..2e224a3 100644
--- a/doc/da/index.docbook
+++ b/doc/da/index.docbook
@@ -3083,12 +3083,12 @@ Limits on Real Name and Ident?
 	<mediaobjectco>
 		<imageobjectco>
 			<areaspec units="calspair">
-				<area id="pt-kimproxy-create-1" coords="1 1"/>
-				<area id="pt-kimproxy-create-2" coords="1 1"/>
-				<area id="pt-kimproxy-create-3" coords="1 1"/>
+				<area id="pt-tdeimproxy-create-1" coords="1 1"/>
+				<area id="pt-tdeimproxy-create-2" coords="1 1"/>
+				<area id="pt-tdeimproxy-create-3" coords="1 1"/>
 			</areaspec>
 			<imageobject>
-				<imagedata fileref="kimproxy_create_screen_co.png" format="PNG"/>
+				<imagedata fileref="tdeimproxy_create_screen_co.png" format="PNG"/>
 			</imageobject>
 		</imageobjectco>
 		<textobject>
@@ -3102,19 +3102,19 @@ Limits on Real Name and Ident?
 <para>
 <calloutlist>
 
-<callout arearefs="pt-kimproxy-create-1"
+<callout arearefs="pt-tdeimproxy-create-1"
 ><para
 >Aliasset udfyldes automatisk her. Hvis du kender personens rigtige navn, erstattes aliasset med det rigtige navn. </para
 ></callout>
 
-<callout arearefs="pt-kimproxy-create-2">
+<callout arearefs="pt-tdeimproxy-create-2">
 <para
 >Bemærk at aliasset <emphasis
 >ikke</emphasis
 > vises her. I stedet, ...</para>
 </callout>
 
-<callout arearefs="pt-kimproxy-create-3">
+<callout arearefs="pt-tdeimproxy-create-3">
 <para
 >Klik her. Fanebladet <guilabel
 >IM-adresser</guilabel
@@ -3130,7 +3130,7 @@ Limits on Real Name and Ident?
 >Vinduet IM-adresser.</screeninfo>
 	<mediaobject>
 		<imageobject>
-			<imagedata fileref="kimproxy_create_screen2.png" format="PNG"/>
+			<imagedata fileref="tdeimproxy_create_screen2.png" format="PNG"/>
 		</imageobject>
 		<textobject>
 			<phrase
diff --git a/doc/es/kimproxy_create_screen2.png b/doc/es/tdeimproxy_create_screen2.png
index e8e8f4b..e8e8f4b 100644
--- a/doc/es/kimproxy_create_screen2.png
+++ b/doc/es/tdeimproxy_create_screen2.png
diff --git a/doc/es/kimproxy_create_screen_co.png b/doc/es/tdeimproxy_create_screen_co.png
index c480880..c480880 100644
--- a/doc/es/kimproxy_create_screen_co.png
+++ b/doc/es/tdeimproxy_create_screen_co.png
diff --git a/doc/et/index.docbook b/doc/et/index.docbook
index 5408dd4..12a96fb 100644
--- a/doc/et/index.docbook
+++ b/doc/et/index.docbook
@@ -3117,12 +3117,12 @@ Limits on Real Name and Ident?
 	<mediaobjectco>
 		<imageobjectco>
 			<areaspec units="calspair">
-				<area id="pt-kimproxy-create-1" coords="1 1"/>
-				<area id="pt-kimproxy-create-2" coords="1 1"/>
-				<area id="pt-kimproxy-create-3" coords="1 1"/>
+				<area id="pt-tdeimproxy-create-1" coords="1 1"/>
+				<area id="pt-tdeimproxy-create-2" coords="1 1"/>
+				<area id="pt-tdeimproxy-create-3" coords="1 1"/>
 			</areaspec>
 			<imageobject>
-				<imagedata fileref="kimproxy_create_screen_co.png" format="PNG"/>
+				<imagedata fileref="tdeimproxy_create_screen_co.png" format="PNG"/>
 			</imageobject>
 		</imageobjectco>
 		<textobject>
@@ -3136,19 +3136,19 @@ Limits on Real Name and Ident?
 <para>
 <calloutlist>
 
-<callout arearefs="pt-kimproxy-create-1"
+<callout arearefs="pt-tdeimproxy-create-1"
 ><para
 >Siin on hüüdnimi automaatselt ette antud. Kui tead isiku tegelikku nime, kustuta hüüdnimi ja kirjuta tegelik nimi asemele. </para
 ></callout>
 
-<callout arearefs="pt-kimproxy-create-2">
+<callout arearefs="pt-tdeimproxy-create-2">
 <para
 >Pane tähele, et hüüdnimi <emphasis
 >ei ole</emphasis
 > siin näha. Selleks...</para>
 </callout>
 
-<callout arearefs="pt-kimproxy-create-3">
+<callout arearefs="pt-tdeimproxy-create-3">
 <para
 >klõpsa siia akna <guilabel
 >IM aadressid</guilabel
@@ -3164,7 +3164,7 @@ Limits on Real Name and Ident?
 >IM aadresside aken.</screeninfo>
 	<mediaobject>
 		<imageobject>
-			<imagedata fileref="kimproxy_create_screen2.png" format="PNG"/>
+			<imagedata fileref="tdeimproxy_create_screen2.png" format="PNG"/>
 		</imageobject>
 		<textobject>
 			<phrase
diff --git a/doc/it/index.docbook b/doc/it/index.docbook
index 84256c5..5f1c113 100644
--- a/doc/it/index.docbook
+++ b/doc/it/index.docbook
@@ -3075,12 +3075,12 @@ Limits on Real Name and Ident?
 	<mediaobjectco>
 		<imageobjectco>
 			<areaspec units="calspair">
-				<area id="pt-kimproxy-create-1" coords="1 1"/>
-				<area id="pt-kimproxy-create-2" coords="1 1"/>
-				<area id="pt-kimproxy-create-3" coords="1 1"/>
+				<area id="pt-tdeimproxy-create-1" coords="1 1"/>
+				<area id="pt-tdeimproxy-create-2" coords="1 1"/>
+				<area id="pt-tdeimproxy-create-3" coords="1 1"/>
 			</areaspec>
 			<imageobject>
-				<imagedata fileref="kimproxy_create_screen_co.png" format="PNG"/>
+				<imagedata fileref="tdeimproxy_create_screen_co.png" format="PNG"/>
 			</imageobject>
 		</imageobjectco>
 		<textobject>
@@ -3094,19 +3094,19 @@ Limits on Real Name and Ident?
 <para>
 <calloutlist>
 
-<callout arearefs="pt-kimproxy-create-1"
+<callout arearefs="pt-tdeimproxy-create-1"
 ><para
 >Il nick è inserito automaticamente qui. Se conosci il nome vero della persona, sostituiscilo al nick. </para
 ></callout>
 
-<callout arearefs="pt-kimproxy-create-2">
+<callout arearefs="pt-tdeimproxy-create-2">
 <para
 >Nota che il nick <emphasis
 >non</emphasis
 > appare qui. Invece, ..</para>
 </callout>
 
-<callout arearefs="pt-kimproxy-create-3">
+<callout arearefs="pt-tdeimproxy-create-3">
 <para
 >Fai clic qui. Apparirà la finestra <guilabel
 >Indirizzi IM</guilabel
@@ -3122,7 +3122,7 @@ Limits on Real Name and Ident?
 >La finestra Indirizzi IM.</screeninfo>
 	<mediaobject>
 		<imageobject>
-			<imagedata fileref="kimproxy_create_screen2.png" format="PNG"/>
+			<imagedata fileref="tdeimproxy_create_screen2.png" format="PNG"/>
 		</imageobject>
 		<textobject>
 			<phrase
diff --git a/doc/konversation/index.docbook b/doc/konversation/index.docbook
index 22ffd01..35ac068 100644
--- a/doc/konversation/index.docbook
+++ b/doc/konversation/index.docbook
@@ -2018,12 +2018,12 @@ choose
 	<mediaobjectco>
 		<imageobjectco>
 			<areaspec units="calspair">
-				<area id="pt-kimproxy-create-1" coords="1 1"/>
-				<area id="pt-kimproxy-create-2" coords="1 1"/>
-				<area id="pt-kimproxy-create-3" coords="1 1"/>
+				<area id="pt-tdeimproxy-create-1" coords="1 1"/>
+				<area id="pt-tdeimproxy-create-2" coords="1 1"/>
+				<area id="pt-tdeimproxy-create-3" coords="1 1"/>
 			</areaspec>
 			<imageobject>
-				<imagedata fileref="kimproxy_create_screen_co.png" format="PNG"/>
+				<imagedata fileref="tdeimproxy_create_screen_co.png" format="PNG"/>
 			</imageobject>
 		</imageobjectco>
 		<textobject>
@@ -2036,15 +2036,15 @@ choose
 <para>
 <calloutlist>
 
-<callout arearefs="pt-kimproxy-create-1"><para>The &nickname; is automatically filled in here.
+<callout arearefs="pt-tdeimproxy-create-1"><para>The &nickname; is automatically filled in here.
 If you know the person's real name, replace the &nickname; with the real name.
 </para></callout>
 
-<callout arearefs="pt-kimproxy-create-2">
+<callout arearefs="pt-tdeimproxy-create-2">
 <para>Notice that the &nickname; does <emphasis>not</emphasis> appear here.  Instead, ..</para>
 </callout>
 
-<callout arearefs="pt-kimproxy-create-3">
+<callout arearefs="pt-tdeimproxy-create-3">
 <para>Click here.  The <guilabel>IM Addresses</guilabel> window appears.</para></callout>
 
 </calloutlist>
@@ -2055,7 +2055,7 @@ If you know the person's real name, replace the &nickname; with the real name.
 	<screeninfo>The IM Addresses Window.</screeninfo>
 	<mediaobject>
 		<imageobject>
-			<imagedata fileref="kimproxy_create_screen2.png" format="PNG"/>
+			<imagedata fileref="tdeimproxy_create_screen2.png" format="PNG"/>
 		</imageobject>
 		<textobject>
 			<phrase>The IM Addresses Window.</phrase>
diff --git a/doc/konversation/kimproxy_create_screen2.png b/doc/konversation/tdeimproxy_create_screen2.png
index 9e48ffb..9e48ffb 100644
--- a/doc/konversation/kimproxy_create_screen2.png
+++ b/doc/konversation/tdeimproxy_create_screen2.png
diff --git a/doc/konversation/kimproxy_create_screen_co.png b/doc/konversation/tdeimproxy_create_screen_co.png
index 281460d..281460d 100644
--- a/doc/konversation/kimproxy_create_screen_co.png
+++ b/doc/konversation/tdeimproxy_create_screen_co.png
diff --git a/doc/pt/index.docbook b/doc/pt/index.docbook
index 68a814a..57a8894 100644
--- a/doc/pt/index.docbook
+++ b/doc/pt/index.docbook
@@ -3103,12 +3103,12 @@ Limits on Real Name and Ident?
 	<mediaobjectco>
 		<imageobjectco>
 			<areaspec units="calspair">
-				<area id="pt-kimproxy-create-1" coords="1 1"/>
-				<area id="pt-kimproxy-create-2" coords="1 1"/>
-				<area id="pt-kimproxy-create-3" coords="1 1"/>
+				<area id="pt-tdeimproxy-create-1" coords="1 1"/>
+				<area id="pt-tdeimproxy-create-2" coords="1 1"/>
+				<area id="pt-tdeimproxy-create-3" coords="1 1"/>
 			</areaspec>
 			<imageobject>
-				<imagedata fileref="kimproxy_create_screen_co.png" format="PNG"/>
+				<imagedata fileref="tdeimproxy_create_screen_co.png" format="PNG"/>
 			</imageobject>
 		</imageobjectco>
 		<textobject>
@@ -3122,19 +3122,19 @@ Limits on Real Name and Ident?
 <para>
 <calloutlist>
 
-<callout arearefs="pt-kimproxy-create-1"
+<callout arearefs="pt-tdeimproxy-create-1"
 ><para
 >O &nickname; é preenchido aqui automaticamente. Se souber o nome verdadeiro da pessoa, substitua o &nickname; pelo nome verdadeiro. </para
 ></callout>
 
-<callout arearefs="pt-kimproxy-create-2">
+<callout arearefs="pt-tdeimproxy-create-2">
 <para
 >Repare que o &nickname; <emphasis
 >não</emphasis
 > aparece aqui. Em alternativa, ....</para>
 </callout>
 
-<callout arearefs="pt-kimproxy-create-3">
+<callout arearefs="pt-tdeimproxy-create-3">
 <para
 >Carregue aqui. Aparece então a janela dos <guilabel
 >Endereços de IM</guilabel
@@ -3150,7 +3150,7 @@ Limits on Real Name and Ident?
 >A Janela dos Endereços de IM.</screeninfo>
 	<mediaobject>
 		<imageobject>
-			<imagedata fileref="kimproxy_create_screen2.png" format="PNG"/>
+			<imagedata fileref="tdeimproxy_create_screen2.png" format="PNG"/>
 		</imageobject>
 		<textobject>
 			<phrase
diff --git a/doc/ru/index.docbook b/doc/ru/index.docbook
index 1b9442b..56bdfe0 100644
--- a/doc/ru/index.docbook
+++ b/doc/ru/index.docbook
@@ -3133,12 +3133,12 @@ Limits on Real Name and Ident?
 	<mediaobjectco>
 		<imageobjectco>
 			<areaspec units="calspair">
-				<area id="pt-kimproxy-create-1" coords="1 1"/>
-				<area id="pt-kimproxy-create-2" coords="1 1"/>
-				<area id="pt-kimproxy-create-3" coords="1 1"/>
+				<area id="pt-tdeimproxy-create-1" coords="1 1"/>
+				<area id="pt-tdeimproxy-create-2" coords="1 1"/>
+				<area id="pt-tdeimproxy-create-3" coords="1 1"/>
 			</areaspec>
 			<imageobject>
-				<imagedata fileref="kimproxy_create_screen_co.png" format="PNG"/>
+				<imagedata fileref="tdeimproxy_create_screen_co.png" format="PNG"/>
 			</imageobject>
 		</imageobjectco>
 		<textobject>
@@ -3152,19 +3152,19 @@ Limits on Real Name and Ident?
 <para>
 <calloutlist>
 
-<callout arearefs="pt-kimproxy-create-1"
+<callout arearefs="pt-tdeimproxy-create-1"
 ><para
 >&nickname; здесь вводится автоматически. Если вы знаете реальное имя - замените им &nickname;. </para
 ></callout>
 
-<callout arearefs="pt-kimproxy-create-2">
+<callout arearefs="pt-tdeimproxy-create-2">
 <para
 >Учтите, что &nickname; <emphasis
 >не</emphasis
 > появляется здесь. Вместо этого, ..</para>
 </callout>
 
-<callout arearefs="pt-kimproxy-create-3">
+<callout arearefs="pt-tdeimproxy-create-3">
 <para
 >Щёлкните здесь. Появится окно <guilabel
 >IM-адреса</guilabel
@@ -3180,7 +3180,7 @@ Limits on Real Name and Ident?
 >Окно IM-адреса</screeninfo>
 	<mediaobject>
 		<imageobject>
-			<imagedata fileref="kimproxy_create_screen2.png" format="PNG"/>
+			<imagedata fileref="tdeimproxy_create_screen2.png" format="PNG"/>
 		</imageobject>
 		<textobject>
 			<phrase
diff --git a/doc/sv/index.docbook b/doc/sv/index.docbook
index 33c8f9e..df50e85 100644
--- a/doc/sv/index.docbook
+++ b/doc/sv/index.docbook
@@ -3107,12 +3107,12 @@ Limits on Real Name and Ident?
 	<mediaobjectco>
 		<imageobjectco>
 			<areaspec units="calspair">
-				<area id="pt-kimproxy-create-1" coords="1 1"/>
-				<area id="pt-kimproxy-create-2" coords="1 1"/>
-				<area id="pt-kimproxy-create-3" coords="1 1"/>
+				<area id="pt-tdeimproxy-create-1" coords="1 1"/>
+				<area id="pt-tdeimproxy-create-2" coords="1 1"/>
+				<area id="pt-tdeimproxy-create-3" coords="1 1"/>
 			</areaspec>
 			<imageobject>
-				<imagedata fileref="kimproxy_create_screen_co.png" format="PNG"/>
+				<imagedata fileref="tdeimproxy_create_screen_co.png" format="PNG"/>
 			</imageobject>
 		</imageobjectco>
 		<textobject>
@@ -3126,19 +3126,19 @@ Limits on Real Name and Ident?
 <para>
 <calloutlist>
 
-<callout arearefs="pt-kimproxy-create-1"
+<callout arearefs="pt-tdeimproxy-create-1"
 ><para
 >Smeknamnet fylls automatiskt i här. Om du vet personens riktiga namn, ersätt smeknamnet med det riktiga namnet. </para
 ></callout>
 
-<callout arearefs="pt-kimproxy-create-2">
+<callout arearefs="pt-tdeimproxy-create-2">
 <para
 >Observera att smeknamnet <emphasis
 >inte</emphasis
 > visas här. Istället, ...</para>
 </callout>
 
-<callout arearefs="pt-kimproxy-create-3">
+<callout arearefs="pt-tdeimproxy-create-3">
 <para
 >Klicka här. Fönstret <guilabel
 >Direktmeddelandeadresser</guilabel
@@ -3154,7 +3154,7 @@ Limits on Real Name and Ident?
 >Fönstret Direktmeddelandeadresser.</screeninfo>
 	<mediaobject>
 		<imageobject>
-			<imagedata fileref="kimproxy_create_screen2.png" format="PNG"/>
+			<imagedata fileref="tdeimproxy_create_screen2.png" format="PNG"/>
 		</imageobject>
 		<textobject>
 			<phrase
diff --git a/doc/sv/kimproxy_create_screen2.png b/doc/sv/tdeimproxy_create_screen2.png
index 381ad1d..381ad1d 100644
--- a/doc/sv/kimproxy_create_screen2.png
+++ b/doc/sv/tdeimproxy_create_screen2.png
diff --git a/doc/sv/kimproxy_create_screen_co.png b/doc/sv/tdeimproxy_create_screen_co.png
index 116bc46..116bc46 100644
--- a/doc/sv/kimproxy_create_screen_co.png
+++ b/doc/sv/tdeimproxy_create_screen_co.png
diff --git a/konversation/configure.in.in b/konversation/configure.in.in
index d6d72da..a0bc693 100644
--- a/konversation/configure.in.in
+++ b/konversation/configure.in.in
@@ -10,7 +10,7 @@ KDE_CHECK_HEADER(knotifyclient.h,
 KDE_CHECK_HEADER(kimiface.h,
 	[
 	AC_DEFINE(HAVE_KIMIFACE, 1, [Define if you have Kimiface headers] )
-	LIB_KIMIFACE="-lkimproxy"
+	LIB_KIMIFACE="-ltdeimproxy"
 	AC_SUBST(LIB_KIMIFACE)
 	])
 
diff --git a/konversation/images/icons/README-kimproxy b/konversation/images/icons/README-tdeimproxy
index e0bf8eb..e0bf8eb 100644
--- a/konversation/images/icons/README-kimproxy
+++ b/konversation/images/icons/README-tdeimproxy
diff --git a/konversation/images/icons/cr16-action-kimproxyaway.png b/konversation/images/icons/cr16-action-tdeimproxyaway.png
index 5b722ce..5b722ce 100644
--- a/konversation/images/icons/cr16-action-kimproxyaway.png
+++ b/konversation/images/icons/cr16-action-tdeimproxyaway.png
diff --git a/konversation/images/icons/cr16-action-kimproxyoffline.png b/konversation/images/icons/cr16-action-tdeimproxyoffline.png
index d120047..d120047 100644
--- a/konversation/images/icons/cr16-action-kimproxyoffline.png
+++ b/konversation/images/icons/cr16-action-tdeimproxyoffline.png
diff --git a/konversation/images/icons/cr16-action-kimproxyonline.png b/konversation/images/icons/cr16-action-tdeimproxyonline.png
index 911eaac..911eaac 100644
--- a/konversation/images/icons/cr16-action-kimproxyonline.png
+++ b/konversation/images/icons/cr16-action-tdeimproxyonline.png
diff --git a/konversation/images/icons/cr22-action-kimproxyaway.png b/konversation/images/icons/cr22-action-tdeimproxyaway.png
index 9548953..9548953 100644
--- a/konversation/images/icons/cr22-action-kimproxyaway.png
+++ b/konversation/images/icons/cr22-action-tdeimproxyaway.png
diff --git a/konversation/images/icons/cr22-action-kimproxyoffline.png b/konversation/images/icons/cr22-action-tdeimproxyoffline.png
index 1e76853..1e76853 100644
--- a/konversation/images/icons/cr22-action-kimproxyoffline.png
+++ b/konversation/images/icons/cr22-action-tdeimproxyoffline.png
diff --git a/konversation/images/icons/cr22-action-kimproxyonline.png b/konversation/images/icons/cr22-action-tdeimproxyonline.png
index 7bceadd..7bceadd 100644
--- a/konversation/images/icons/cr22-action-kimproxyonline.png
+++ b/konversation/images/icons/cr22-action-tdeimproxyonline.png
diff --git a/konversation/images/icons/cr32-action-kimproxyaway.png b/konversation/images/icons/cr32-action-tdeimproxyaway.png
index bd8048e..bd8048e 100644
--- a/konversation/images/icons/cr32-action-kimproxyaway.png
+++ b/konversation/images/icons/cr32-action-tdeimproxyaway.png
diff --git a/konversation/images/icons/cr32-action-kimproxyoffline.png b/konversation/images/icons/cr32-action-tdeimproxyoffline.png
index 3849c9c..3849c9c 100644
--- a/konversation/images/icons/cr32-action-kimproxyoffline.png
+++ b/konversation/images/icons/cr32-action-tdeimproxyoffline.png
diff --git a/konversation/images/icons/cr32-action-kimproxyonline.png b/konversation/images/icons/cr32-action-tdeimproxyonline.png
index 177f8bb..177f8bb 100644
--- a/konversation/images/icons/cr32-action-kimproxyonline.png
+++ b/konversation/images/icons/cr32-action-tdeimproxyonline.png
diff --git a/konversation/images/icons/crsc-action-kimproxyaway.svgz b/konversation/images/icons/crsc-action-tdeimproxyaway.svgz
index 473befc..473befc 100644
--- a/konversation/images/icons/crsc-action-kimproxyaway.svgz
+++ b/konversation/images/icons/crsc-action-tdeimproxyaway.svgz
diff --git a/konversation/images/icons/crsc-action-kimproxyoffline.svgz b/konversation/images/icons/crsc-action-tdeimproxyoffline.svgz
index b983517..b983517 100644
--- a/konversation/images/icons/crsc-action-kimproxyoffline.svgz
+++ b/konversation/images/icons/crsc-action-tdeimproxyoffline.svgz
diff --git a/konversation/images/icons/crsc-action-kimproxyonline.svgz b/konversation/images/icons/crsc-action-tdeimproxyonline.svgz
index ffb4f42..ffb4f42 100644
--- a/konversation/images/icons/crsc-action-kimproxyonline.svgz
+++ b/konversation/images/icons/crsc-action-tdeimproxyonline.svgz
diff --git a/konversation/src/Makefile.am b/konversation/src/Makefile.am
index 8ce9955..aab2be9 100644
--- a/konversation/src/Makefile.am
+++ b/konversation/src/Makefile.am
@@ -41,7 +41,7 @@ xdg_apps_DATA = konversation.desktop
 INCLUDES= -Ilinkaddressbook -I$(srcdir)/linkaddressbook -Iblowfish -I$(srcdir)/blowfish\
           -Iconfig -I$(srcdir)/config $(all_includes)
 # the library search path.
-konversation_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+konversation_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 rcdir = $(kde_datadir)/konversation
 rc_DATA = konversationui.rc eventsrc
diff --git a/konversation/src/autoreplace_preferences.cpp b/konversation/src/autoreplace_preferences.cpp
index 2f785bc..2c870d4 100644
--- a/konversation/src/autoreplace_preferences.cpp
+++ b/konversation/src/autoreplace_preferences.cpp
@@ -26,7 +26,7 @@
 #include <klocale.h>
 #include <klineedit.h>
 #include <klistview.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <kregexpeditorinterface.h>
 
 #define DIRECTION_OUTPUT 0
diff --git a/konversation/src/highlight_preferences.cpp b/konversation/src/highlight_preferences.cpp
index c8f884f..936ff2d 100644
--- a/konversation/src/highlight_preferences.cpp
+++ b/konversation/src/highlight_preferences.cpp
@@ -30,7 +30,7 @@
 #include <klineedit.h>
 #include <kcolorbutton.h>
 #include <klocale.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <kregexpeditorinterface.h>
 #include <kiconloader.h>
 
diff --git a/konversation/src/images.cpp b/konversation/src/images.cpp
index 133dd15..4ffb2c0 100644
--- a/konversation/src/images.cpp
+++ b/konversation/src/images.cpp
@@ -39,9 +39,9 @@ Images::~Images()
 {
 }
 
-TQIconSet Images::getKimproxyAway() const { return kimproxyAway; }
-TQIconSet Images::getKimproxyOnline() const { return kimproxyOnline; }
-TQIconSet Images::getKimproxyOffline() const { return kimproxyOffline; }
+TQIconSet Images::getKimproxyAway() const { return tdeimproxyAway; }
+TQIconSet Images::getKimproxyOnline() const { return tdeimproxyOnline; }
+TQIconSet Images::getKimproxyOffline() const { return tdeimproxyOffline; }
 
 TQPixmap Images::getNickIcon(NickPrivilege privilege,bool isAway) const
 {
@@ -73,9 +73,9 @@ void Images::initializeLeds()
 
 void Images::initializeKimifaceIcons()
 {
-    kimproxyAway = TDEGlobal::iconLoader()->loadIconSet("kimproxyaway",KIcon::Small);
-    kimproxyOnline = TDEGlobal::iconLoader()->loadIconSet("kimproxyonline",KIcon::Small);
-    kimproxyOffline = TDEGlobal::iconLoader()->loadIconSet("kimproxyoffline",KIcon::Small);
+    tdeimproxyAway = TDEGlobal::iconLoader()->loadIconSet("tdeimproxyaway",KIcon::Small);
+    tdeimproxyOnline = TDEGlobal::iconLoader()->loadIconSet("tdeimproxyonline",KIcon::Small);
+    tdeimproxyOffline = TDEGlobal::iconLoader()->loadIconSet("tdeimproxyoffline",KIcon::Small);
 }
 
 // NickIcons
diff --git a/konversation/src/images.h b/konversation/src/images.h
index 4f61c62..b985a3e 100644
--- a/konversation/src/images.h
+++ b/konversation/src/images.h
@@ -93,9 +93,9 @@ class Images : public TQObject
         TQColor m_nickColor;
         TQColor m_highlightsColor;
 
-        TQIconSet kimproxyAway;
-        TQIconSet kimproxyOnline;
-        TQIconSet kimproxyOffline;
+        TQIconSet tdeimproxyAway;
+        TQIconSet tdeimproxyOnline;
+        TQIconSet tdeimproxyOffline;
 
                                                   // [privilege][away]
         TQPixmap nickIcons[_NickPrivilege_COUNT][2];
diff --git a/konversation/src/konsolepanel.h b/konversation/src/konsolepanel.h
index 88c0f81..91c66d5 100644
--- a/konversation/src/konsolepanel.h
+++ b/konversation/src/konsolepanel.h
@@ -14,7 +14,7 @@
 
 #include "chatwindow.h"
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 
 
 class KonsolePanel : public ChatWindow
diff --git a/konversation/src/konversation.upd b/konversation/src/konversation.upd
index 0909314..5944d8a 100644
--- a/konversation/src/konversation.upd
+++ b/konversation/src/konversation.upd
@@ -131,7 +131,7 @@ File=konversationrc
 Group=Led Colors
 RemoveGroup=Led Colors
 
-Id=0.19-cleanup-kmditaskbar
+Id=0.19-cleanup-tdemditaskbar
 File=konversationrc
 Group=MainWindow Toolbar KMdiTaskBar
 RemoveGroup=MainWindow Toolbar KMdiTaskBar