5 files changed, 13 insertions, 13 deletions
diff --git a/cervisia/CMakeLists.txt b/cervisia/CMakeLists.txt
index 7ed04cb1..620cb602 100644
--- a/cervisia/CMakeLists.txt
+++ b/cervisia/CMakeLists.txt
@@ -89,9 +89,9 @@ tde_add_kpart( libcervisiapart AUTOMOC
 )
 
 
-##### cervisia (kdeinit) ########################
+##### cervisia (tdeinit) ########################
 
-tde_add_kdeinit_executable( cervisia AUTOMOC
+tde_add_tdeinit_executable( cervisia AUTOMOC
   SOURCES
     main.cpp cervisiashell.cpp
   LINK cervisia-static cvsservice-shared kutils-shared
diff --git a/cervisia/Makefile.am b/cervisia/Makefile.am
index eb985ea3..4b11e4ef 100644
--- a/cervisia/Makefile.am
+++ b/cervisia/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS = cvsservice . pics
 
 bin_PROGRAMS =
 lib_LTLIBRARIES =
-kdeinit_LTLIBRARIES = cervisia.la
+tdeinit_LTLIBRARIES = cervisia.la
 kde_module_LTLIBRARIES = libcervisiapart.la
 noinst_LTLIBRARIES = libcervisia.la
 
@@ -61,7 +61,7 @@ messages: rc.cpp
 	$(XGETTEXT) -C *.cpp *.h -o $(podir)/cervisia.pot
 
 srcdoc:
-	$(kde_bindir)/kdoc -a -p -d classdocs -n 'Cervisia' *.h -lqt -lkdecore -lkdeui -lkparts
+	$(kde_bindir)/kdoc -a -p -d classdocs -n 'Cervisia' *.h -lqt -ltdecore -ltdeui -lkparts
 
 cervisia.1: $(srcdir)/cervisia.1.in
 	sed -e 's%_KDEHTMLDIR_%'${kde_htmldir}'%g;' \
diff --git a/cervisia/cvsservice/CMakeLists.txt b/cervisia/cvsservice/CMakeLists.txt
index 01dfb865..b445994f 100644
--- a/cervisia/cvsservice/CMakeLists.txt
+++ b/cervisia/cvsservice/CMakeLists.txt
@@ -42,14 +42,14 @@ tde_add_library( cvsservice SHARED AUTOMOC
   SOURCES
     cvsservice.stub cvsjob.stub repository.stub
   VERSION 0.1.0
-  LINK kdecore-shared
+  LINK tdecore-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
 
-##### cvsservice (kdeinit) ######################
+##### cvsservice (tdeinit) ######################
 
-tde_add_kdeinit_executable( cvsservice AUTOMOC
+tde_add_tdeinit_executable( cvsservice AUTOMOC
   SOURCES
     main.cpp cvsservice.cpp cvsjob.cpp cvsservice.skel cvsservice.stub
     cvsjob.skel cvsjob.stub repository.cpp repository.skel
@@ -59,9 +59,9 @@ tde_add_kdeinit_executable( cvsservice AUTOMOC
 )
 
 
-##### cvsaskpass (kdeinit) ######################
+##### cvsaskpass (tdeinit) ######################
 
-tde_add_kdeinit_executable( cvsaskpass AUTOMOC
+tde_add_tdeinit_executable( cvsaskpass AUTOMOC
   SOURCES cvsaskpass.cpp
-  LINK kdeui-shared
+  LINK tdeui-shared
 )
diff --git a/cervisia/cvsservice/Makefile.am b/cervisia/cvsservice/Makefile.am
index 7b036036..c06af8d2 100644
--- a/cervisia/cvsservice/Makefile.am
+++ b/cervisia/cvsservice/Makefile.am
@@ -9,7 +9,7 @@ INCLUDES = $(all_includes)
 
 # cvs DCOP service
 bin_PROGRAMS =
-kdeinit_LTLIBRARIES = cvsservice.la cvsaskpass.la
+tdeinit_LTLIBRARIES = cvsservice.la cvsaskpass.la
 
 cvsservice_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 cvsservice_la_LIBADD = $(LIB_KIO)
@@ -50,5 +50,5 @@ messages:
 # API documentation
 # Not activated because KDE_INIT_DOXYGEN is missing in
 # kdesdk's configure.in.in
-#DOXYGEN_REFERENCES = dcop kdecore kdeui
+#DOXYGEN_REFERENCES = dcop tdecore tdeui
 #include ../../admin/Doxyfile.am
diff --git a/cervisia/cvsservice/cvsloginjob.h b/cervisia/cvsservice/cvsloginjob.h
index 71291175..50782b5c 100644
--- a/cervisia/cvsservice/cvsloginjob.h
+++ b/cervisia/cvsservice/cvsloginjob.h
@@ -25,7 +25,7 @@
 #include <tqstringlist.h>
 #include <dcopobject.h>
 
-#include <kdesu/process.h>
+#include <tdesu/process.h>
 
 
 class CvsLoginJob : public DCOPObject