Additional kde to tde renaming

40 files changed, 80 insertions, 80 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
diff --git a/doc/kbabel/using.docbook b/doc/kbabel/using.docbook
index 091361e6..1bed9ed8 100644
--- a/doc/kbabel/using.docbook
+++ b/doc/kbabel/using.docbook
@@ -742,7 +742,7 @@ number of plural forms. This is done by translating a specific entry in <filenam
 The number is set by selecting the name of a language, which uses
 the same number and <emphasis>rules</emphasis> for finding the
 right plural form. The up-to-date list of possible values can be found in the
-kdelibs source code, in the file <filename>kdecore/klocale.cpp</filename>.
+kdelibs source code, in the file <filename>tdecore/klocale.cpp</filename>.
 </para>
 
 <note><para>
diff --git a/doc/scripts/kdesvn-build/index.docbook b/doc/scripts/kdesvn-build/index.docbook
index 8dcadc9b..e54dbb9b 100644
--- a/doc/scripts/kdesvn-build/index.docbook
+++ b/doc/scripts/kdesvn-build/index.docbook
@@ -451,7 +451,7 @@ build and install the API documentation for some modules.
 <listitem><para>
 You can check out only a portion of a &kde; &svn; module.  For example,
 you could check out only the <application>taglib</application> from
-<application>kdesupport</application>, or only <application>K3B</application> from
+<application>tdesupport</application>, or only <application>K3B</application> from
 <application>extragear/multimedia</application>.  The script will automatically pull in
 <application>kde-common</application> if necessary to make the build work.
 </para></listitem>
diff --git a/kapptemplate/kapp/app-Makefile.am b/kapptemplate/kapp/app-Makefile.am
index 5cf0ca86..0405eba2 100644
--- a/kapptemplate/kapp/app-Makefile.am
+++ b/kapptemplate/kapp/app-Makefile.am
@@ -17,7 +17,7 @@ INCLUDES         = \$(all_includes)
 ${APP_NAME_LC}_LDFLAGS = \$(KDE_RPATH) \$(all_libraries)
 
 # the libraries to link against.
-${APP_NAME_LC}_LDADD   = \$(LIB_KFILE) -lkdeprint
+${APP_NAME_LC}_LDADD   = \$(LIB_KFILE) -ltdeprint
 
 # which sources should be compiled for $APP_NAME_LC
 ${APP_NAME_LC}_SOURCES =	main.cpp ${APP_NAME_LC}.cpp ${APP_NAME_LC}view.cpp \\
diff --git a/kbabel/catalogmanager/Makefile.am b/kbabel/catalogmanager/Makefile.am
index 8a4e0ff1..0a3a3850 100644
--- a/kbabel/catalogmanager/Makefile.am
+++ b/kbabel/catalogmanager/Makefile.am
@@ -27,14 +27,14 @@ libcatalogmanager_la_SOURCES =	catalogmanageriface.skel \
 libcatalogmanager_la_LIBADD =  ../commonui/libkbabelcommonui.la \
 ../kbabeldict/libkbabeldict.la ./libcvs/libcatalogmanagercvs.la \
 ./libsvn/libcatalogmanagersvn.la $(LIB_KIO)
-libcatalogmanager_la_LDFLAGS = $(all_libraries) -no-undefined $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS)
+libcatalogmanager_la_LDFLAGS = $(all_libraries) -no-undefined $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS)
 
 
 catalogmanager_SOURCES = main.cpp
 
 # the libraries to link against.
 catalogmanager_LDADD   = libcatalogmanager.la
-catalogmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS)
+catalogmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS)
 
 # these are the headers for your project
 noinst_HEADERS   = catalogmanageriface.h catalogmanager.h \
@@ -49,7 +49,7 @@ rc_DATA = catalogmanagerui.rc
 
 
 api:
-	mkdir -p API && kdoc -d API -u $$PWD/API -p  -lkdeui -lkdecore -lqt -ldcop $(noinst_HEADERS)
+	mkdir -p API && kdoc -d API -u $$PWD/API -p  -ltdeui -ltdecore -lqt -ldcop $(noinst_HEADERS)
 
 distclean-local:
 	rm -r -f API
