Additional kde to tde renaming

25 files changed, 59 insertions, 59 deletions

diff --git a/kioslave/DEBUG.howto b/kioslave/DEBUG.howto
index 5275a26eb..d4873e021 100644
--- a/kioslave/DEBUG.howto
+++ b/kioslave/DEBUG.howto
@@ -4,8 +4,8 @@ How does an io-slave get started?
 =================================
 
 Your application request 'klauncher' via DCOP for a slave. If 'klauncher' does 
-not have an idle slave ready, it will ask kdeinit to start a new one.
-kdeinit forks and dlopens the library that contains the io-slave.
+not have an idle slave ready, it will ask tdeinit to start a new one.
+tdeinit forks and dlopens the library that contains the io-slave.
 Then it calls kdemain() or, if that is not present, main() in the library.
 
 
@@ -18,22 +18,22 @@ that slaves for a certain protocol are started in debug mode.
 
 E.g. to start all 'http' slaves in debug mode, you type:
 
-	KDE_SLAVE_DEBUG_WAIT=http kdeinit
+	KDE_SLAVE_DEBUG_WAIT=http tdeinit
 
-This will restart 'kdeinit' and 'klauncher'.
+This will restart 'tdeinit' and 'klauncher'.
 
 When your application now requests a http slave, the slave will be started
-by kdeinit, but before it calls kdemain() (cq. main()) it will suspend the
+by tdeinit, but before it calls kdemain() (cq. main()) it will suspend the
 slave by sending it a SIGSTOP signal.
 
-In the terminal from which you started kdeinit you will get the following
+In the terminal from which you started tdeinit you will get the following
 message:
 
-kdeinit: Suspending process
-kdeinit: 'gdb kdeinit 16779' to debug
-kdeinit: 'kill -SIGCONT 16779' to continue
+tdeinit: Suspending process
+tdeinit: 'gdb tdeinit 16779' to debug
+tdeinit: 'kill -SIGCONT 16779' to continue
 
-You can now debug your slave by typing (or pasting) 'gdb kdeinit 16779' in
+You can now debug your slave by typing (or pasting) 'gdb tdeinit 16779' in
 a terminal. If you don't want to debug a slave you can let it continue by
 sending it a SIGCONT by typing 'kill -SIGCONT 16779'.
 
@@ -51,9 +51,9 @@ Debugging io-slaves with valgrind
 KLauncher can be told to run certain io-slaves through valgrind. The following
 command can be used to let klauncher run all https io-slaves via valgrind:
 
-	KDE_SLAVE_VALGRIND=https kdeinit
+	KDE_SLAVE_VALGRIND=https tdeinit
 
-The valgrind output will appear as the stderr output of the kdeinit process.
+The valgrind output will appear as the stderr output of the tdeinit process.
 The $VALGRIND_OPTS environment variable can be used to pass options to valgrind.
 If you want to use a different skin:
 
@@ -83,7 +83,7 @@ kioslaverc:
 [SMB]
 DebugLevel=100
 
-This will print additional debug info to the stderr of your kdeinit process,
+This will print additional debug info to the stderr of your tdeinit process,
 which typically ends up in ~/.X.err or ~/.xsession-errors
 
 Happy debugging.
diff --git a/kioslave/about/Makefile.am b/kioslave/about/Makefile.am
index 67f346f84..ff410f516 100644
--- a/kioslave/about/Makefile.am
+++ b/kioslave/about/Makefile.am
@@ -1,7 +1,7 @@
 ## Makefile.am of kdebase/kioslave/about
 
 INCLUDES= $(all_includes)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 ####### Files
 
diff --git a/kioslave/cgi/kcmcgi/Makefile.am b/kioslave/cgi/kcmcgi/Makefile.am
index abfef594b..32f4be3ea 100644
--- a/kioslave/cgi/kcmcgi/Makefile.am
+++ b/kioslave/cgi/kcmcgi/Makefile.am
@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_cgi.la
 
 kcm_cgi_la_SOURCES = kcmcgi.cpp
 kcm_cgi_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
