6 files changed, 22 insertions, 22 deletions
diff --git a/dcop/CMakeLists.txt b/dcop/CMakeLists.txt
index 8854ba88a..ed35d6572 100644
--- a/dcop/CMakeLists.txt
+++ b/dcop/CMakeLists.txt
@@ -20,8 +20,8 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_BINARY_DIR}/kdecore
-  ${CMAKE_SOURCE_DIR}/kdecore
+  ${CMAKE_BINARY_DIR}/tdecore
+  ${CMAKE_SOURCE_DIR}/tdecore
 )
 
 link_directories(
@@ -53,7 +53,7 @@ tde_add_library( ${target} SHARED AUTOMOC
 )
 
 
-#### dcopserver (kdeinit) #######################
+#### dcopserver (tdeinit) #######################
 
 set( target dcopserver )
 
@@ -61,7 +61,7 @@ set( ${target}_SRCS
   dcopserver.cpp dcopsignals.cpp
 )
 
-tde_add_kdeinit_executable( ${target} AUTOMOC
+tde_add_tdeinit_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
   LINK kICE-static DCOP-shared
 )
diff --git a/dcop/HOWTO b/dcop/HOWTO
index 8609021c0..c12939ce9 100644
--- a/dcop/HOWTO
+++ b/dcop/HOWTO
@@ -464,7 +464,7 @@ Sometimes it might be interesting to use DCOP between processes
 belonging to different users, e.g. a frontend process running
 with the user's id, and a backend process running as root.
 
-For this you can use kdesu with the --nonewdcop option. kdesu will
+For this you can use tdesu with the --nonewdcop option. tdesu will
 then forward the address of the DCOP server as well as the authentication
 information to the new user. 
 
@@ -479,9 +479,9 @@ carefully reviewed that your DCOPClient does not provide objects/functions
 that could be abused for privilege escalation.
 
 
-Example: kdesu --nonewdcop -u root -c kcmroot
+Example: tdesu --nonewdcop -u root -c kcmroot
 
-This will, after kdesu got the root password, execute kcmroot as root,
+This will, after tdesu got the root password, execute kcmroot as root,
 talking to the user's dcop server.
 
 
@@ -503,7 +503,7 @@ int main(int argc, char **argv)
 
 Compiled with:
 
-g++ -O2 -o testit testit.cpp -I$QTDIR/include -L$QTDIR/lib -lkdecore
+g++ -O2 -o testit testit.cpp -I$QTDIR/include -L$QTDIR/lib -ltdecore
 
 on Linux yields the following memory use statistics:
 
diff --git a/dcop/Mainpage.dox b/dcop/Mainpage.dox
index d573b01b5..ece626186 100644
--- a/dcop/Mainpage.dox
+++ b/dcop/Mainpage.dox
@@ -377,15 +377,15 @@ second process where to find the authentication information.
 (Note that this implies that the second process is able to
 read the authentication file, so it will probably only work
 if the second process runs as root. If it should run as another
-user, a similar approach to what kdesu does with xauth must
+user, a similar approach to what tdesu does with xauth must
 be taken. In fact, it would be a very good idea to add DCOP
-support to kdesu!)
+support to tdesu!)
 
 For example
 
-ICEAUTHORITY=~user/.ICEauthority kdesu root -c kcmroot -dcopserver `cat ~user/.DCOPserver`
+ICEAUTHORITY=~user/.ICEauthority tdesu root -c kcmroot -dcopserver `cat ~user/.DCOPserver`
 
-will, after kdesu got the root password, execute kcmroot as root, talking
+will, after tdesu got the root password, execute kcmroot as root, talking
 to the user's dcop server.
 
 
diff --git a/dcop/Makefile.am b/dcop/Makefile.am
index ced19c79e..187395189 100644
--- a/dcop/Makefile.am
+++ b/dcop/Makefile.am
@@ -33,7 +33,7 @@ lib_LTLIBRARIES  = libDCOP.la
 libDCOP_la_LIBADD = KDE-ICE/libkICE.la $(LIB_QT)
 libDCOP_la_LDFLAGS = $(KDE_RPATH) -version-info 6:0:2 -no-undefined $(all_libraries)
 libDCOP_la_NMCHECK = $(srcdir)/libDCOP.nmcheck
-libDCOP_la_NMCHECKWEAK = $(srcdir)/libDCOP_weak.nmcheck $(top_srcdir)/kdecore/libqt-mt_weak.nmcheck
+libDCOP_la_NMCHECKWEAK = $(srcdir)/libDCOP_weak.nmcheck $(top_srcdir)/tdecore/libqt-mt_weak.nmcheck
 
 include_HEADERS = dcopclient.h dcopobject.h dcopstub.h dcopref.h dcoptypes.h kdatastream.h
 noinst_HEADERS = version.h dcopglobal.h dcopserver.h testdcop.h dcopsignals.h dcop-path.h
@@ -43,27 +43,27 @@ METASOURCES = AUTO
 # dcopstub needs to go first for --enable-final to work
 libDCOP_la_SOURCES = dcopstub.cpp dcopref.cpp dcopobject.cpp dcopclient.cpp
 
-kdeinit_LTLIBRARIES = dcopserver.la
+tdeinit_LTLIBRARIES = dcopserver.la
 dcopserver_la_LDFLAGS = -module -avoid-version $(all_libraries)
 dcopserver_la_SOURCES = dcopserver.cpp dcopsignals.cpp
 dcopserver_la_LIBADD  = libDCOP.la $(LIB_QT)
 
 dcopserver_shutdown_SOURCES = dcopserver_shutdown.c
 
-testdcop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+testdcop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 testdcop_SOURCES = testdcop.cpp
 testdcop_LDADD = libDCOP.la
 
-dcop_deadlock_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+dcop_deadlock_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 dcop_deadlock_test_SOURCES = dcop_deadlock_test.cpp
-dcop_deadlock_test_LDADD = ../kdecore/libtdecore.la
+dcop_deadlock_test_LDADD = ../tdecore/libtdecore.la
 
-testdcopc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+testdcopc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 testdcopc_SOURCES = testdcopc.c dcopc.c
 testdcopc_LDADD =  KDE-ICE/libkICE.la $(LIBSM)
 
 EXTRA_DIST = HOWTO ICE Mainpage.dox
 
-DOXYGEN_REFERENCES = kdecore
+DOXYGEN_REFERENCES = tdecore
 DOXYGEN_EXCLUDE = KDE-ICE
 include ../admin/Doxyfile.am
diff --git a/dcop/client/CMakeLists.txt b/dcop/client/CMakeLists.txt
index 51aca7527..d0b0ee935 100644
--- a/dcop/client/CMakeLists.txt
+++ b/dcop/client/CMakeLists.txt
@@ -13,8 +13,8 @@ include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/dcop
-  ${CMAKE_SOURCE_DIR}/kdecore
-  ${CMAKE_BINARY_DIR}/kdecore
+  ${CMAKE_SOURCE_DIR}/tdecore
+  ${CMAKE_BINARY_DIR}/tdecore
 )
 
 link_directories(
diff --git a/dcop/client/marshall.cpp b/dcop/client/marshall.cpp
index 9defa6d47..e848ac761 100644
--- a/dcop/client/marshall.cpp
+++ b/dcop/client/marshall.cpp
@@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ******************************************************************/
 
 #define KDE_QT_ONLY
-#include "../../kdecore/kurl.cpp"
+#include "../../tdecore/kurl.cpp"
 
 bool mkBool( const TQString& s )
 {