diff --git a/kbabel/common/Makefile.am b/kbabel/common/Makefile.am
index 462cc425..9020f76e 100644
--- a/kbabel/common/Makefile.am
+++ b/kbabel/common/Makefile.am
@@ -59,7 +59,7 @@ update_DATA = kbabel-projectrename.upd
 updatedir = $(kde_datadir)/kconf_update
 
 api:
-	mkdir -p API && kdoc -d API -u $$PWD/API -p  -lkdecore -lqt-mt -ldcop $(pkginclude_HEADERS)	
+	mkdir -p API && kdoc -d API -u $$PWD/API -p  -ltdecore -lqt-mt -ldcop $(pkginclude_HEADERS)	
 
 distclean-local:
 	rm -r -f API
diff --git a/kbabel/datatools/Makefile.am b/kbabel/datatools/Makefile.am
index 07600eac..326c7737 100644
--- a/kbabel/datatools/Makefile.am
+++ b/kbabel/datatools/Makefile.am
@@ -32,7 +32,7 @@ METASOURCES = AUTO
 #rc_DATA = kbabelui.rc
 
 #api:
-#	mkdir -p API && kdoc -d API -u $$PWD/API -p  -lkdeui -lkdecore -lqt -ldcop *.h
+#	mkdir -p API && kdoc -d API -u $$PWD/API -p  -ltdeui -ltdecore -lqt -ldcop *.h
 
 #distclean-local:
 #	rm -r -f API
diff --git a/kbabel/kbabel/Makefile.am b/kbabel/kbabel/Makefile.am
index 1e3e277f..66b8caa4 100644
--- a/kbabel/kbabel/Makefile.am
+++ b/kbabel/kbabel/Makefile.am
@@ -38,14 +38,14 @@ libkbabel_la_SOURCES =	kbbookmarkhandler.cpp \
 kde_kcfg_DATA=kbabel.kcfg
 
 libkbabel_la_LIBADD =  ../commonui/libkbabelcommonui.la ../kbabeldict/libkbabeldict.la $(LIB_KIO) $(LIB_KSPELL)
-libkbabel_la_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS)
+libkbabel_la_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS)
 
 
 kbabel_SOURCES = main.cpp
 
 # the libraries to link against.
 kbabel_LDADD   = libkbabel.la
-kbabel_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS)
+kbabel_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS)
 
 # these are the headers for your project
 noinst_HEADERS   = kbabel.h kbabelview.h \
@@ -75,7 +75,7 @@ update_DATA = kbabel-project.upd kbabel-difftoproject.upd
 updatedir = $(kde_datadir)/kconf_update
 
 api:
-	mkdir -p API && kdoc -d API -u $$PWD/API -p  -lkdeui -lkdecore -lqt -ldcop $(noinst_HEADERS)
+	mkdir -p API && kdoc -d API -u $$PWD/API -p  -ltdeui -ltdecore -lqt -ldcop $(noinst_HEADERS)
 
 distclean-local:
 	rm -r -f API