-kcm_cgi_la_LIBADD = -lkdeui $(LIB_KIO)
+kcm_cgi_la_LIBADD = -ltdeui $(LIB_KIO)
 
 INCLUDES= $(all_includes) 
 
diff --git a/kioslave/finger/Makefile.am b/kioslave/finger/Makefile.am
index 981556099..ce6413fa8 100644
--- a/kioslave/finger/Makefile.am
+++ b/kioslave/finger/Makefile.am
@@ -2,7 +2,7 @@
 ## Edit from Makefile.am of kdebase/kioslave/man
 
 INCLUDES= $(all_includes)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 ####### Files
 
diff --git a/kioslave/fish/Makefile.am b/kioslave/fish/Makefile.am
index 6e3ac84ed..6446e8182 100644
--- a/kioslave/fish/Makefile.am
+++ b/kioslave/fish/Makefile.am
@@ -1,7 +1,7 @@
 kde_module_LTLIBRARIES = kio_fish.la
 
 INCLUDES = $(all_includes)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 kio_fish_la_SOURCES = fish.cpp
 kio_fish_la_LIBADD = $(LIB_KSYCOCA) $(LIBUTIL) 
diff --git a/kioslave/home/kdedmodule/CMakeLists.txt b/kioslave/home/kdedmodule/CMakeLists.txt
index 0d86f52f7..64d343f84 100644
--- a/kioslave/home/kdedmodule/CMakeLists.txt
+++ b/kioslave/home/kdedmodule/CMakeLists.txt
@@ -36,6 +36,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kdeinit_kded-shared
+  LINK tdeinit_kded-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kioslave/mac/Makefile.am b/kioslave/mac/Makefile.am
index e50d1c56b..8cf6b1fa7 100644
--- a/kioslave/mac/Makefile.am
+++ b/kioslave/mac/Makefile.am
@@ -1,7 +1,7 @@
 ## Makfile.am for kio_mac
 
 INCLUDES= $(all_includes)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 ####### Files
 
diff --git a/kioslave/man/Makefile.am b/kioslave/man/Makefile.am
index a0a8f20c0..3c5c6c78d 100644
--- a/kioslave/man/Makefile.am
+++ b/kioslave/man/Makefile.am
@@ -1,14 +1,14 @@
 ## Makefile.am of kdebase/kioslave/man
 
 INCLUDES= $(all_includes)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 EXTRA_PROGRAMS = kio_man_test man2html
 
 ####### just for testing (j.habenicht@europemail.com, 15.02.2001)
 
 kio_man_test_SOURCES = kio_man_test.cpp
-kio_man_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kio_man_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 kio_man_test_LDADD = man2html.lo kio_man.lo $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
 
 ####### Files
@@ -39,7 +39,7 @@ messages:
 
 man2html_SOURCES = dummy.cpp
 man2html_LDADD = man2html_simple.o $(LIB_QT)
-man2html_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+man2html_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 dummy.cpp:
 	echo > $@
diff --git a/kioslave/media/mediamanager/CMakeLists.txt b/kioslave/media/mediamanager/CMakeLists.txt
index 58854b630..411091365 100644
--- a/kioslave/media/mediamanager/CMakeLists.txt
+++ b/kioslave/media/mediamanager/CMakeLists.txt
@@ -47,7 +47,7 @@ if( WITH_HAL )
 
   tde_add_kpart( ${target} AUTOMOC
     SOURCES ${${target}_SRCS}
-    LINK mediacommon-static kdeinit_kded-shared ${HAL_LIBRARIES} -lhal-storage ${DBUS_TQT_LIBRARIES}
+    LINK mediacommon-static tdeinit_kded-shared ${HAL_LIBRARIES} -lhal-storage ${DBUS_TQT_LIBRARIES}
     DESTINATION ${PLUGIN_INSTALL_DIR}
   )
 else( )
@@ -59,7 +59,7 @@ else( )
 
   tde_add_kpart( ${target} AUTOMOC
     SOURCES ${${target}_SRCS}
-    LINK mediacommon-static kdeinit_kded-shared
+    LINK mediacommon-static tdeinit_kded-shared
     DESTINATION ${PLUGIN_INSTALL_DIR}
   )
 endif( )
