Additional kde to tde renaming

54 files changed, 65 insertions, 65 deletions

diff --git a/kcontrol/access/CMakeLists.txt b/kcontrol/access/CMakeLists.txt
index bbd9ed9c0..bc13f53cd 100644
--- a/kcontrol/access/CMakeLists.txt
+++ b/kcontrol/access/CMakeLists.txt
@@ -36,9 +36,9 @@ tde_add_kpart( kcm_access AUTOMOC
 )
 
 
-##### kaccess (kdeinit) #########################
+##### kaccess (tdeinit) #########################
 
-tde_add_kdeinit_executable( kaccess AUTOMOC
+tde_add_tdeinit_executable( kaccess AUTOMOC
   SOURCES kaccess.cpp main.cpp
-  LINK kdeui-shared
+  LINK tdeui-shared
 )
diff --git a/kcontrol/access/Makefile.am b/kcontrol/access/Makefile.am
index f57c865b3..dcbfab2eb 100644
--- a/kcontrol/access/Makefile.am
+++ b/kcontrol/access/Makefile.am
@@ -5,7 +5,7 @@ METASOURCES = AUTO
 bin_PROGRAMS =
 lib_LTLIBRARIES =
 kde_module_LTLIBRARIES = kcm_access.la
-kdeinit_LTLIBRARIES = kaccess.la
+tdeinit_LTLIBRARIES = kaccess.la
 
 kaccess_la_SOURCES = kaccess.cpp main.cpp
 kaccess_la_LDFLAGS = $(all_libraries) -module -avoid-version
diff --git a/kcontrol/arts/arts.cpp b/kcontrol/arts/arts.cpp
index 88c8e7fe9..ae65419a9 100644
--- a/kcontrol/arts/arts.cpp
+++ b/kcontrol/arts/arts.cpp
@@ -74,7 +74,7 @@ static bool startArts()
 	delete config;
 
 	if (startServer)
-		kapp->kdeinitExec(startRealtime?"artswrapper":"artsd",
+		kapp->tdeinitExec(startRealtime?"artswrapper":"artsd",
 		                  TQStringList::split(" ",args));
 	return startServer;
 }
diff --git a/kcontrol/bell/CMakeLists.txt b/kcontrol/bell/CMakeLists.txt
index f45d4ec76..732bde555 100644
--- a/kcontrol/bell/CMakeLists.txt
+++ b/kcontrol/bell/CMakeLists.txt
@@ -28,6 +28,6 @@ install( FILES bell.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 tde_add_kpart( kcm_bell AUTOMOC
   SOURCES bell.cpp
-  LINK kdeui-shared
+  LINK tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/bell/Makefile.am b/kcontrol/bell/Makefile.am
index 3c3d94181..cc04d63a5 100644
--- a/kcontrol/bell/Makefile.am
+++ b/kcontrol/bell/Makefile.am
@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_bell.la
 kcm_bell_la_SOURCES = bell.cpp
 
 kcm_bell_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kcm_bell_la_LIBADD = -lkdeui
+kcm_bell_la_LIBADD = -ltdeui
 
 AM_CPPFLAGS= $(all_includes)
 
diff --git a/kcontrol/crypto/Makefile.am b/kcontrol/crypto/Makefile.am
index 73a79653d..84ef0a0cd 100644
--- a/kcontrol/crypto/Makefile.am
+++ b/kcontrol/crypto/Makefile.am
@@ -6,7 +6,7 @@ kcm_crypto_la_SOURCES = crypto.cpp certexport.cpp kdatetimedlg.cpp
 AM_CXXFLAGS = $(CXXFLAGS) -DLIBDIR=$(libdir)
 
 kcm_crypto_la_LDFLAGS  = $(KDE_RPATH) $(all_libraries) $(SSL_LDFLAGS) -module -avoid-version -no-undefined
-kcm_crypto_la_LIBADD = -lkdeui $(LIB_KIO) $(LIBSSL)
+kcm_crypto_la_LIBADD = -ltdeui $(LIB_KIO) $(LIBSSL)
 
 METASOURCES = AUTO
 
diff --git a/kcontrol/crypto/crypto.cpp b/kcontrol/crypto/crypto.cpp
index 910f65136..f6db43497 100644
--- a/kcontrol/crypto/crypto.cpp
+++ b/kcontrol/crypto/crypto.cpp
@@ -2029,7 +2029,7 @@ void KCryptoConfig::offerImportToKMail( const TQString& certFile )
        proc << "--import-certificate";
        proc << certFile;
        if ( !proc.start( KProcess::DontCare ) )
-           KMessageBox::error( this, i18n( "Could not execute Kleopatra. You might have to install or update the kdepim package." ) );
+           KMessageBox::error( this, i18n( "Could not execute Kleopatra. You might have to install or update the tdepim package." ) );
    }
 }
 
diff --git a/kcontrol/css/Makefile.am b/kcontrol/css/Makefile.am
index 9f55b5a75..10d2f3d4f 100644
--- a/kcontrol/css/Makefile.am
+++ b/kcontrol/css/Makefile.am
@@ -6,7 +6,7 @@ templatedir = $(kde_datadir)/kcmcss
 kde_module_LTLIBRARIES = kcm_css.la
 kcm_css_la_SOURCES = template.cpp cssconfig.ui csscustom.ui kcmcss.cpp preview.ui
 kcm_css_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
-kcm_css_la_LIBADD = -lkdeui $(LIB_KIO)
+kcm_css_la_LIBADD = -ltdeui $(LIB_KIO)
 
 METASOURCES = AUTO
  
diff --git a/kcontrol/displayconfig/Makefile.am b/kcontrol/displayconfig/Makefile.am
index 7fcfe17c1..55fabd507 100644
--- a/kcontrol/displayconfig/Makefile.am
+++ b/kcontrol/displayconfig/Makefile.am
@@ -5,7 +5,7 @@ kcm_displayconfig_la_SOURCES = displayconfig.cpp displayconfigbase.ui displaycon
 
 kcm_displayconfig_la_LDFLAGS  = $(all_libraries) -lkrandr -module -avoid-version -no-undefined
 
-kcm_displayconfig_la_LIBADD = -lkdeui $(LIB_KIO) $(LIB_XRANDR)
+kcm_displayconfig_la_LIBADD = -ltdeui $(LIB_KIO) $(LIB_XRANDR)
 
 METASOURCES = AUTO
 
diff --git a/kcontrol/dnssd/CMakeLists.txt b/kcontrol/dnssd/CMakeLists.txt
index 03cb8f87a..bb9050274 100644
--- a/kcontrol/dnssd/CMakeLists.txt
+++ b/kcontrol/dnssd/CMakeLists.txt
@@ -31,6 +31,6 @@ set_source_files_properties( kcmdnssd.cpp PROPERTIES COMPILE_FLAGS -DKDE_CONFDIR
 
 tde_add_kpart( kcm_kdnssd AUTOMOC
   SOURCES configdialog.ui kcmdnssd.cpp
-  LINK kdnssd-shared kdeui-shared
+  LINK kdnssd-shared tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/dnssd/kcmdnssd.cpp b/kcontrol/dnssd/kcmdnssd.cpp
index 6fae0b216..3b3f85f96 100644
--- a/kcontrol/dnssd/kcmdnssd.cpp
+++ b/kcontrol/dnssd/kcmdnssd.cpp
@@ -97,7 +97,7 @@ void KCMDnssd::save()
 
 	  KProcess *proc = new KProcess;
 
-	  *proc << "kdesu";
+	  *proc << "tdesu";
 
 	  if (enableZeroconf->isChecked()) {
 	    if (KMessageBox::warningYesNo( this, scaryMessage, i18n("Enable Zeroconf Network Browsing"), KGuiItem(i18n("Enable Browsing")), KGuiItem(i18n("Don't Enable Browsing")) ) == KMessageBox::Yes) {	    
diff --git a/kcontrol/filetypes/Makefile.am b/kcontrol/filetypes/Makefile.am
index 4190cd718..4f25b9def 100644
--- a/kcontrol/filetypes/Makefile.am
+++ b/kcontrol/filetypes/Makefile.am
@@ -21,7 +21,7 @@ libfiletypes_la_SOURCES = filetypesview.cpp filetypedetails.cpp filegroupdetails
 
 keditfiletype_SOURCES = keditfiletype.cpp
 keditfiletype_LDADD = libfiletypes.la $(LIB_KIO)
-keditfiletype_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+keditfiletype_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 messages:
 	$(XGETTEXT) *.cpp -o $(podir)/filetypes.pot
diff --git a/kcontrol/fonts/CMakeLists.txt b/kcontrol/fonts/CMakeLists.txt
index 76a335aa9..46787bcd6 100644
--- a/kcontrol/fonts/CMakeLists.txt
+++ b/kcontrol/fonts/CMakeLists.txt
@@ -53,7 +53,7 @@ install( FILES fonts.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 tde_add_kpart( kcm_fonts AUTOMOC
   SOURCES fonts.cpp
-  LINK kxftconfig-static krdb-static kdeui-shared
+  LINK kxftconfig-static krdb-static tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp
index 481ae9c7f..163d6f378 100644
--- a/kcontrol/fonts/fonts.cpp
+++ b/kcontrol/fonts/fonts.cpp
@@ -522,7 +522,7 @@ KFonts::KFonts(TQWidget *parent, const char *name, const TQStringList &)
 
   TQValueList<TQFont> defaultFontList;
 
-  // Keep in sync with kdelibs/kdecore/kglobalsettings.cpp
+  // Keep in sync with kdelibs/tdecore/kglobalsettings.cpp
 
   TQFont f0("Sans Serif", 10);
   TQFont f1("Monospace", 10);
diff --git a/kcontrol/iccconfig/Makefile.am b/kcontrol/iccconfig/Makefile.am
index 3484a3708..9d8aec569 100644
--- a/kcontrol/iccconfig/Makefile.am
+++ b/kcontrol/iccconfig/Makefile.am
@@ -5,7 +5,7 @@ kcm_iccconfig_la_SOURCES = iccconfig.cpp iccconfigbase.ui iccconfig.skel
 
 kcm_iccconfig_la_LDFLAGS  = $(all_libraries) -lkrandr -module -avoid-version -no-undefined
 
-kcm_iccconfig_la_LIBADD = -lkdeui $(LIB_KIO) $(LIB_XRANDR)
+kcm_iccconfig_la_LIBADD = -ltdeui $(LIB_KIO) $(LIB_XRANDR)
 
 METASOURCES = AUTO
 
diff --git a/kcontrol/info/CMakeLists.txt b/kcontrol/info/CMakeLists.txt
index 531f52780..fdd30ef2f 100644
--- a/kcontrol/info/CMakeLists.txt
+++ b/kcontrol/info/CMakeLists.txt
@@ -36,6 +36,6 @@ install( FILES
 
 tde_add_kpart( kcm_info AUTOMOC
   SOURCES main.cpp memory.cpp opengl.cpp
-  LINK kdeui-shared
+  LINK tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/ioslaveinfo/Makefile.am b/kcontrol/ioslaveinfo/Makefile.am
index 14150d57c..75def7ba6 100644
--- a/kcontrol/ioslaveinfo/Makefile.am
+++ b/kcontrol/ioslaveinfo/Makefile.am
@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_ioslaveinfo.la
 kcm_ioslaveinfo_la_SOURCES = kcmioslaveinfo.cpp
 
 kcm_ioslaveinfo_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
-kcm_ioslaveinfo_la_LIBADD = -lkdeui $(LIB_KIO)
+kcm_ioslaveinfo_la_LIBADD = -ltdeui $(LIB_KIO)
 
 AM_CPPFLAGS= $(all_includes)
 
diff --git a/kcontrol/joystick/CMakeLists.txt b/kcontrol/joystick/CMakeLists.txt
index 14d6bc487..4cc1060f0 100644
--- a/kcontrol/joystick/CMakeLists.txt
+++ b/kcontrol/joystick/CMakeLists.txt
@@ -31,6 +31,6 @@ tde_add_kpart( kcm_joystick AUTOMOC
   SOURCES
     joystick.cpp joywidget.cpp poswidget.cpp
     joydevice.cpp caldialog.cpp
-  LINK kdeui-shared
+  LINK tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/kcontrol/CMakeLists.txt b/kcontrol/kcontrol/CMakeLists.txt
index a197d7347..401d1d25c 100644
--- a/kcontrol/kcontrol/CMakeLists.txt
+++ b/kcontrol/kcontrol/CMakeLists.txt
@@ -30,7 +30,7 @@ install( FILES kinfocenterui.rc DESTINATION ${DATA_INSTALL_DIR}/kinfocenter )
 install( FILES  KControl.desktop kinfocenter.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 
-##### kcontrol (kdeinit) ########################
+##### kcontrol (tdeinit) ########################
 
 set( target kcontrol )
 
@@ -42,7 +42,7 @@ set( ${target}_SRCS
   searchwidget.cpp
 )
 
-tde_add_kdeinit_executable( ${target} AUTOMOC
+tde_add_tdeinit_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
   LINK khtml-shared
 )
diff --git a/kcontrol/kcontrol/Makefile.am b/kcontrol/kcontrol/Makefile.am
index 2f2c3a6bc..dd20b9224 100644
--- a/kcontrol/kcontrol/Makefile.am
+++ b/kcontrol/kcontrol/Makefile.am
@@ -24,7 +24,7 @@ SUBDIRS = . about
 
 bin_PROGRAMS =
 lib_LTLIBRARIES =
-kdeinit_LTLIBRARIES = kcontrol.la
+tdeinit_LTLIBRARIES = kcontrol.la
 
 kcontrol_la_SOURCES = main.cpp toplevel.cpp indexwidget.cpp \
 	helpwidget.cpp dockcontainer.cpp aboutwidget.cpp \
diff --git a/kcontrol/kcontrol/aboutwidget.cpp b/kcontrol/kcontrol/aboutwidget.cpp
index 9c7d25898..614a65e7b 100644
--- a/kcontrol/kcontrol/aboutwidget.cpp
+++ b/kcontrol/kcontrol/aboutwidget.cpp
@@ -111,9 +111,9 @@ void AboutWidget::updatePixmap()
     TQTextStream t(  &f );
     TQString res = t.read();
 
-    res = res.arg(  locate(  "data", "kdeui/about/kde_infopage.css" ) );
+    res = res.arg(  locate(  "data", "tdeui/about/kde_infopage.css" ) );
     if (  kapp->reverseLayout() )
-        res = res.arg(  "@import \"%1\";" ).arg(  locate(  "data", "kdeui/about/kde_infopage_rtl.css" ) );
+        res = res.arg(  "@import \"%1\";" ).arg(  locate(  "data", "tdeui/about/kde_infopage_rtl.css" ) );
     else
         res = res.arg(  "" );
 
diff --git a/kcontrol/kcontrol/modules.cpp b/kcontrol/kcontrol/modules.cpp
index b2ece7c33..88d2124ae 100644
--- a/kcontrol/kcontrol/modules.cpp
+++ b/kcontrol/kcontrol/modules.cpp
@@ -168,10 +168,10 @@ void ConfigModule::runAsRoot()
   // prepare the process to run the kcmshell
   TQString cmd = service()->exec().stripWhiteSpace();
   bool kdeshell = false;
-  if (cmd.left(5) == "kdesu")
+  if (cmd.left(5) == "tdesu")
     {
       cmd = TQString(cmd.remove(0,5)).stripWhiteSpace();
-      // remove all kdesu switches
+      // remove all tdesu switches
       while( cmd.length() > 1 && cmd[ 0 ] == '-' )
         {
           int pos = cmd.find( ' ' );
@@ -186,14 +186,14 @@ void ConfigModule::runAsRoot()
     }
 
   // run the process
-  TQString kdesu = KStandardDirs::findExe("kdesu");
-  if (!kdesu.isEmpty())
+  TQString tdesu = KStandardDirs::findExe("tdesu");
+  if (!tdesu.isEmpty())
     {
       _rootProcess = new KProcess;
-      *_rootProcess << kdesu;
+      *_rootProcess << tdesu;
       *_rootProcess << "--nonewdcop";
       // We have to disable the keep-password feature because
-      // in that case the modules is started through kdesud and kdesu
+      // in that case the modules is started through tdesud and tdesu
       // returns before the module is running and that doesn't work.
       // We also don't have a way to close the module in that case.
       *_rootProcess << "--n"; // Don't keep password.
diff --git a/kcontrol/keys/Makefile.am b/kcontrol/keys/Makefile.am
index 1af35102e..e2d897c64 100644
--- a/kcontrol/keys/Makefile.am
+++ b/kcontrol/keys/Makefile.am
@@ -1,7 +1,7 @@
 kde_module_LTLIBRARIES = kcm_keys.la
 
 kcm_keys_la_SOURCES =  shortcuts.cpp modifiers.cpp main.cpp khotkeys.cpp treeview.cpp commandShortcuts.cpp
-kcm_keys_la_LIBADD   = -lkdeui -lkio
+kcm_keys_la_LIBADD   = -ltdeui -lkio
 kcm_keys_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
 
 AM_CPPFLAGS= $(all_includes)
diff --git a/kcontrol/keys/kaccelaction.h b/kcontrol/keys/kaccelaction.h
index 144427d9c..6a41d3a05 100644
--- a/kcontrol/keys/kaccelaction.h
+++ b/kcontrol/keys/kaccelaction.h
@@ -1,4 +1,4 @@
-// THIS FILE IS A COPY OF kdelibs/kdecore/kaccelaction.h AND MUST BE KEPT
+// THIS FILE IS A COPY OF kdelibs/tdecore/kaccelaction.h AND MUST BE KEPT
 //  IN SYNC WITH THAT FILE.
 
 /* This file is part of the KDE libraries
diff --git a/kcontrol/keys/modifiers.cpp b/kcontrol/keys/modifiers.cpp
index 02ec7dc4d..8cde6989e 100644
--- a/kcontrol/keys/modifiers.cpp
+++ b/kcontrol/keys/modifiers.cpp
@@ -115,7 +115,7 @@ void ModifiersModule::save()
 		if( bMacSwap )
 			setupMacModifierKeys();
 		else
-			kapp->kdeinitExec("kxkb");
+			kapp->tdeinitExec("kxkb");
 		m_bMacSwapOrig = bMacSwap;
 		updateWidgets();
 	}
diff --git a/kcontrol/kfontinst/ChangeLog b/kcontrol/kfontinst/ChangeLog
index b00a53f1e..11bba7e9c 100644
--- a/kcontrol/kfontinst/ChangeLog
+++ b/kcontrol/kfontinst/ChangeLog
@@ -345,7 +345,7 @@ KDE3.1 -> KDE3.2
 
 0.8.2->0.8.3
 ============
-1. Modified 'kfontinst.kdelnk' so that kdesu is now used - so that a user will automatically be prompted
+1. Modified 'kfontinst.kdelnk' so that tdesu is now used - so that a user will automatically be prompted
    for the root password.
 2. Modified dialogs to use the KDE caption ("Font Installer") instead of the app name ("kfontinst")
 3. Corrected size of Configure dialog.
diff --git a/kcontrol/kfontinst/kio/CMakeLists.txt b/kcontrol/kfontinst/kio/CMakeLists.txt
index abb65350b..9c6d0ad83 100644
--- a/kcontrol/kfontinst/kio/CMakeLists.txt
+++ b/kcontrol/kfontinst/kio/CMakeLists.txt
@@ -34,6 +34,6 @@ install( FILES folder.desktop system-folder.desktop package.desktop DESTINATION
 
 tde_add_kpart( kio_fonts AUTOMOC
   SOURCES KioFonts.cpp
-  LINK kxftconfig-static kfontinst-shared kdesu-shared
+  LINK kxftconfig-static kfontinst-shared tdesu-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/kfontinst/kio/KioFonts.cpp b/kcontrol/kfontinst/kio/KioFonts.cpp
index cef1fd9dd..96abb89db 100644
--- a/kcontrol/kfontinst/kio/KioFonts.cpp
+++ b/kcontrol/kfontinst/kio/KioFonts.cpp
@@ -59,7 +59,7 @@
 #include <kinstance.h>
 #include <klargefile.h>
 #include <ktempfile.h>
-#include <kdesu/su.h>
+#include <tdesu/su.h>
 #include <kprocess.h>
 #include <kdebug.h>
 #include <ktar.h>
diff --git a/kcontrol/kfontinst/kio/Makefile.am b/kcontrol/kfontinst/kio/Makefile.am
index ad0f2ea8e..a2643d8b2 100644
--- a/kcontrol/kfontinst/kio/Makefile.am
+++ b/kcontrol/kfontinst/kio/Makefile.am
@@ -2,7 +2,7 @@ kde_module_LTLIBRARIES = kio_fonts.la
 kio_fonts_la_SOURCES = \
 KioFonts.cpp
 
-kio_fonts_la_LIBADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) -lkdesu ../lib/libkfontinst.la
+kio_fonts_la_LIBADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) -ltdesu ../lib/libkfontinst.la
 kio_fonts_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) -module -avoid-version -no-undefined
 AM_CPPFLAGS= -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE
 
diff --git a/kcontrol/kfontinst/viewpart/CMakeLists.txt b/kcontrol/kfontinst/viewpart/CMakeLists.txt
index e58fb7cc6..630d1aff4 100644
--- a/kcontrol/kfontinst/viewpart/CMakeLists.txt
+++ b/kcontrol/kfontinst/viewpart/CMakeLists.txt
@@ -51,5 +51,5 @@ tde_add_executable( kfontview AUTOMOC
 
 tde_add_library( kfontinstprint STATIC_PIC
   SOURCES KfiPrint.cpp
-  LINK kdeprint-shared
+  LINK tdeprint-shared
 )
diff --git a/kcontrol/kfontinst/viewpart/Makefile.am b/kcontrol/kfontinst/viewpart/Makefile.am
index f7c365475..4379ab4f1 100644
--- a/kcontrol/kfontinst/viewpart/Makefile.am
+++ b/kcontrol/kfontinst/viewpart/Makefile.am
@@ -17,7 +17,7 @@ AM_CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFR
 METASOURCES = AUTO
 
 kfontview_LDADD = $(LIB_KPARTS)
-kfontview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kfontview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 bin_PROGRAMS = kfontview
 xdg_apps_DATA = kfontview.desktop
diff --git a/kcontrol/konqhtml/Makefile.am b/kcontrol/konqhtml/Makefile.am
index 87cf8a664..a16c324e4 100644
--- a/kcontrol/konqhtml/Makefile.am
+++ b/kcontrol/konqhtml/Makefile.am
@@ -13,7 +13,7 @@ kcm_konqhtml_la_SOURCES = advancedTabDialog.cpp htmlopts.cpp jsopts.cpp \
 			     filteropts.cpp
 
 kcm_konqhtml_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
-kcm_konqhtml_la_LIBADD = -lkhtml -lkdeui
+kcm_konqhtml_la_LIBADD = -lkhtml -ltdeui
 
 xdg_apps_DATA = khtml_behavior.desktop khtml_java_js.desktop khtml_fonts.desktop khtml_filter.desktop
 
diff --git a/kcontrol/konsole/Makefile.am b/kcontrol/konsole/Makefile.am
index 622e7fa71..91be65e2a 100644
--- a/kcontrol/konsole/Makefile.am
+++ b/kcontrol/konsole/Makefile.am
@@ -4,7 +4,7 @@ kcm_konsole_la_SOURCES =  schemaeditor.cpp sessioneditor.cpp kcmkonsole.cpp \
 	schemadialog.ui sessiondialog.ui kcmkonsoledialog.ui
 
 kcm_konsole_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
-kcm_konsole_la_LIBADD = -lkdeui $(LIB_KIO)
+kcm_konsole_la_LIBADD = -ltdeui $(LIB_KIO)
 AM_CPPFLAGS = $(all_includes) 
 
 METASOURCES = AUTO 
diff --git a/kcontrol/krdb/CMakeLists.txt b/kcontrol/krdb/CMakeLists.txt
index 95b99bdd2..669875032 100644
--- a/kcontrol/krdb/CMakeLists.txt
+++ b/kcontrol/krdb/CMakeLists.txt
@@ -34,5 +34,5 @@ install( FILES kcmdisplayrc.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
 
 tde_add_library( krdb STATIC_PIC AUTOMOC
   SOURCES krdb.cpp
-  LINK kdecore-shared
+  LINK tdecore-shared
 )
diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp
index d2e4731bd..dfeb7c69e 100644
--- a/kcontrol/krdb/krdb.cpp
+++ b/kcontrol/krdb/krdb.cpp
@@ -88,7 +88,7 @@ static void applyGtkStyles(bool active, int version)
    if (!active)
       ::unlink(TQFile::encodeName(gtkkde));
 
-   // Pass env. var to kdeinit.
+   // Pass env. var to tdeinit.
    TQCString name = gtkEnvVar(version);
    TQCString value = TQFile::encodeName(list.join(":"));
    TQByteArray params;
diff --git a/kcontrol/launch/CMakeLists.txt b/kcontrol/launch/CMakeLists.txt
index 511363f3c..d0c384f4b 100644
--- a/kcontrol/launch/CMakeLists.txt
+++ b/kcontrol/launch/CMakeLists.txt
@@ -28,6 +28,6 @@ install( FILES kcmlaunch.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 tde_add_kpart( kcm_launch AUTOMOC
   SOURCES kcmlaunch.cpp
-  LINK kdeui-shared
+  LINK tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/locale/kcmlocale.cpp b/kcontrol/locale/kcmlocale.cpp
index c2ca4c310..5a3dc8b50 100644
--- a/kcontrol/locale/kcmlocale.cpp
+++ b/kcontrol/locale/kcmlocale.cpp
@@ -124,7 +124,7 @@ void KLocaleConfig::slotInstallLanguage()
 {
   KProcess *proc = new KProcess;
 
-  *proc << "kdesu";
+  *proc << "tdesu";
   *proc << "qt-language-selector --mode install";
   TQApplication::connect(proc, TQT_SIGNAL(processExited(KProcess *)),
 			this, TQT_SLOT(slotLanguageSelectorExited(KProcess *)));
@@ -136,7 +136,7 @@ void KLocaleConfig::slotUninstallLanguage()
 {
   KProcess *proc = new KProcess;
 
-  *proc << "kdesu";
+  *proc << "tdesu";
   *proc << "qt-language-selector --mode uninstall";
   TQApplication::connect(proc, TQT_SIGNAL(processExited(KProcess *)),
 			this, TQT_SLOT(slotLanguageSelectorExited(KProcess *)));
@@ -148,7 +148,7 @@ void KLocaleConfig::slotSelectLanguage()
 {
   KProcess *proc = new KProcess;
 
-  *proc << "kdesu";
+  *proc << "tdesu";
   *proc << "qt-language-selector --mode select";
   TQApplication::connect(proc, TQT_SIGNAL(processExited(KProcess *)),
 			this, TQT_SLOT(slotLanguageSelectorExited(KProcess *)));
diff --git a/kcontrol/nics/Makefile.am b/kcontrol/nics/Makefile.am
index 9cd225329..6bcf92088 100644
--- a/kcontrol/nics/Makefile.am
+++ b/kcontrol/nics/Makefile.am
@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_nic.la
 kcm_nic_la_SOURCES = nic.cpp
 
 kcm_nic_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
-kcm_nic_la_LIBADD = -lkdeui $(LIB_KIO) $(LIBSOCKET)
+kcm_nic_la_LIBADD = -ltdeui $(LIB_KIO) $(LIBSOCKET)
 
 AM_CPPFLAGS= $(all_includes)
 
diff --git a/kcontrol/performance/CMakeLists.txt b/kcontrol/performance/CMakeLists.txt
index 5c4a2a20a..59f5b2b02 100644
--- a/kcontrol/performance/CMakeLists.txt
+++ b/kcontrol/performance/CMakeLists.txt
@@ -29,6 +29,6 @@ install( FILES kcmkonqyperformance.desktop DESTINATION ${APPS_INSTALL_DIR}/.hidd
 
 tde_add_kpart( kcm_performance AUTOMOC
   SOURCES kcmperformance.cpp konqueror.cpp konqueror_ui.ui system.cpp system_ui.ui
-  LINK kdeui-shared
+  LINK tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/performance/Makefile.am b/kcontrol/performance/Makefile.am
index 5ae59d89e..8f7904990 100644
--- a/kcontrol/performance/Makefile.am
+++ b/kcontrol/performance/Makefile.am
@@ -2,7 +2,7 @@ kde_module_LTLIBRARIES = kcm_performance.la
 
 kcm_performance_la_SOURCES = kcmperformance.cpp konqueror.cpp konqueror_ui.ui system.cpp system_ui.ui
 kcm_performance_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
-kcm_performance_la_LIBADD = -lkdeui
+kcm_performance_la_LIBADD = -ltdeui
 AM_CPPFLAGS= $(all_includes) 
 
 METASOURCES = AUTO
diff --git a/kcontrol/privacy/kprivacymanager.cpp b/kcontrol/privacy/kprivacymanager.cpp
index 098c3e75f..257dc6e27 100644
--- a/kcontrol/privacy/kprivacymanager.cpp
+++ b/kcontrol/privacy/kprivacymanager.cpp
@@ -134,7 +134,7 @@ bool KPrivacyManager::clearWebHistory()
   if(!isApplicationRegistered("konqueror"))
   {
     kdDebug() << "couldn't find Konqueror instance, preloading." << endl;
-    kapp->kdeinitExec("konqueror", args, 0,0);
+    kapp->tdeinitExec("konqueror", args, 0,0);
   }
 
   return kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
diff --git a/kcontrol/randr/CMakeLists.txt b/kcontrol/randr/CMakeLists.txt
index 23999116e..3e816f2fb 100644
--- a/kcontrol/randr/CMakeLists.txt
+++ b/kcontrol/randr/CMakeLists.txt
@@ -31,7 +31,7 @@ install( FILES krandrtray-autostart.desktop DESTINATION ${AUTOSTART_INSTALL_DIR}
 
 tde_add_kpart( kcm_randr AUTOMOC
   SOURCES krandrmodule.cpp
-  LINK kdeui-shared krandr-shared
+  LINK tdeui-shared krandr-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
diff --git a/kcontrol/smartcard/Makefile.am b/kcontrol/smartcard/Makefile.am
index 940dfaacc..ee2546c66 100644
--- a/kcontrol/smartcard/Makefile.am
+++ b/kcontrol/smartcard/Makefile.am
@@ -5,7 +5,7 @@ kcm_smartcard_la_SOURCES = smartcard.cpp smartcardbase.ui nosmartcardbase.ui sma
 
 kcm_smartcard_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
 
-kcm_smartcard_la_LIBADD = -lkdeui -lksmartcard $(LIB_KIO)
+kcm_smartcard_la_LIBADD = -ltdeui -lksmartcard $(LIB_KIO)
 
 METASOURCES = AUTO
 
diff --git a/kcontrol/smartcard/nosmartcardbase.ui b/kcontrol/smartcard/nosmartcardbase.ui
index 2620af0b5..968171316 100644
--- a/kcontrol/smartcard/nosmartcardbase.ui
+++ b/kcontrol/smartcard/nosmartcardbase.ui
@@ -44,7 +44,7 @@
                     </property>
                     <property name="text">
                         <string>
-1) The KDE daemon, 'kded' is not running. You can restart it by running the command 'kdeinit' and then try reloading the KDE Control Center to see if this message goes away.
+1) The KDE daemon, 'kded' is not running. You can restart it by running the command 'tdeinit' and then try reloading the KDE Control Center to see if this message goes away.
 
 2) You don't appear to have smartcard support in the KDE libraries. You will need to recompile the kdelibs package with libpcsclite installed.</string>
                     </property>
diff --git a/kcontrol/smserver/CMakeLists.txt b/kcontrol/smserver/CMakeLists.txt
index 0f80ac7fa..a4d0b4df8 100644
--- a/kcontrol/smserver/CMakeLists.txt
+++ b/kcontrol/smserver/CMakeLists.txt
@@ -28,6 +28,6 @@ install( FILES kcmsmserver.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 tde_add_kpart( kcm_smserver AUTOMOC
   SOURCES kcmsmserver.cpp smserverconfigdlg.ui smserverconfigimpl.cpp
-  LINK kdeui-shared
+  LINK tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/smserver/Makefile.am b/kcontrol/smserver/Makefile.am
index 7cecaf66e..8b1ac7f50 100644
--- a/kcontrol/smserver/Makefile.am
+++ b/kcontrol/smserver/Makefile.am
@@ -2,7 +2,7 @@ kde_module_LTLIBRARIES = kcm_smserver.la
 
 kcm_smserver_la_SOURCES = kcmsmserver.cpp smserverconfigdlg.ui smserverconfigimpl.cpp
 kcm_smserver_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
-kcm_smserver_la_LIBADD = -lkdeui
+kcm_smserver_la_LIBADD = -ltdeui
 AM_CPPFLAGS= $(all_includes) 
 
 METASOURCES = AUTO
diff --git a/kcontrol/spellchecking/CMakeLists.txt b/kcontrol/spellchecking/CMakeLists.txt
index a6616de45..5f7de3be5 100644
--- a/kcontrol/spellchecking/CMakeLists.txt
+++ b/kcontrol/spellchecking/CMakeLists.txt
@@ -28,6 +28,6 @@ install( FILES spellchecking.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 tde_add_kpart( kcm_spellchecking AUTOMOC
   SOURCES spellchecking.cpp
-  LINK kdeui-shared
+  LINK tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/spellchecking/Makefile.am b/kcontrol/spellchecking/Makefile.am
index e4740eb8e..41c9a17f2 100644
--- a/kcontrol/spellchecking/Makefile.am
+++ b/kcontrol/spellchecking/Makefile.am
@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_spellchecking.la
 kcm_spellchecking_la_SOURCES = spellchecking.cpp
 
 kcm_spellchecking_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kcm_spellchecking_la_LIBADD = -lkdeui
+kcm_spellchecking_la_LIBADD = -ltdeui
 
 AM_CPPFLAGS= $(all_includes)
 
diff --git a/kcontrol/style/keramik/CMakeLists.txt b/kcontrol/style/keramik/CMakeLists.txt
index a4cf8c9b7..b68be1c2e 100644
--- a/kcontrol/style/keramik/CMakeLists.txt
+++ b/kcontrol/style/keramik/CMakeLists.txt
@@ -24,6 +24,6 @@ link_directories(
 
 tde_add_kpart( kstyle_keramik_config AUTOMOC
   SOURCES keramikconf.cpp
-  LINK kdeui-shared
+  LINK tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/taskbar/Makefile.am b/kcontrol/taskbar/Makefile.am
index bd458e1be..c3da2a34a 100644
--- a/kcontrol/taskbar/Makefile.am
+++ b/kcontrol/taskbar/Makefile.am
@@ -2,7 +2,7 @@ kde_module_LTLIBRARIES = kcm_taskbar.la
 
 kcm_taskbar_la_SOURCES = kcmtaskbarui.ui kcmtaskbar.cpp
 kcm_taskbar_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
-kcm_taskbar_la_LIBADD = $(top_builddir)/kicker/taskbar/libtaskbar.la -lkdeui
+kcm_taskbar_la_LIBADD = $(top_builddir)/kicker/taskbar/libtaskbar.la -ltdeui
 AM_CPPFLAGS = -I$(top_builddir)/kicker/taskbar $(all_includes) 
 
 METASOURCES = AUTO
diff --git a/kcontrol/usbview/CMakeLists.txt b/kcontrol/usbview/CMakeLists.txt
index b33305d0e..a55aacbd7 100644
--- a/kcontrol/usbview/CMakeLists.txt
+++ b/kcontrol/usbview/CMakeLists.txt
@@ -37,6 +37,6 @@ endif( )
 tde_add_kpart( kcm_usb AUTOMOC
   SOURCES
     kcmusb.cpp usbdevices.cpp usbdb.cpp
-  LINK kdeui-shared
+  LINK tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/view1394/CMakeLists.txt b/kcontrol/view1394/CMakeLists.txt
index e691ead03..e0ab3b2ce 100644
--- a/kcontrol/view1394/CMakeLists.txt
+++ b/kcontrol/view1394/CMakeLists.txt
@@ -30,6 +30,6 @@ install( FILES oui.db DESTINATION ${DATA_INSTALL_DIR}/kcmview1394 )
 
 tde_add_kpart( kcm_view1394 AUTOMOC
   SOURCES view1394widget.ui view1394.cpp
-  LINK kdeui-shared ${LIBRAW1394_LIBRARIES}
+  LINK tdeui-shared ${LIBRAW1394_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/xinerama/CMakeLists.txt b/kcontrol/xinerama/CMakeLists.txt
index 5cd2765fe..1a7419eb0 100644
--- a/kcontrol/xinerama/CMakeLists.txt
+++ b/kcontrol/xinerama/CMakeLists.txt
@@ -28,6 +28,6 @@ install( FILES xinerama.desktop DESTINATION ${APPS_INSTALL_DIR}/.hidden )
 
 tde_add_kpart( kcm_xinerama AUTOMOC
   SOURCES kcmxinerama.cpp xineramawidget.ui
-  LINK kdeui-shared
+  LINK tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/xinerama/Makefile.am b/kcontrol/xinerama/Makefile.am
index 5b0da6939..c7be54e04 100644
--- a/kcontrol/xinerama/Makefile.am
+++ b/kcontrol/xinerama/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kcm_xinerama.la
 kcm_xinerama_la_SOURCES = kcmxinerama.cpp xineramawidget.ui
 
 kcm_xinerama_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
-kcm_xinerama_la_LIBADD = -lkdeui
+kcm_xinerama_la_LIBADD = -ltdeui
 
 METASOURCES = AUTO