diff --git a/kbabel/kbabeldict/CMakeLists.txt b/kbabel/kbabeldict/CMakeLists.txt
index 8824106d..32bb588f 100644
--- a/kbabel/kbabeldict/CMakeLists.txt
+++ b/kbabel/kbabeldict/CMakeLists.txt
@@ -65,6 +65,6 @@ tde_add_library( kbabeldict STATIC AUTOMOC
 tde_add_library( kbabeldictplugin SHARED AUTOMOC
   SOURCES searchengine.cpp
   VERSION 1.2.0
-  LINK kdecore-shared
+  LINK tdecore-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/kbabel/kbabeldict/Makefile.am b/kbabel/kbabeldict/Makefile.am
index 6eb129bb..52ba9d2f 100644
--- a/kbabel/kbabeldict/Makefile.am
+++ b/kbabel/kbabeldict/Makefile.am
@@ -19,20 +19,20 @@ INCLUDES         = -I$(srcdir)/../common -I$(top_builddir)/kbabel/common $(all_i
 lib_LTLIBRARIES = libkbabeldictplugin.la
 libkbabeldictplugin_la_SOURCES = searchengine.cpp 
 libkbabeldictplugin_la_LIBADD =  $(LIB_KDECORE)
-libkbabeldictplugin_la_LDFLAGS = -version-info 3:0:2 $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+libkbabeldictplugin_la_LDFLAGS = -version-info 3:0:2 $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 libkbabeldict_la_SOURCES = kbabeldictbox.cpp \
             kbabeldictiface.skel dictionarymenu.cpp dictchooser.cpp \
             aboutmoduledlg.cpp 
 libkbabeldict_la_LIBADD =  ../common/libkbabelcommon.la libkbabeldictplugin.la $(LIB_KDEUI)
-libkbabeldict_la_LDFLAGS = $(all_libraries) -no-undefined $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+libkbabeldict_la_LDFLAGS = $(all_libraries) -no-undefined $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 
 kbabeldict_SOURCES = main.cpp kbabeldictview.cpp kbabeldict.cpp kbabelsplash.cpp
 
 # the libraries to link against.
-kbabeldict_LDADD   = libkbabeldict.la $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
-kbabeldict_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kbabeldict_LDADD   = libkbabeldict.la $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kbabeldict_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 # these are the headers for your project
 noinst_HEADERS   =  kbabeldict.h kbabeldictview.h kbabelsplash.h aboutmoduledlg.h
@@ -48,7 +48,7 @@ KDE_OPTIONS = nofinal
 #rc_DATA = kbabelui.rc
 
 api:
-	mkdir -p API && kdoc -d API -u $$PWD/API -p  -lkdeui -lkdecore -lqt -ldcop *.h
+	mkdir -p API && kdoc -d API -u $$PWD/API -p  -ltdeui -ltdecore -lqt -ldcop *.h
 
 distclean-local:
 	rm -r -f API
diff --git a/kbabel/kbabeldict/kbabeldictbox.cpp b/kbabel/kbabeldict/kbabeldictbox.cpp
index e5c67b57..684ff409 100644
--- a/kbabel/kbabeldict/kbabeldictbox.cpp
+++ b/kbabel/kbabeldict/kbabeldictbox.cpp
@@ -1691,7 +1691,7 @@ void KBabelDictBox::editFile()
                  argList.append("--gotomsgid");
                  argList.append(msgid.local8Bit());
                  argList.append(url.local8Bit());
-                 kapp->kdeinitExec("kbabel",argList,&error);
+                 kapp->tdeinitExec("kbabel",argList,&error);
                  if(!error.isNull())
                  {
                      KMessageBox::sorry(this
diff --git a/kbugbuster/Makefile.am b/kbugbuster/Makefile.am
index 70fc1a23..85ea75d3 100644
--- a/kbugbuster/Makefile.am
+++ b/kbugbuster/Makefile.am
@@ -10,8 +10,8 @@ bin_PROGRAMS = kbugbuster
 
 kbugbuster_SOURCES = main.cpp
 kbugbuster_LDADD   = -lkutils gui/libkbbmainwindow.la \
-                     backend/libkbbbackend.la $(LIB_KHTML) $(LIB_KIO) -lkdefx $(LIB_KUTILS)
-kbugbuster_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor $(LIB_KUTILS)
+                     backend/libkbbbackend.la $(LIB_KHTML) $(LIB_KIO) -ltdefx $(LIB_KUTILS)
+kbugbuster_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KUTILS)
 
 xdg_apps_DATA = kbugbuster.desktop
 
diff --git a/kcachegrind/kcachegrind/Makefile.am b/kcachegrind/kcachegrind/Makefile.am
index 5e00342d..5d7ca2e1 100644
--- a/kcachegrind/kcachegrind/Makefile.am
+++ b/kcachegrind/kcachegrind/Makefile.am
@@ -44,7 +44,7 @@ INCLUDES= $(all_includes)
 METASOURCES = AUTO
 
 # the library search path. 
-kcachegrind_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kcachegrind_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 rcdir = $(kde_datadir)/kcachegrind
 rc_DATA = kcachegrindui.rc
diff --git a/kmtrace/Makefile.am b/kmtrace/Makefile.am
index fa686680..9d32056d 100644
--- a/kmtrace/Makefile.am
+++ b/kmtrace/Makefile.am
@@ -23,13 +23,13 @@ INCLUDES = $(all_includes)
 
 bin_PROGRAMS = kmtrace demangle kmmatch
 kmtrace_SOURCES = kmtrace.cpp
-kmtrace_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kmtrace_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 demangle_SOURCES = demangle.cpp
-demangle_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+demangle_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 kmmatch_SOURCES = match.cpp
-kmmatch_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kmmatch_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 bin_SCRIPTS = kminspector
 
diff --git a/kompare/Makefile.am b/kompare/Makefile.am
index 5aa2a899..2bec46d0 100644
--- a/kompare/Makefile.am
+++ b/kompare/Makefile.am
@@ -26,7 +26,7 @@ bin_PROGRAMS = kompare
 
 # the application source, library search path, and link libraries
 kompare_SOURCES = main.cpp kompare_shell.cpp kompareurldialog.cpp
-kompare_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kompare_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 kompare_LDADD   = $(LIB_KPARTS) \
 	$(top_builddir)/kompare/interfaces/libkompareinterface.la \
 	$(top_builddir)/kompare/libdialogpages/libdialogpages.la \
diff --git a/kstartperf/README b/kstartperf/README
index ff986444..f20386a0 100644
--- a/kstartperf/README
+++ b/kstartperf/README
@@ -25,7 +25,7 @@ will show you the startup time of konsole in milliseconds.
 
 ** Notes
 
-The appliation that is being profiled, needs to be linked against kdecore.
+The appliation that is being profiled, needs to be linked against tdecore.
 
 Geert Jansen <[email protected]>, 
 20 July 2000
diff --git a/kuiviewer/Makefile.am b/kuiviewer/Makefile.am
index 378f0e22..f564c10f 100644
--- a/kuiviewer/Makefile.am
+++ b/kuiviewer/Makefile.am
@@ -25,7 +25,7 @@ bin_PROGRAMS = kuiviewer
 
 # the application source, library search path, and link libraries
 kuiviewer_SOURCES = main.cpp kuiviewer.cpp
-kuiviewer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kuiviewer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 kuiviewer_LDADD   = $(LIB_KPARTS)
 
 xdg_apps_DATA =kuiviewer.desktop
diff --git a/kunittest/Makefile.am b/kunittest/Makefile.am
index ff868d07..ca4a6392 100644
--- a/kunittest/Makefile.am
+++ b/kunittest/Makefile.am
@@ -4,14 +4,14 @@ METASOURCES = AUTO
 
 lib_LTLIBRARIES = libkunittestgui.la
 libkunittestgui_la_SOURCES = testerwidget.ui runnergui.cpp dcopinterface.skel
-libkunittestgui_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -lkunittest
+libkunittestgui_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lkunittest
 libkunittestgui_la_LIBADD = -lkunittest $(LIB_KDECORE)
 
 runnergui.lo : testerwidget.h
 
 bin_PROGRAMS = kunittestguimodrunner
 kunittestguimodrunner_SOURCES = guimodrunner.cpp
-kunittestguimodrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -lkunittest
+kunittestguimodrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lkunittest
 kunittestguimodrunner_LDADD = libkunittestgui.la $(LIB_KDECORE) $(LIB_KIO)
 
 noinst_HEADERS = dcopinterface.h
diff --git a/kunittest/example/simple/Makefile.am b/kunittest/example/simple/Makefile.am
index 3c88d7fd..22ed8a80 100644
--- a/kunittest/example/simple/Makefile.am
+++ b/kunittest/example/simple/Makefile.am
@@ -4,11 +4,11 @@ METASOURCES = AUTO
 check_PROGRAMS = sampletests sampletestsgui
 
 sampletests_SOURCES = main.cpp sampletest.cpp
-sampletests_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+sampletests_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 sampletests_LDADD = -lkunittest
 
 sampletestsgui_SOURCES = maingui.cpp sampletest.cpp
-sampletestsgui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+sampletestsgui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 # Normally you would write -lkunittestgui here, but since the examples
 # are bundled with the library source code itself we don't want to
 # have you install the libraries before you can compile the examples.
diff --git a/poxml/Makefile.am b/poxml/Makefile.am
index 49b47eee..65a4499e 100644
--- a/poxml/Makefile.am
+++ b/poxml/Makefile.am
@@ -7,23 +7,23 @@ KDE_CXXFLAGS = $(USE_EXCEPTIONS)
 SUBDIRS = antlr
 
 split2po_SOURCES = split.cpp parser.cpp
-split2po_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+split2po_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 split2po_LDADD = $(LIB_QT)
 
 xml2pot_SOURCES = xml2pot.cpp parser.cpp
-xml2pot_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+xml2pot_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 xml2pot_LDADD = $(LIB_QT)
 
 po2xml_SOURCES = GettextLexer.cpp GettextParser.cpp po2xml.cpp parser.cpp
-po2xml_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+po2xml_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 po2xml_LDADD = antlr/src/libantlr.la $(LIB_QT)
 
 swappo_SOURCES = GettextLexer.cpp GettextParser.cpp swappo.cpp parser.cpp
-swappo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+swappo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 swappo_LDADD = antlr/src/libantlr.la $(LIB_QT)
 
 transxx_SOURCES = GettextLexer.cpp GettextParser.cpp transxx.cpp parser.cpp
-transxx_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+transxx_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 transxx_LDADD = antlr/src/libantlr.la $(LIB_QT)
 
 parser:
diff --git a/scripts/README b/scripts/README
index ca3811e5..38046db3 100644
--- a/scripts/README
+++ b/scripts/README
@@ -13,7 +13,7 @@ kDebug2kdDebug.sh Script to convert old KDE debugging statements to their
 
 extend_dmalloc	Script to run gdb on return-addresses
 
-kdekillall	Kills the process "kdeinit: <process> with signal <signal>
+kdekillall	Kills the process "tdeinit: <process> with signal <signal>
 
 === PROGRAMMING SUPPORT
 
diff --git a/scripts/completions/zsh/_kdeinit_wrapper b/scripts/completions/zsh/_kdeinit_wrapper
index a5fd75a0..637812c7 100644
--- a/scripts/completions/zsh/_kdeinit_wrapper
+++ b/scripts/completions/zsh/_kdeinit_wrapper
@@ -1,4 +1,4 @@
-#compdef kdeinit_wrapper
+#compdef tdeinit_wrapper
 
 # Yes, this could be improved
 
diff --git a/scripts/completions/zsh/_kdekillall b/scripts/completions/zsh/_kdekillall
index eb3eb0ab..a51fb85d 100644
--- a/scripts/completions/zsh/_kdekillall
+++ b/scripts/completions/zsh/_kdekillall
@@ -1,7 +1,7 @@
 #compdef kdekillall
 
 local progs
-progs=(`ps x | grep kdeinit: | grep -v Running | grep -v grep | sed 's,.*kdeinit: ,,' | sed 's, .*,,'`)
+progs=(`ps x | grep tdeinit: | grep -v Running | grep -v grep | sed 's,.*tdeinit: ,,' | sed 's, .*,,'`)
 
 _alternative \
 	'Q_SIGNALS:: _Q_SIGNALS -p' \
diff --git a/scripts/cvs2dist b/scripts/cvs2dist
index 60721bdf..29721ec9 100755
--- a/scripts/cvs2dist
+++ b/scripts/cvs2dist
@@ -177,7 +177,7 @@ if [ ! -z $showhelp ] || [ -z $module ] || [ -z $directory ]; then
 	echo "the beginning of command line arguments if it exists."
 	echo "	'--' signifies the end of options."
 	echo ""
-	echo "Example: cvs2dist /sources/kdegames kolf/objects/picture \\"
+	echo "Example: cvs2dist /sources/tdegames kolf/objects/picture \\"
 	echo "         -n kolf-picture -v 0.9 -r \"kolf/game.h\" \\"
 	echo "         --log ~/tmp/extra-file"
 	echo ""
diff --git a/scripts/kde-build b/scripts/kde-build
index 8790f602..34fbf372 100755
--- a/scripts/kde-build
+++ b/scripts/kde-build
@@ -401,7 +401,7 @@ if [ -n "$specifiedModules" ]; then
 else
   if [ "$ONLYLISTEDMODULES" = yes ]; then
     if [ "$USEKDESUPPORT" = yes ]; then
-      modules="kdesupport $critical_modules $KDEMODULES"
+      modules="tdesupport $critical_modules $KDEMODULES"
     else
       modules="$critical_modules $KDEMODULES"
     fi
diff --git a/scripts/kde-buildrc b/scripts/kde-buildrc
index e3e31d14..51489e10 100644
--- a/scripts/kde-buildrc
+++ b/scripts/kde-buildrc
@@ -44,12 +44,12 @@ KDELOGDIR="$KDESRCDIR/log"
 #
 COMPRESSLOGS="no"
 
-# Whether or not you want to compile and install the kdesupport module.
+# Whether or not you want to compile and install the tdesupport module.
 #
 USEKDESUPPORT="yes"
 
 # Add modules you want to get compiled to this space-seperated list. Note that
-# you don't have to mention the fundamental modules 'arts, 'kdesupport',
+# you don't have to mention the fundamental modules 'arts, 'tdesupport',
 # 'kdelibs' and 'kdebase' here since the kde-build script will care about them
 # automatically.
 # See http://wiki.kdenews.org/tiki-index.php?page=KDE+CVS+Structure for a list
@@ -57,7 +57,7 @@ USEKDESUPPORT="yes"
 
 KDEMODULES="kdetoys"
 
-#KDEMODULES="kdeaccessibility kdeadmin kdeartwork kdebindings kdeedu kdegames kdegraphics kdemultimedia kdenetwork kdepim kdesdk kdetoys kdeutils kdeaddons kdevelop kdewebdev koffice"
+#KDEMODULES="kdeaccessibility kdeadmin kdeartwork kdebindings kdeedu tdegames kdegraphics kdemultimedia kdenetwork tdepim kdesdk kdetoys kdeutils kdeaddons kdevelop kdewebdev koffice"
 #KDEMODULES="$KDEMODULES extragear-libs extragear-multimedia extragear-sysadmin extragear-office extragear-addons extragear-graphics extragear-network extragear-pim extragear-toys extragear-utils"
 
 
@@ -109,7 +109,7 @@ ANONSVNROOT="svn://anonsvn.kde.org/home/kde"
 # you can specify a module specific branch in through PATH_ARTS
 #
 SUBDIR="/trunk/KDE/@MODULE@"
-SUBDIR_KDESUPPORT=/trunk/kdesupport
+SUBDIR_KDESUPPORT=/trunk/tdesupport
 for esubdir in libs multimedia sysadmin office addons graphics network pim toys utils; do
   var=SUBDIR_EXTRAGEAR_`echo $esubdir | tr 'a-z' 'A-Z'`
   eval "$var=/trunk/extragear/$esubdir"
diff --git a/scripts/kdedoc b/scripts/kdedoc
index 0dc20a66..09480fcc 100755
--- a/scripts/kdedoc
+++ b/scripts/kdedoc
@@ -30,7 +30,7 @@ if [ $# = 1 ]; then
         exit 1
       fi
     fi
-  elif [ -e "$KDEDOCS/kdecore/index.html" ]; then
+  elif [ -e "$KDEDOCS/tdecore/index.html" ]; then
     # Docs are laid out in kdoc style.
     if [ -f "$KDEDOCS"/*/"$1.html" ]; then
       kfmclient exec "$KDEDOCS"/*/"$1.html"
diff --git a/scripts/kdekillall b/scripts/kdekillall
index c08b2ad8..69c39c4f 100755
--- a/scripts/kdekillall
+++ b/scripts/kdekillall
@@ -5,7 +5,7 @@ case $1 in
 esac
 if [ $# = 0 ]; then
     echo "Usage: $0 [-<signal>] <process>"
-    echo 'Kills the process "kdeinit: <process> with signal <signal>"'
+    echo 'Kills the process "tdeinit: <process> with signal <signal>"'
 	echo "if <signal> is not specified, it defaults to SIGTERM,"
 	echo "see kill -l for a list of possible Q_SIGNALS"
 else
@@ -13,11 +13,11 @@ else
     if test -z "$list"; then
         # on newer Linux kernels (>= 2.6.10) KDE is able to use 
         # prctl(PR_SET_NAME) to change the process name...
-        list=$(ps auwx | grep $USER | awk "/\[kdeinit\] $1/ {print \$2}")
+        list=$(ps auwx | grep $USER | awk "/\[tdeinit\] $1/ {print \$2}")
     fi
     if test -z "$list"; then
         # with KDE 3.4 we changed the view again...
-        list=$(ps auwx | grep $USER | awk "/$1 \[kdeinit\]/ {print \$2}")
+        list=$(ps auwx | grep $USER | awk "/$1 \[tdeinit\]/ {print \$2}")
     fi
     if test -n "$list"; then 
         kill $signal $list
diff --git a/scripts/kdesvn-build b/scripts/kdesvn-build
index 706c755a..cd1d9cd9 100755
--- a/scripts/kdesvn-build
+++ b/scripts/kdesvn-build
@@ -651,7 +651,7 @@ sub svn_module_url
     # The following modules are in /trunk, not /trunk/KDE.  There are others,
     # but there are the important ones.  The hash is associated with the value
     # 1 so that we can do a boolean test by looking up the module name.
-    my @non_trunk_modules = qw(extragear kdenonbeta kdesupport koffice
+    my @non_trunk_modules = qw(extragear kdenonbeta tdesupport koffice
         playground qt-copy valgrind KDE kdereview www l10n);
 
     my $module_root = $module;
@@ -1412,8 +1412,8 @@ HOME
 # update and build lists to build a default set of modules.
 sub setup_default_modules()
 {
-    @update_list = qw(qt-copy arts kdesupport kdelibs kdebase kdeartwork
-                      kdemultimedia kdepim kdeutils kdegraphics kdegames
+    @update_list = qw(qt-copy arts tdesupport kdelibs kdebase kdeartwork
+                      kdemultimedia tdepim kdeutils kdegraphics tdegames
                       kdetoys kdeedu kdeaddons);
     @build_list = @update_list;
 
@@ -4173,8 +4173,8 @@ EOF
 sub setup_trinity5_hack
 {
     my @branched_modules = qw/kde-common kdeaccessibility kdeaddons kdeadmin
-        kdeartwork kdebase kdebindings kdeedu kdegames kdegraphics kdelibs
-        kdemultimedia kdenetwork kdepim kdesdk kdetoys kdeutils kdevelop
+        kdeartwork kdebase kdebindings kdeedu tdegames kdegraphics kdelibs
+        kdemultimedia kdenetwork tdepim kdesdk kdetoys kdeutils kdevelop
         kdewebdev/;
 
     # arts uses a different versioning scheme.
diff --git a/scripts/kdesvn-buildrc-sample b/scripts/kdesvn-buildrc-sample
index a19e13da..4e2a2c30 100644
--- a/scripts/kdesvn-buildrc-sample
+++ b/scripts/kdesvn-buildrc-sample
@@ -104,9 +104,9 @@ end module
 module arts
 end module
 
-# kdesupport contains taglib and QCA.  taglib is required for JuK, amarok, and
+# tdesupport contains taglib and QCA.  taglib is required for JuK, amarok, and
 # the meta info reader for music files in Konqueror.
-module kdesupport
+module tdesupport
 end module
 
 # kdelibs are the base KDE libraries needed by all KDE applications.
@@ -158,9 +158,9 @@ module kdebindings
     use-unsermake false
 end module
 
-# kdepim contains KMail, Kontact, KOrganizer, and other insanely useful
+# tdepim contains KMail, Kontact, KOrganizer, and other insanely useful
 # programs that help you keep track of things.
-module kdepim
+module tdepim
     configure-flags --disable-exchange
 end module
 
@@ -182,7 +182,7 @@ module kdeaddons
 end module
 
 # ... Well, they're games. ;)
-module kdegames
+module tdegames
 #    use-unsermake false
 end module
 
diff --git a/scripts/qtdoc b/scripts/qtdoc
index 622353b3..6250f7a9 100755
--- a/scripts/qtdoc
+++ b/scripts/qtdoc
@@ -11,10 +11,10 @@ fi
 if [ $# = 1 ]; then
   fname=`echo $1 | tr '[A-Z]' '[a-z]'`
   if [ -f $QTDIR/doc/html/$fname.html ]; then
-    kdeinit_wrapper kfmclient openProfile webbrowsing file:$QTDIR/doc/html/$fname.html
+    tdeinit_wrapper kfmclient openProfile webbrowsing file:$QTDIR/doc/html/$fname.html
   else
     if [ -f /usr/doc/qt2/html/$fname.html ]; then
-      kdeinit_wrapper kfmclient openProfile webbrowsing file:/usr/doc/qt2/html/$fname.html
+      tdeinit_wrapper kfmclient openProfile webbrowsing file:/usr/doc/qt2/html/$fname.html
     else
       echo "No such file $fname.html"
     fi
diff --git a/scripts/svn2dist b/scripts/svn2dist
index 7680ec84..c59c5ab5 100755
--- a/scripts/svn2dist
+++ b/scripts/svn2dist
@@ -182,7 +182,7 @@ if [ ! -z $showhelp ] || [ -z $module ] || [ -z $directory ]; then
 	echo "the beginning of command line arguments if it exists."
 	echo "	'--' signifies the end of options."
 	echo ""
-	echo "Example: svn2dist /sources/kdegames kolf/objects/picture \\"
+	echo "Example: svn2dist /sources/tdegames kolf/objects/picture \\"
 	echo "         -n kolf-picture -v 0.9 -r \"kolf/game.h\" \\"
 	echo "         --log ~/tmp/extra-file"
 	echo ""
diff --git a/umbrello/configure.in.in b/umbrello/configure.in.in
index 81e4fd59..820c1862 100644
--- a/umbrello/configure.in.in
+++ b/umbrello/configure.in.in
@@ -37,7 +37,7 @@ dnl ])
 HAVE_XSLT=yes
 
 KDE_FIND_PATH(xml2-config, XML_CONFIG, [${prefix}/bin ${exec_prefix}/bin], [
-  AC_MSG_WARN([Could not find libxml2 anywhere, check ftp://xmlsoft.org/ for libxml >= 2.4.8. (we also keep a version of it in kdesupport for CVS users' convience)])
+  AC_MSG_WARN([Could not find libxml2 anywhere, check ftp://xmlsoft.org/ for libxml >= 2.4.8. (we also keep a version of it in tdesupport for CVS users' convience)])
   HELP_SUBDIR=
   DO_NOT_COMPILE="$DO_NOT_COMPILE umbrello"
 ])
@@ -70,7 +70,7 @@ fi
 if test "$HAVE_XSLT" = yes; then
 
   KDE_FIND_PATH(xslt-config, XSLT_CONFIG, [${prefix}/bin ${exec_prefix}/bin], [
-    AC_MSG_WARN([Could not find libxslt anywhere, check ftp://xmlsoft.org/ for libxslt >= 1.0.7. (we also keep a version of it in kdesupport for CVS users' convience)])
+    AC_MSG_WARN([Could not find libxslt anywhere, check ftp://xmlsoft.org/ for libxslt >= 1.0.7. (we also keep a version of it in tdesupport for CVS users' convience)])
     HAVE_XSLT=no 
     DO_NOT_COMPILE="$DO_NOT_COMPILE umbrello"
   ])
diff --git a/umbrello/umbrello/dialogs/diagramprintpage.h b/umbrello/umbrello/dialogs/diagramprintpage.h
index b7980ca0..8f18bbad 100644
--- a/umbrello/umbrello/dialogs/diagramprintpage.h
+++ b/umbrello/umbrello/dialogs/diagramprintpage.h
@@ -18,7 +18,7 @@ class TQComboBox;
 class TQButtonGroup;
 class TQGroupBox;
 
-#include <kdeprint/kprintdialogpage.h>
+#include <tdeprint/kprintdialogpage.h>
 
 #include "../umldoc.h"
 #include "../umlview.h"
diff --git a/umbrello/umbrello/docgenerators/Makefile.am b/umbrello/umbrello/docgenerators/Makefile.am
index a98f1d7e..0309fdc6 100644
--- a/umbrello/umbrello/docgenerators/Makefile.am
+++ b/umbrello/umbrello/docgenerators/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = -I$(srcdir)/.. -I$(top_srcdir)/umbrello/docgenerators -I../../../umbr
 METASOURCES = AUTO
 bin_PROGRAMS = umbodoc
 
-AM_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+AM_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 umbodoc_COMPILE_FIRST = version.h
 umbodoc_SOURCES = main.cpp
 umbodoc_LDADD = $(LIB_KDECORE) $(LIBXSLT_LIBS) $(LIBXML_LIBS)
diff --git a/umbrello/umbrello/uniqueid.cpp b/umbrello/umbrello/uniqueid.cpp
index ce4dc117..9c271cdb 100644
--- a/umbrello/umbrello/uniqueid.cpp
+++ b/umbrello/umbrello/uniqueid.cpp
@@ -26,7 +26,7 @@ Uml::IDType gen() {
     static char buf[20];
     int length = 12;
     int i = 0;
-    // Source: KDE4 kdelibs/kdecore/krandom.cpp KRandom::randomString()
+    // Source: KDE4 kdelibs/tdecore/krandom.cpp KRandom::randomString()
     while (length--) {
         int r = kapp->random() % 62;
         r += 48;