diff --git a/kioslave/media/mediamanager/halbackend.cpp b/kioslave/media/mediamanager/halbackend.cpp
index f4250f1ba..58e2992e0 100644
--- a/kioslave/media/mediamanager/halbackend.cpp
+++ b/kioslave/media/mediamanager/halbackend.cpp
@@ -1079,37 +1079,37 @@ bool HALBackend::setMountoptions(const TQString &name, const TQStringList &optio
     return true;
 }
 
-TQString startKdeSudoProcess(const TQString& kdesudoPath, const TQString& command,
+TQString startKdeSudoProcess(const TQString& tdesudoPath, const TQString& command,
         const TQString& dialogCaption, const TQString& dialogComment)
 {
-    KProcess kdesudoProcess;
+    KProcess tdesudoProcess;
 
-    kdesudoProcess << kdesudoPath
+    tdesudoProcess << tdesudoPath
 		<< "-d"
 		<< "--noignorebutton"
 		<< "--caption" << dialogCaption
 		<< "--comment" << dialogComment
 		<< "-c" << command;
 
-    // @todo handle kdesudo output
-    kdesudoProcess.start(KProcess::Block);
+    // @todo handle tdesudo output
+    tdesudoProcess.start(KProcess::Block);
 
     return TQString();
 }
 
-TQString startKdeSuProcess(const TQString& kdesuPath, const TQString& command,
+TQString startKdeSuProcess(const TQString& tdesuPath, const TQString& command,
         const TQString& dialogCaption)
 {
-    KProcess kdesuProcess;
+    KProcess tdesuProcess;
 
-    kdesuProcess << kdesuPath
+    tdesuProcess << tdesuPath
 		<< "-d"
 		<< "--noignorebutton"
 		<< "--caption" << dialogCaption
 		<< "-c" << command;
 
-    // @todo handle kdesu output
-    kdesuProcess.start(KProcess::Block);
+    // @todo handle tdesu output
+    tdesuProcess.start(KProcess::Block);
 
     return TQString();
 }
@@ -1118,15 +1118,15 @@ TQString startPrivilegedProcess(const TQString& command, const TQString& dialogC
 {
     TQString error;
 
-    TQString kdesudoPath = KStandardDirs::findExe("kdesudo");
+    TQString tdesudoPath = KStandardDirs::findExe("tdesudo");
 
-    if (!kdesudoPath.isEmpty())
-        error = startKdeSudoProcess(kdesudoPath, command, dialogCaption, dialogComment);
+    if (!tdesudoPath.isEmpty())
+        error = startKdeSudoProcess(tdesudoPath, command, dialogCaption, dialogComment);
     else {
-        TQString kdesuPath = KStandardDirs::findExe("kdesu");
+        TQString tdesuPath = KStandardDirs::findExe("tdesu");
 
-        if (!kdesuPath.isEmpty())
-            error = startKdeSuProcess(kdesuPath, command, dialogCaption);
+        if (!tdesuPath.isEmpty())
+            error = startKdeSuProcess(tdesuPath, command, dialogCaption);
     }
 
     return error;
diff --git a/kioslave/media/medianotifier/CMakeLists.txt b/kioslave/media/medianotifier/CMakeLists.txt
index 7d67c736a..44d6cb308 100644
--- a/kioslave/media/medianotifier/CMakeLists.txt
+++ b/kioslave/media/medianotifier/CMakeLists.txt
@@ -38,6 +38,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK mediacommon-static kdeinit_kded-shared
+  LINK mediacommon-static tdeinit_kded-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kioslave/media/mounthelper/Makefile.am b/kioslave/media/mounthelper/Makefile.am
index 4030305c9..99bba4df9 100644
--- a/kioslave/media/mounthelper/Makefile.am
+++ b/kioslave/media/mounthelper/Makefile.am
@@ -5,7 +5,7 @@ AM_LDFLAGS = $(all_libraries)
 
 kio_media_mounthelper_SOURCES = kio_media_mounthelper.cpp decryptdialog.ui dialog.cpp
 
-kio_media_mounthelper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kio_media_mounthelper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 kio_media_mounthelper_LDADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) $(LIB_KDEUI)
 
 METASOURCES = AUTO
diff --git a/kioslave/nfs/Makefile.am b/kioslave/nfs/Makefile.am
index ab03da8e5..dfa24a928 100644
--- a/kioslave/nfs/Makefile.am
+++ b/kioslave/nfs/Makefile.am
@@ -1,7 +1,7 @@
 ## Makefile.am of kdebase/kioslave/man
 
 INCLUDES= $(all_includes)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 ####### Files
 
diff --git a/kioslave/nfs/kio_nfs.cpp b/kioslave/nfs/kio_nfs.cpp
index 7c3a67e9d..96e51f1d3 100644
--- a/kioslave/nfs/kio_nfs.cpp
+++ b/kioslave/nfs/kio_nfs.cpp
@@ -71,7 +71,7 @@
 using namespace KIO;
 using namespace std;
 
-//this is taken from kdelibs/kdecore/fakes.cpp
+//this is taken from kdelibs/tdecore/fakes.cpp
 //#if !defined(HAVE_GETDOMAINNAME)
 
 int x_getdomainname(char *name, size_t len)
diff --git a/kioslave/remote/kdedmodule/CMakeLists.txt b/kioslave/remote/kdedmodule/CMakeLists.txt
index 52e84e9ad..2db56916c 100644
--- a/kioslave/remote/kdedmodule/CMakeLists.txt
+++ b/kioslave/remote/kdedmodule/CMakeLists.txt
@@ -36,6 +36,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kdeinit_kded-shared
+  LINK tdeinit_kded-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kioslave/sftp/CHANGELOG b/kioslave/sftp/CHANGELOG
index b41c17019..2b5f18de3 100644
--- a/kioslave/sftp/CHANGELOG
+++ b/kioslave/sftp/CHANGELOG
@@ -10,7 +10,7 @@
   - Write our own askpass program using kde
   - set env SSH_ASKPASS_PROGRAM before launching
     -how to do this? KProcess doesn't give us access to env variables.
-  - Our askpass program can probably talk to the kdesu daemon to implement caching.
+  - Our askpass program can probably talk to the tdesu daemon to implement caching.
 - chmod() succeeds, but konqueror always puts permissions to 0 afterwards. The properties
   dialog is right though.
   Nevermind - ftp ioslave does this too! Maybe a bug with konqueror.
diff --git a/kioslave/sftp/Makefile.am b/kioslave/sftp/Makefile.am
index bbb661b73..659621d91 100644
--- a/kioslave/sftp/Makefile.am
+++ b/kioslave/sftp/Makefile.am
@@ -1,7 +1,7 @@
 ## Makefile.am of kdebase/kioslave/sftp
 
 INCLUDES = $(all_includes)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 METASOURCES = AUTO
 
 ####### Files
diff --git a/kioslave/sftp/kio_sftp.cpp b/kioslave/sftp/kio_sftp.cpp
index 2c8f995a5..2316c8c2d 100644
--- a/kioslave/sftp/kio_sftp.cpp
+++ b/kioslave/sftp/kio_sftp.cpp
@@ -18,7 +18,7 @@
 /*
 DEBUGGING
 We are pretty much left with kdDebug messages for debugging. We can't use a gdb
-as described in the ioslave DEBUG.howto because kdeinit has to run in a terminal.
+as described in the ioslave DEBUG.howto because tdeinit has to run in a terminal.
 Ssh will detect this terminal and ask for a password there, but will just get garbage.
 So we can't connect.
 */
diff --git a/kioslave/sftp/process.cpp b/kioslave/sftp/process.cpp
index ca99b36bb..5fcf734c9 100644
--- a/kioslave/sftp/process.cpp
+++ b/kioslave/sftp/process.cpp
@@ -1,7 +1,7 @@
 /* vi: ts=8 sts=4 sw=4
  *
  *
- * This file is part of the KDE project, module kdesu.
+ * This file is part of the KDE project, module tdesu.
  * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
  * 
  * This file contains code from TEShell.C of the KDE konsole. 
@@ -51,8 +51,8 @@
 #include <kstandarddirs.h>
 
 #include "process.h"
-#include <kdesu/kdesu_pty.h>
-#include <kdesu/kcookie.h>
+#include <tdesu/tdesu_pty.h>
+#include <tdesu/kcookie.h>
 
 
 MyPtyProcess::MyPtyProcess()
diff --git a/kioslave/sftp/process.h b/kioslave/sftp/process.h
index b0f20f77b..215c51ea7 100644
--- a/kioslave/sftp/process.h
+++ b/kioslave/sftp/process.h
@@ -1,7 +1,7 @@
 /* vi: ts=8 sts=4 sw=4
  *
  *
- * This file is part of the KDE project, module kdesu.
+ * This file is part of the KDE project, module tdesu.
  * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
  * 
  * This is free software; you can use this library under the GNU Library 
diff --git a/kioslave/system/kdedmodule/CMakeLists.txt b/kioslave/system/kdedmodule/CMakeLists.txt
index 720c5dd00..6df004620 100644
--- a/kioslave/system/kdedmodule/CMakeLists.txt
+++ b/kioslave/system/kdedmodule/CMakeLists.txt
@@ -36,6 +36,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kdeinit_kded-shared
+  LINK tdeinit_kded-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kioslave/tar/Makefile.am b/kioslave/tar/Makefile.am
index 8705ef26c..acb37faca 100644
--- a/kioslave/tar/Makefile.am
+++ b/kioslave/tar/Makefile.am
@@ -1,7 +1,7 @@
 ## Makefile.am of kdebase/kioslave/tar
 
 INCLUDES = $(all_includes)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 METASOURCES = AUTO
 
 kde_module_LTLIBRARIES = kio_tar.la
diff --git a/kioslave/thumbnail/CMakeLists.txt b/kioslave/thumbnail/CMakeLists.txt
index 4fbdae0a9..eb50589ab 100644
--- a/kioslave/thumbnail/CMakeLists.txt
+++ b/kioslave/thumbnail/CMakeLists.txt
@@ -96,7 +96,7 @@ set( target djvuthumbnail )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES djvucreator.cpp
-  LINK kdecore-shared
+  LINK tdecore-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
@@ -109,7 +109,7 @@ if( WITH_XCURSOR )
 
   tde_add_kpart( ${target} AUTOMOC
     SOURCES cursorcreator.cpp
-    LINK kdecore-shared ${XCURSOR_LIBRARIES}
+    LINK tdecore-shared ${XCURSOR_LIBRARIES}
     DESTINATION ${PLUGIN_INSTALL_DIR}
   )
 
@@ -126,7 +126,7 @@ if( WITH_OPENEXR )
 
   tde_add_kpart( ${target} AUTOMOC
     SOURCES exrcreator.cpp
-    LINK kdecore-shared ${OPENEXR_LIBRARIES}
+    LINK tdecore-shared ${OPENEXR_LIBRARIES}
     DESTINATION ${PLUGIN_INSTALL_DIR}
   )
 
diff --git a/kioslave/thumbnail/Makefile.am b/kioslave/thumbnail/Makefile.am
index f13473ac3..8024b2ba3 100644
--- a/kioslave/thumbnail/Makefile.am
+++ b/kioslave/thumbnail/Makefile.am
@@ -1,7 +1,7 @@
 ## Makefile.am of kdebase/kioslave/thumbnail
 
 INCLUDES = $(all_includes) $(EXR_FLAGS)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 METASOURCES = AUTO
 
 if have_xcursor
diff --git a/kioslave/trash/Makefile.am b/kioslave/trash/Makefile.am
index cb5403728..1ab793ce0 100644
--- a/kioslave/trash/Makefile.am
+++ b/kioslave/trash/Makefile.am
@@ -12,7 +12,7 @@ kio_trash_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
 bin_PROGRAMS = ktrash
 ktrash_SOURCES = ktrash.cpp
 ktrash_LDADD = $(LIB_KIO)
-ktrash_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+ktrash_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 kde_services_DATA = trash.protocol