Additional kde to tde renaming

44 files changed, 102 insertions, 102 deletions

diff --git a/dcopjava/binding/Makefile.am b/dcopjava/binding/Makefile.am
index fdb01a9d..84f88d23 100644
--- a/dcopjava/binding/Makefile.am
+++ b/dcopjava/binding/Makefile.am
@@ -1,7 +1,7 @@
 lib_LTLIBRARIES = libjavadcop.la
 
 libjavadcop_la_SOURCES = client.cpp 
-libjavadcop_la_LDFLAGS = $(KDE_LDFLAGS) $(KDE_PLUGIN) -lDCOP -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx
+libjavadcop_la_LDFLAGS = $(KDE_LDFLAGS) $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx
 libjavadcop_la_LIBADD = $(LIB_KDECORE)
 
 INCLUDES = $(jni_includes) $(all_includes)
diff --git a/dcopjava/dcopidl2java/Makefile.am b/dcopjava/dcopidl2java/Makefile.am
index 2ec44cf7..e525955b 100644
--- a/dcopjava/dcopidl2java/Makefile.am
+++ b/dcopjava/dcopidl2java/Makefile.am
@@ -7,5 +7,5 @@ dcopidl2java_SOURCES = main.cpp skel.cpp stubimpl.cpp
 noinst_HEADERS = main.h
 
 dcopidl2java_LDADD = $(LIB_QT)
-dcopidl2java_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+dcopidl2java_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
diff --git a/dcopperl/Makefile.PL b/dcopperl/Makefile.PL
index c22ff234..8517a323 100644
--- a/dcopperl/Makefile.PL
+++ b/dcopperl/Makefile.PL
@@ -27,7 +27,7 @@ WriteMakefile(
     NAME	=> 'DCOP',
     VERSION_FROM => 'DCOP.pm',
     INC		=> "-I$qt_inc -I$kde_inc",
-    LIBS	=> "-L$qt_lib -lqt-mt -L$kde_lib -lkdecore -lDCOP",
+    LIBS	=> "-L$qt_lib -lqt-mt -L$kde_lib -ltdecore -lDCOP",
     XS		=> {'DCOP.xs' => 'DCOP.cpp'},
     XSOPT	=> '-C++',
     CCFLAGS	=> '-x c++',
diff --git a/dcopperl/Makefile.PL.in b/dcopperl/Makefile.PL.in
index 2a8e355b..e30f32a4 100644
--- a/dcopperl/Makefile.PL.in
+++ b/dcopperl/Makefile.PL.in
@@ -13,7 +13,7 @@ WriteMakefile(
     NAME	=> 'DCOP',
     VERSION_FROM => '@srcdir@/DCOP.pm',
     INC		=> "-I$qt_inc -I$kde_inc",
-    LIBS	=> "-L$qt_lib -lqt-mt -L$kde_lib -lkdecore -lDCOP",
+    LIBS	=> "-L$qt_lib -lqt-mt -L$kde_lib -ltdecore -lDCOP",
     XS		=> {'DCOP.xs' => 'DCOP.cpp'},
     XSOPT	=> '-C++',
     CCFLAGS	=> '-x c++',
diff --git a/dcoppython/shell/Makefile.am b/dcoppython/shell/Makefile.am
index 3ec2906f..57e9d51c 100644
--- a/dcoppython/shell/Makefile.am
+++ b/dcoppython/shell/Makefile.am
@@ -17,7 +17,7 @@ pythlibdir = $(PYTHONMODDIR)/site-packages
 
 pcop_la_SOURCES = pcop.cpp marshaller.cpp importedmodules.cpp
 pcop_la_LDFLAGS = $(all_libraries) -module -avoid-version
-pcop_la_LIBADD = -lDCOP -lkdecore $(LIB_QT)
+pcop_la_LIBADD = -lDCOP -ltdecore $(LIB_QT)
 
 noinst_HEADERS = pcop.h marshaller.h marshal_funcs.h importedmodules.h
 
diff --git a/dcoppython/test/dcopserver/Makefile.am b/dcoppython/test/dcopserver/Makefile.am
index dbb40a44..96fae9de 100644
--- a/dcoppython/test/dcopserver/Makefile.am
+++ b/dcoppython/test/dcopserver/Makefile.am
@@ -21,7 +21,7 @@ bin_PROGRAMS = kdedcoptest
 
 # the application source, library search path, and link libraries
 kdedcoptest_SOURCES = main.cpp kdedcoptest.cpp kdedcoptest_iface.skel mainclass.cpp
-kdedcoptest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kdedcoptest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 kdedcoptest_LDADD = $(LIB_KDEUI)
 
 # this is where the desktop file will go 
diff --git a/kalyptus/README b/kalyptus/README
index 373e4000..a966384d 100644
--- a/kalyptus/README
+++ b/kalyptus/README
@@ -51,8 +51,8 @@ Remove any Q_OVERRIDE macros from the Qt headers, and remove EXPORT_DOCKCLASS fr
 KDE headers
 
 # Generate Java and C++ sources. Copy all the target headers to directory 'test/tmp'
-kalyptus -fjava test/tmp/*.h test/tmp/dom/*.h test/tmp/kio/*.h test/tmp/kdeprint/*.h \
-   test/tmp/kjs/*.h test/tmp/kparts/*.h test/tmp/kdesu/*.h test/ktextedit/*.h test/tmp/libkmid/*.h
+kalyptus -fjava test/tmp/*.h test/tmp/dom/*.h test/tmp/kio/*.h test/tmp/tdeprint/*.h \
+   test/tmp/kjs/*.h test/tmp/kparts/*.h test/tmp/tdesu/*.h test/ktextedit/*.h test/tmp/libkmid/*.h
 
 # Shorten generated filenames
 mv DOM__Node.cpp DOMNode.cpp
diff --git a/kalyptus/kalyptusCxxToJNI.pm b/kalyptus/kalyptusCxxToJNI.pm
index df45eb94..65c6fa41 100644
--- a/kalyptus/kalyptusCxxToJNI.pm
+++ b/kalyptus/kalyptusCxxToJNI.pm
@@ -3355,7 +3355,7 @@ sub addIncludeForClass($$$)
 {
     my ( $node, $addInclude, $debugMe ) = @_;
     my $sourcename = $node->{Source}->{astNodeName};
-    if ( $sourcename !~ s!.*(kio/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|kdeprint/|kdesu/)(.*)!$1$2!m ) {
+    if ( $sourcename !~ s!.*(kio/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
     	$sourcename =~ s!.*/(.*)!$1!m;
 	}
 #    die "Empty source name for $node->{astNodeName}" if ( $sourcename eq '' );
@@ -3624,7 +3624,7 @@ sub generateMethod($$$$$$$$$)
 			return;
 		}
 
-		if ( $sourcename !~ s!.*(kio/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|kdeprint/|kdesu/)(.*)!$1$2!m ) {
+		if ( $sourcename !~ s!.*(kio/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
 			$sourcename =~ s!.*/(.*)!$1!m;
 		}
 		if ( $sourcename eq '' ) {
@@ -4155,7 +4155,7 @@ sub generateAllMethods($$$$$$$$)
 
     my $sourcename = $classNode->{Source}->{astNodeName};
     
-	if ( $sourcename !~ s!.*(kio/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|kdeprint/|kdesu/)(.*)!$1$2!m ) {
+	if ( $sourcename !~ s!.*(kio/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
     	$sourcename =~ s!.*/(.*)!$1!m;
 	}
 #    die "Empty source name for $classNode->{astNodeName} $classNode->{Source}->{astNodeName}" if ( $sourcename eq '' );
@@ -4164,7 +4164,7 @@ sub generateAllMethods($$$$$$$$)
     	$addInclude->{$sourcename} = 1;
 #		my $s;
 #        for my $sn( @{$classNode->{Sources}} ) {
-#    	if ( ($s = $sn->{astNodeName}) !~ s!.*(kio/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|kdeprint/|kdesu/)(.*)!$1$2!m ) {
+#    	if ( ($s = $sn->{astNodeName}) !~ s!.*(kio/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
 #    		$s =~ s!.*/(.*)!$1!m;
 #		}
 #		$addInclude->{$s} = 1;
diff --git a/kalyptus/kalyptusCxxToJava.pm b/kalyptus/kalyptusCxxToJava.pm
index b6cfde77..524b5f0f 100644
--- a/kalyptus/kalyptusCxxToJava.pm
+++ b/kalyptus/kalyptusCxxToJava.pm
@@ -1732,7 +1732,7 @@ sub generateMethod($$$$$$$)
 			return;
 		}
 
-		if ( $sourcename !~ s!.*(kio/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|kdeprint/|kdesu/)(.*)!$1$2!m ) {
+		if ( $sourcename !~ s!.*(kio/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
 			$sourcename =~ s!.*/(.*)!$1!m;
 		}
 		if ( $sourcename eq '' ) {
@@ -2124,7 +2124,7 @@ sub generateAllMethods($$$$$$)
 
     my $sourcename = $classNode->{Source}->{astNodeName};
     
-	if ( $sourcename !~ s!.*(kio/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|kdeprint/|kdesu/)(.*)!$1$2!m ) {
+	if ( $sourcename !~ s!.*(kio/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
     	$sourcename =~ s!.*/(.*)!$1!m;
 	}
     die "Empty source name for $classNode->{astNodeName}" if ( $sourcename eq '' );
@@ -2148,7 +2148,7 @@ sub generateAllMethods($$$$$$)
 	if ($classNode->{astNodeName} ne $main::globalSpaceClassName) {
 #		my $s;
 #        for my $sn( @{$classNode->{Sources}} ) {
-#    	if ( ($s = $sn->{astNodeName}) !~ s!.*(kio/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|kdeprint/|kdesu/)(.*)!$1$2!m ) {
+#    	if ( ($s = $sn->{astNodeName}) !~ s!.*(kio/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
 #    		$s =~ s!.*/(.*)!$1!m;
 #		}
 #		$addInclude->{$s} = 1;
diff --git a/kalyptus/kalyptusCxxToKimono.pm b/kalyptus/kalyptusCxxToKimono.pm
index 0ddd5d7e..7eedd967 100644
--- a/kalyptus/kalyptusCxxToKimono.pm
+++ b/kalyptus/kalyptusCxxToKimono.pm
@@ -1777,7 +1777,7 @@ sub generateMethod($$$$$$$)
 			return;
 		}
 
-		if ( $sourcename !~ s!.*(kio/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|kdeprint/|kdesu/)(.*)!$1$2!m ) {
+		if ( $sourcename !~ s!.*(kio/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
 			$sourcename =~ s!.*/(.*)!$1!m;
 		}
 		if ( $sourcename eq '' ) {
@@ -2317,7 +2317,7 @@ sub generateAllMethods($$$$$$)
 
     my $sourcename = $classNode->{Source}->{astNodeName};
     
-	if ( $sourcename !~ s!.*(kio/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|kdeprint/|kdesu/)(.*)!$1$2!m ) {
+	if ( $sourcename !~ s!.*(kio/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
     	$sourcename =~ s!.*/(.*)!$1!m;
 	}
     die "Empty source name for $classNode->{astNodeName}" if ( $sourcename eq '' );
@@ -2339,7 +2339,7 @@ sub generateAllMethods($$$$$$)
 	if ($classNode->{astNodeName} ne $main::globalSpaceClassName) {
 #		my $s;
 #        for my $sn( @{$classNode->{Sources}} ) {
-#    	if ( ($s = $sn->{astNodeName}) !~ s!.*(kio/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|kdeprint/|kdesu/)(.*)!$1$2!m ) {
+#    	if ( ($s = $sn->{astNodeName}) !~ s!.*(kio/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
 #    		$s =~ s!.*/(.*)!$1!m;
 #		}
 #		$addInclude->{$s} = 1;
diff --git a/kalyptus/kalyptusCxxToSmoke.pm b/kalyptus/kalyptusCxxToSmoke.pm
index f8cba6f3..6931bac8 100644
--- a/kalyptus/kalyptusCxxToSmoke.pm
+++ b/kalyptus/kalyptusCxxToSmoke.pm
@@ -230,7 +230,7 @@ BEGIN
    'QStyle::SubControls' => 'int',
 );
 
-$headerSubdirectories = "kio/|kdevelop/|kinterfacedesigner/|kontact/|kate/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|kdeprint/|kdesu/|knewstuff/"
+$headerSubdirectories = "kio/|kdevelop/|kinterfacedesigner/|kontact/|kate/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|tdeprint/|tdesu/|knewstuff/"
 
 }
 
diff --git a/kalyptus/kalyptusCxxToSwig.pm b/kalyptus/kalyptusCxxToSwig.pm
index 1430dd91..bd01a125 100644
--- a/kalyptus/kalyptusCxxToSwig.pm
+++ b/kalyptus/kalyptusCxxToSwig.pm
@@ -838,7 +838,7 @@ sub writeClassDoc
 
   my $sourcename = $node->{Source}->{astNodeName};
 
-  if ( $sourcename =~ m!.*(dom|kabc|kdeprint|kdesu|kio|kjs|kparts|ktexteditor|libkmid)/([^/]*$)! ) {
+  if ( $sourcename =~ m!.*(dom|kabc|tdeprint|tdesu|kio|kjs|kparts|ktexteditor|libkmid)/([^/]*$)! ) {
     $sourcename = $1."/".$2;
   } else {
     $sourcename =~ s!.*/([^/]*$)!$1!;
diff --git a/kalyptus/kdocLib.pm b/kalyptus/kdocLib.pm
index 6eac4dff..0e224cb9 100644
--- a/kalyptus/kdocLib.pm
+++ b/kalyptus/kdocLib.pm
@@ -29,7 +29,7 @@ NOTES ON THE NEW FORMAT
 
 	<! KDOC Library HTML Reference File>
 	<VERSION="2.0">
-	<BASE URL="http://www.kde.org/API/kdecore/">
+	<BASE URL="http://www.kde.org/API/tdecore/">
 
 	<C NAME="KApplication" REF="KApplication.html">
 		<IN NAME="QObject">
diff --git a/kdejava/ChangeLog b/kdejava/ChangeLog
index 58b6fd60..dc2e1c6b 100644
--- a/kdejava/ChangeLog
+++ b/kdejava/ChangeLog
@@ -259,7 +259,7 @@
 	* In KContainerLayout, fixed incorrect int literal for vertical value
 2001-08-17  Richard Dale <duke@tipitina.demon.co.uk
 	* Removed classes DwProtocolClient and DwObserver, which 
-          used to be in kdesupport lib (now in kdenetwork).
+          used to be in tdesupport lib (now in kdenetwork).
 2001-08-06  Richard Dale <duke@tipitina.demon.co.uk
 	* Removed obsolete KDirectionButton and KTabButton classes.
         * Improved Java -> C++ slot type signature matching.
diff --git a/kdejava/TODO b/kdejava/TODO
index b179a6aa..4d3d6934 100644
--- a/kdejava/TODO
+++ b/kdejava/TODO
@@ -1,8 +1,8 @@
 - Split up and group java classes into sub packages such as 'org.kde.koala.kparts',
-	and 'org.kde.koala.kdecore'.
+	and 'org.kde.koala.tdecore'.
 
 - Split up shared libs into smaller sub-libraries for faster loading, or write
-	a 'kdejavainit' process in the style of kdeinit (could be a child of kdeinit?).
+	a 'kdejavainit' process in the style of tdeinit (could be a child of tdeinit?).
 	It would need to load all the shared libs, have a JVM ready to roll straight
 	into the main() method of the main class, and then fork() on demand...
 
diff --git a/kdejava/koala/Makefile.am b/kdejava/koala/Makefile.am
index 30ff266d..80dfbe6d 100644
--- a/kdejava/koala/Makefile.am
+++ b/kdejava/koala/Makefile.am
@@ -36,7 +36,7 @@ INCLUDES= $(all_includes)
 koala_METASOURCES = AUTO
 
 # the library search path. 
-koala_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+koala_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 # them while "make clean", use CLEANFILES
 CLEANFILES = koala.jar
diff --git a/kdejava/koala/kdejava/KApplication.cpp b/kdejava/koala/kdejava/KApplication.cpp
index 4bc22d76..6b30200a 100644
--- a/kdejava/koala/kdejava/KApplication.cpp
+++ b/kdejava/koala/kdejava/KApplication.cpp
@@ -559,52 +559,52 @@ Java_org_kde_koala_KApplication_kApplication(JNIEnv* env, jclass cls)
 }
 
 JNIEXPORT jint JNICALL
-Java_org_kde_koala_KApplication_kdeinitExecWait__Ljava_lang_String_2(JNIEnv* env, jclass cls, jstring name)
+Java_org_kde_koala_KApplication_tdeinitExecWait__Ljava_lang_String_2(JNIEnv* env, jclass cls, jstring name)
 {
 	(void) cls;
 static TQString* _qstring_name = 0;
-	jint xret = (jint) KApplicationJBridge::kdeinitExecWait((const TQString&)*(TQString*) QtSupport::toQString(env, name, &_qstring_name));
+	jint xret = (jint) KApplicationJBridge::tdeinitExecWait((const TQString&)*(TQString*) QtSupport::toQString(env, name, &_qstring_name));
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
-Java_org_kde_koala_KApplication_kdeinitExecWait__Ljava_lang_String_2_3Ljava_lang_String_2(JNIEnv* env, jclass cls, jstring name, jobjectArray args)
+Java_org_kde_koala_KApplication_tdeinitExecWait__Ljava_lang_String_2_3Ljava_lang_String_2(JNIEnv* env, jclass cls, jstring name, jobjectArray args)
 {
 	(void) cls;
 static TQString* _qstring_name = 0;
 static TQStringList* _qlist_args = 0;
-	jint xret = (jint) KApplicationJBridge::kdeinitExecWait((const TQString&)*(TQString*) QtSupport::toQString(env, name, &_qstring_name), (const TQStringList&)*(TQStringList*) QtSupport::toQStringList(env, args, &_qlist_args));
+	jint xret = (jint) KApplicationJBridge::tdeinitExecWait((const TQString&)*(TQString*) QtSupport::toQString(env, name, &_qstring_name), (const TQStringList&)*(TQStringList*) QtSupport::toQStringList(env, args, &_qlist_args));
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
-Java_org_kde_koala_KApplication_kdeinitExecWait__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2(JNIEnv* env, jclass cls, jstring name, jobjectArray args, jobject error)
+Java_org_kde_koala_KApplication_tdeinitExecWait__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2(JNIEnv* env, jclass cls, jstring name, jobjectArray args, jobject error)
 {
 	(void) cls;
 static TQString* _qstring_name = 0;
 static TQStringList* _qlist_args = 0;
 static TQString* _qstring_error = 0;
-	jint xret = (jint) KApplicationJBridge::kdeinitExecWait((const TQString&)*(TQString*) QtSupport::toQString(env, name, &_qstring_name), (const TQStringList&)*(TQStringList*) QtSupport::toQStringList(env, args, &_qlist_args), (TQString*) QtSupport::toQStringFromStringBuffer(env, error, &_qstring_error));
+	jint xret = (jint) KApplicationJBridge::tdeinitExecWait((const TQString&)*(TQString*) QtSupport::toQString(env, name, &_qstring_name), (const TQStringList&)*(TQStringList*) QtSupport::toQStringList(env, args, &_qlist_args), (TQString*) QtSupport::toQStringFromStringBuffer(env, error, &_qstring_error));
 	QtSupport::fromQStringToStringBuffer(env, _qstring_error, error);
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
-Java_org_kde_koala_KApplication_kdeinitExecWait__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2_3I(JNIEnv* env, jclass cls, jstring name, jobjectArray args, jobject error, jintArray pid)
+Java_org_kde_koala_KApplication_tdeinitExecWait__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2_3I(JNIEnv* env, jclass cls, jstring name, jobjectArray args, jobject error, jintArray pid)
 {
 	(void) cls;
 static TQString* _qstring_name = 0;
 static TQStringList* _qlist_args = 0;
 static TQString* _qstring_error = 0;
 	int* _int_pid = QtSupport::toIntPtr(env, pid);
-	jint xret = (jint) KApplicationJBridge::kdeinitExecWait((const TQString&)*(TQString*) QtSupport::toQString(env, name, &_qstring_name), (const TQStringList&)*(TQStringList*) QtSupport::toQStringList(env, args, &_qlist_args), (TQString*) QtSupport::toQStringFromStringBuffer(env, error, &_qstring_error),  (int*) _int_pid);
+	jint xret = (jint) KApplicationJBridge::tdeinitExecWait((const TQString&)*(TQString*) QtSupport::toQString(env, name, &_qstring_name), (const TQStringList&)*(TQStringList*) QtSupport::toQStringList(env, args, &_qlist_args), (TQString*) QtSupport::toQStringFromStringBuffer(env, error, &_qstring_error),  (int*) _int_pid);
 	QtSupport::fromQStringToStringBuffer(env, _qstring_error, error);
 	env->SetIntArrayRegion(pid, 0, 1, (jint *) _int_pid);
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
-Java_org_kde_koala_KApplication_kdeinitExecWait__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2_3ILjava_lang_String_2(JNIEnv* env, jclass cls, jstring name, jobjectArray args, jobject error, jintArray pid, jstring startup_id)
+Java_org_kde_koala_KApplication_tdeinitExecWait__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2_3ILjava_lang_String_2(JNIEnv* env, jclass cls, jstring name, jobjectArray args, jobject error, jintArray pid, jstring startup_id)
 {
 	(void) cls;
 static TQString* _qstring_name = 0;
@@ -612,59 +612,59 @@ static TQStringList* _qlist_args = 0;
 static TQString* _qstring_error = 0;
 	int* _int_pid = QtSupport::toIntPtr(env, pid);
 static TQCString* _qcstring_startup_id = 0;
-	jint xret = (jint) KApplicationJBridge::kdeinitExecWait((const TQString&)*(TQString*) QtSupport::toQString(env, name, &_qstring_name), (const TQStringList&)*(TQStringList*) QtSupport::toQStringList(env, args, &_qlist_args), (TQString*) QtSupport::toQStringFromStringBuffer(env, error, &_qstring_error),  (int*) _int_pid, (const TQCString&)*(TQCString*) QtSupport::toQCString(env, startup_id, &_qcstring_startup_id));
+	jint xret = (jint) KApplicationJBridge::tdeinitExecWait((const TQString&)*(TQString*) QtSupport::toQString(env, name, &_qstring_name), (const TQStringList&)*(TQStringList*) QtSupport::toQStringList(env, args, &_qlist_args), (TQString*) QtSupport::toQStringFromStringBuffer(env, error, &_qstring_error),  (int*) _int_pid, (const TQCString&)*(TQCString*) QtSupport::toQCString(env, startup_id, &_qcstring_startup_id));
 	QtSupport::fromQStringToStringBuffer(env, _qstring_error, error);
 	env->SetIntArrayRegion(pid, 0, 1, (jint *) _int_pid);
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
-Java_org_kde_koala_KApplication_kdeinitExec__Ljava_lang_String_2(JNIEnv* env, jclass cls, jstring name)
+Java_org_kde_koala_KApplication_tdeinitExec__Ljava_lang_String_2(JNIEnv* env, jclass cls, jstring name)
 {
 	(void) cls;
 static TQString* _qstring_name = 0;
-	jint xret = (jint) KApplicationJBridge::kdeinitExec((const TQString&)*(TQString*) QtSupport::toQString(env, name, &_qstring_name));
+	jint xret = (jint) KApplicationJBridge::tdeinitExec((const TQString&)*(TQString*) QtSupport::toQString(env, name, &_qstring_name));
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
-Java_org_kde_koala_KApplication_kdeinitExec__Ljava_lang_String_2_3Ljava_lang_String_2(JNIEnv* env, jclass cls, jstring name, jobjectArray args)
+Java_org_kde_koala_KApplication_tdeinitExec__Ljava_lang_String_2_3Ljava_lang_String_2(JNIEnv* env, jclass cls, jstring name, jobjectArray args)
 {
 	(void) cls;
 static TQString* _qstring_name = 0;
 static TQStringList* _qlist_args = 0;
-	jint xret = (jint) KApplicationJBridge::kdeinitExec((const TQString&)*(TQString*) QtSupport::toQString(env, name, &_qstring_name), (const TQStringList&)*(TQStringList*) QtSupport::toQStringList(env, args, &_qlist_args));
+	jint xret = (jint) KApplicationJBridge::tdeinitExec((const TQString&)*(TQString*) QtSupport::toQString(env, name, &_qstring_name), (const TQStringList&)*(TQStringList*) QtSupport::toQStringList(env, args, &_qlist_args));
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
-Java_org_kde_koala_KApplication_kdeinitExec__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2(JNIEnv* env, jclass cls, jstring name, jobjectArray args, jobject error)
+Java_org_kde_koala_KApplication_tdeinitExec__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2(JNIEnv* env, jclass cls, jstring name, jobjectArray args, jobject error)
 {
 	(void) cls;
 static TQString* _qstring_name = 0;
 static TQStringList* _qlist_args = 0;
 static TQString* _qstring_error = 0;
-	jint xret = (jint) KApplicationJBridge::kdeinitExec((const TQString&)*(TQString*) QtSupport::toQString(env, name, &_qstring_name), (const TQStringList&)*(TQStringList*) QtSupport::toQStringList(env, args, &_qlist_args), (TQString*) QtSupport::toQStringFromStringBuffer(env, error, &_qstring_error));
+	jint xret = (jint) KApplicationJBridge::tdeinitExec((const TQString&)*(TQString*) QtSupport::toQString(env, name, &_qstring_name), (const TQStringList&)*(TQStringList*) QtSupport::toQStringList(env, args, &_qlist_args), (TQString*) QtSupport::toQStringFromStringBuffer(env, error, &_qstring_error));
 	QtSupport::fromQStringToStringBuffer(env, _qstring_error, error);
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
-Java_org_kde_koala_KApplication_kdeinitExec__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2_3I(JNIEnv* env, jclass cls, jstring name, jobjectArray args, jobject error, jintArray pid)
+Java_org_kde_koala_KApplication_tdeinitExec__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2_3I(JNIEnv* env, jclass cls, jstring name, jobjectArray args, jobject error, jintArray pid)
 {
 	(void) cls;
 static TQString* _qstring_name = 0;
 static TQStringList* _qlist_args = 0;
 static TQString* _qstring_error = 0;
 	int* _int_pid = QtSupport::toIntPtr(env, pid);
-	jint xret = (jint) KApplicationJBridge::kdeinitExec((const TQString&)*(TQString*) QtSupport::toQString(env, name, &_qstring_name), (const TQStringList&)*(TQStringList*) QtSupport::toQStringList(env, args, &_qlist_args), (TQString*) QtSupport::toQStringFromStringBuffer(env, error, &_qstring_error),  (int*) _int_pid);
+	jint xret = (jint) KApplicationJBridge::tdeinitExec((const TQString&)*(TQString*) QtSupport::toQString(env, name, &_qstring_name), (const TQStringList&)*(TQStringList*) QtSupport::toQStringList(env, args, &_qlist_args), (TQString*) QtSupport::toQStringFromStringBuffer(env, error, &_qstring_error),  (int*) _int_pid);
 	QtSupport::fromQStringToStringBuffer(env, _qstring_error, error);
 	env->SetIntArrayRegion(pid, 0, 1, (jint *) _int_pid);
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
-Java_org_kde_koala_KApplication_kdeinitExec__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2_3ILjava_lang_String_2(JNIEnv* env, jclass cls, jstring name, jobjectArray args, jobject error, jintArray pid, jstring startup_id)
+Java_org_kde_koala_KApplication_tdeinitExec__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2_3ILjava_lang_String_2(JNIEnv* env, jclass cls, jstring name, jobjectArray args, jobject error, jintArray pid, jstring startup_id)
 {
 	(void) cls;
 static TQString* _qstring_name = 0;
@@ -672,7 +672,7 @@ static TQStringList* _qlist_args = 0;
 static TQString* _qstring_error = 0;
 	int* _int_pid = QtSupport::toIntPtr(env, pid);
 static TQCString* _qcstring_startup_id = 0;
-	jint xret = (jint) KApplicationJBridge::kdeinitExec((const TQString&)*(TQString*) QtSupport::toQString(env, name, &_qstring_name), (const TQStringList&)*(TQStringList*) QtSupport::toQStringList(env, args, &_qlist_args), (TQString*) QtSupport::toQStringFromStringBuffer(env, error, &_qstring_error),  (int*) _int_pid, (const TQCString&)*(TQCString*) QtSupport::toQCString(env, startup_id, &_qcstring_startup_id));
+	jint xret = (jint) KApplicationJBridge::tdeinitExec((const TQString&)*(TQString*) QtSupport::toQString(env, name, &_qstring_name), (const TQStringList&)*(TQStringList*) QtSupport::toQStringList(env, args, &_qlist_args), (TQString*) QtSupport::toQStringFromStringBuffer(env, error, &_qstring_error),  (int*) _int_pid, (const TQCString&)*(TQCString*) QtSupport::toQCString(env, startup_id, &_qcstring_startup_id));
 	QtSupport::fromQStringToStringBuffer(env, _qstring_error, error);
 	env->SetIntArrayRegion(pid, 0, 1, (jint *) _int_pid);
 	return xret;
diff --git a/kdejava/koala/kdejava/KApplication.h b/kdejava/koala/kdejava/KApplication.h
index 864ffcae..d55a4ac9 100644
--- a/kdejava/koala/kdejava/KApplication.h
+++ b/kdejava/koala/kdejava/KApplication.h
@@ -126,16 +126,16 @@ extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_startServiceByDesk
 extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_startServiceByDesktopName__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2 (JNIEnv *env, jclass, jstring, jobjectArray, jobject);
 extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_startServiceByDesktopName__Ljava_lang_String_2_3Ljava_lang_String_2 (JNIEnv *env, jclass, jstring, jobjectArray);
 extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_startServiceByDesktopName__Ljava_lang_String_2 (JNIEnv *env, jclass, jstring);
-extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_kdeinitExec__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2_3ILjava_lang_String_2 (JNIEnv *env, jclass, jstring, jobjectArray, jobject, jintArray, jstring);
-extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_kdeinitExec__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2_3I (JNIEnv *env, jclass, jstring, jobjectArray, jobject, jintArray);
-extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_kdeinitExec__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2 (JNIEnv *env, jclass, jstring, jobjectArray, jobject);
-extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_kdeinitExec__Ljava_lang_String_2_3Ljava_lang_String_2 (JNIEnv *env, jclass, jstring, jobjectArray);
-extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_kdeinitExec__Ljava_lang_String_2 (JNIEnv *env, jclass, jstring);
-extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_kdeinitExecWait__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2_3ILjava_lang_String_2 (JNIEnv *env, jclass, jstring, jobjectArray, jobject, jintArray, jstring);
-extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_kdeinitExecWait__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2_3I (JNIEnv *env, jclass, jstring, jobjectArray, jobject, jintArray);
-extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_kdeinitExecWait__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2 (JNIEnv *env, jclass, jstring, jobjectArray, jobject);
-extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_kdeinitExecWait__Ljava_lang_String_2_3Ljava_lang_String_2 (JNIEnv *env, jclass, jstring, jobjectArray);
-extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_kdeinitExecWait__Ljava_lang_String_2 (JNIEnv *env, jclass, jstring);
+extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_tdeinitExec__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2_3ILjava_lang_String_2 (JNIEnv *env, jclass, jstring, jobjectArray, jobject, jintArray, jstring);
+extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_tdeinitExec__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2_3I (JNIEnv *env, jclass, jstring, jobjectArray, jobject, jintArray);
+extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_tdeinitExec__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2 (JNIEnv *env, jclass, jstring, jobjectArray, jobject);
+extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_tdeinitExec__Ljava_lang_String_2_3Ljava_lang_String_2 (JNIEnv *env, jclass, jstring, jobjectArray);
+extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_tdeinitExec__Ljava_lang_String_2 (JNIEnv *env, jclass, jstring);
+extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_tdeinitExecWait__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2_3ILjava_lang_String_2 (JNIEnv *env, jclass, jstring, jobjectArray, jobject, jintArray, jstring);
+extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_tdeinitExecWait__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2_3I (JNIEnv *env, jclass, jstring, jobjectArray, jobject, jintArray);
+extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_tdeinitExecWait__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2 (JNIEnv *env, jclass, jstring, jobjectArray, jobject);
+extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_tdeinitExecWait__Ljava_lang_String_2_3Ljava_lang_String_2 (JNIEnv *env, jclass, jstring, jobjectArray);
+extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_tdeinitExecWait__Ljava_lang_String_2 (JNIEnv *env, jclass, jstring);
 extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_random (JNIEnv *env, jclass);
 extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KApplication_randomString (JNIEnv *env, jclass, jint);
 extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_keyboardMouseState (JNIEnv *env, jclass);
diff --git a/kdejava/koala/kdejava/KDESupport.cpp b/kdejava/koala/kdejava/KDESupport.cpp
index f140d36c..1cf06aff 100644
--- a/kdejava/koala/kdejava/KDESupport.cpp
+++ b/kdejava/koala/kdejava/KDESupport.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          kdesupport.cpp  -  description
+                          tdesupport.cpp  -  description
                              -------------------
     copyright            : (C) 2001 by Richard Dale
     email                : Lost_Highway@tipitina.demon.co.uk
diff --git a/kdejava/koala/kdejava/KDESupport.h b/kdejava/koala/kdejava/KDESupport.h
index 4f0d564a..cf31f971 100644
--- a/kdejava/koala/kdejava/KDESupport.h
+++ b/kdejava/koala/kdejava/KDESupport.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          kdesupport.h  -  description
+                          tdesupport.h  -  description
                              -------------------
     begin                : Mon Feb 5 2001
     copyright            : (C) 2001 by Richard Dale
diff --git a/kdejava/koala/org/kde/koala/KApplication.java b/kdejava/koala/org/kde/koala/KApplication.java
index ba9e7e01..818256e3 100644
--- a/kdejava/koala/org/kde/koala/KApplication.java
+++ b/kdejava/koala/org/kde/koala/KApplication.java
@@ -876,9 +876,9 @@ public class KApplication extends QApplication implements KInstanceInterface {
 	public static native int startServiceByDesktopName(String _name, String[] URLs);
 	public static native int startServiceByDesktopName(String _name);
 	/**	
-		 Starts a program via kdeinit.
+		 Starts a program via tdeinit.
 			 program name and arguments are converted to according to the
-		 local encoding and passed as is to kdeinit.
+		 local encoding and passed as is to tdeinit.
 			@param name Name of the program to start
 			@param args Arguments to pass to the program
 			@param error On failure, <code>error</code> contains a description of the error
@@ -890,16 +890,16 @@ public class KApplication extends QApplication implements KInstanceInterface {
 		           "" ( empty string ) is the default
 				@return an error code indicating success (== 0) or failure (> 0).
    
-		@short    Starts a program via kdeinit.
+		@short    Starts a program via tdeinit.
 	*/
-	public static native int kdeinitExec(String name, String[] args, StringBuffer error, int[] pid, String startup_id);
-	public static native int kdeinitExec(String name, String[] args, StringBuffer error, int[] pid);
-	public static native int kdeinitExec(String name, String[] args, StringBuffer error);
-	public static native int kdeinitExec(String name, String[] args);
-	public static native int kdeinitExec(String name);
+	public static native int tdeinitExec(String name, String[] args, StringBuffer error, int[] pid, String startup_id);
+	public static native int tdeinitExec(String name, String[] args, StringBuffer error, int[] pid);
+	public static native int tdeinitExec(String name, String[] args, StringBuffer error);
+	public static native int tdeinitExec(String name, String[] args);
+	public static native int tdeinitExec(String name);
 	/**	
-		 Starts a program via kdeinit and wait for it to finish.
-			 Like kdeinitExec(), but it waits till the program is finished.
+		 Starts a program via tdeinit and wait for it to finish.
+			 Like tdeinitExec(), but it waits till the program is finished.
 		 As such it behaves similar to the system(...) function.
 			@param name Name of the program to start
 			@param args Arguments to pass to the program
@@ -912,13 +912,13 @@ public class KApplication extends QApplication implements KInstanceInterface {
 		           "" ( empty string ) is the default
 				@return an error code indicating success (== 0) or failure (> 0).
    
-		@short    Starts a program via kdeinit and wait for it to finish.
+		@short    Starts a program via tdeinit and wait for it to finish.
 	*/
-	public static native int kdeinitExecWait(String name, String[] args, StringBuffer error, int[] pid, String startup_id);
-	public static native int kdeinitExecWait(String name, String[] args, StringBuffer error, int[] pid);
-	public static native int kdeinitExecWait(String name, String[] args, StringBuffer error);
-	public static native int kdeinitExecWait(String name, String[] args);
-	public static native int kdeinitExecWait(String name);
+	public static native int tdeinitExecWait(String name, String[] args, StringBuffer error, int[] pid, String startup_id);
+	public static native int tdeinitExecWait(String name, String[] args, StringBuffer error, int[] pid);
+	public static native int tdeinitExecWait(String name, String[] args, StringBuffer error);
+	public static native int tdeinitExecWait(String name, String[] args);
+	public static native int tdeinitExecWait(String name);
 	/**	
 		 Generates a uniform random number.
 				@return A truly unpredictable number in the range [0, RAND_MAX)
diff --git a/kdejava/koala/org/kde/koala/KPanelMenu.java b/kdejava/koala/org/kde/koala/KPanelMenu.java
index 17d60ab2..4eeda34a 100644
--- a/kdejava/koala/org/kde/koala/KPanelMenu.java
+++ b/kdejava/koala/org/kde/koala/KPanelMenu.java
@@ -19,7 +19,7 @@ import org.kde.qt.QWidget;
  relevant entries are: Name, Comment, Icon and X-KDE-Library (which contains the
  library name without any extension). This desktop file has to be installed in
  $KDEDIR/share/apps/kicker/menuext/.
-		@author The kicker maintainers, Michael Goffioul <kdeprint@swing.be>
+		@author The kicker maintainers, Michael Goffioul <tdeprint@swing.be>
  
 		@short Base class to build dynamically loaded menu entries for the K-menu, or the panel.
 
diff --git a/kdejava/koala/test/kblend/KBlendTest.java b/kdejava/koala/test/kblend/KBlendTest.java
index 6e4e4109..67080049 100644
--- a/kdejava/koala/test/kblend/KBlendTest.java
+++ b/kdejava/koala/test/kblend/KBlendTest.java
@@ -11,7 +11,7 @@ import org.kde.koala.*;
  *  Class to test KImageEffect blending effects.
  *
  *  This is a translation to java from kblendtest.cpp in the tests library
- *  of kdeui source.
+ *  of tdeui source.
  *
  * @see KApplication
  * @see KImageEffect
diff --git a/kdejava/koala/test/kcharselect/KCharSelectTest.java b/kdejava/koala/test/kcharselect/KCharSelectTest.java
index c994fb78..b07a1937 100644
--- a/kdejava/koala/test/kcharselect/KCharSelectTest.java
+++ b/kdejava/koala/test/kcharselect/KCharSelectTest.java
@@ -3,7 +3,7 @@ import org.kde.koala.*;
 
 /**
  *
- * Taken from test program of the kdeui tests
+ * Taken from test program of the tdeui tests
  **/
 public class KCharSelectTest {
 
diff --git a/kdejava/koala/test/kcombobox/KComboBoxTest.java b/kdejava/koala/test/kcombobox/KComboBoxTest.java
index b2dd9a2f..c0b8d5fd 100644
--- a/kdejava/koala/test/kcombobox/KComboBoxTest.java
+++ b/kdejava/koala/test/kcombobox/KComboBoxTest.java
@@ -7,7 +7,7 @@ import java.util.*;
  *  Class to text KComboBox widgets.
  *
  *  This is a translation to java from kcomboboxtest.cpp in the tests library
- *  of kdeui source.
+ *  of tdeui source.
  *
  *    Combo boxes tested
  *      - Editable ComboBox
diff --git a/kdejava/koala/test/kfontdialog/KFontDialogTest.java b/kdejava/koala/test/kfontdialog/KFontDialogTest.java
index a210d90e..e1d4a19f 100644
--- a/kdejava/koala/test/kfontdialog/KFontDialogTest.java
+++ b/kdejava/koala/test/kfontdialog/KFontDialogTest.java
@@ -31,7 +31,7 @@ import org.kde.koala.*;
  *  Class to test KFontDialog widgets.
  *
  *  This is a translation to java from kfontdialogtest.cpp in the tests library
- *  of kdeui source.
+ *  of tdeui source.
  *
  * @see KFontDialog
  * @see KApplication
diff --git a/kdejava/koala/test/kprogress/KProgressTest.java b/kdejava/koala/test/kprogress/KProgressTest.java
index 456fbc14..d2d13e40 100644
--- a/kdejava/koala/test/kprogress/KProgressTest.java
+++ b/kdejava/koala/test/kprogress/KProgressTest.java
@@ -5,7 +5,7 @@ import org.kde.koala.*;
  *  Class to test KProgress widget.
  *
  *  This is a translation to java from kprogresstest.cpp in the tests library
- *  of kdeui source.
+ *  of tdeui source.
  *
  * @see KProgress
  * @see KApplication
diff --git a/kjsembed/Makefile.am b/kjsembed/Makefile.am
index a3bdb3bc..a87147a9 100644
--- a/kjsembed/Makefile.am
+++ b/kjsembed/Makefile.am
@@ -75,7 +75,7 @@ changes:
 		--stdout | grep -v 'CCMAIL' > docs/ChangeLog
 
 srcdoc:
-	$(kde_bindir)/kdoc -a -p -d classdocs -n 'KJSEmbed' *.h -lqt -lkdecore -lkdeui
+	$(kde_bindir)/kdoc -a -p -d classdocs -n 'KJSEmbed' *.h -lqt -ltdecore -ltdeui
 
 srcdox:
 	doxygen -u Doxyfile
diff --git a/kjsembed/builtins/Makefile.am b/kjsembed/builtins/Makefile.am
index 0dd2516b..a16109b9 100644
--- a/kjsembed/builtins/Makefile.am
+++ b/kjsembed/builtins/Makefile.am
@@ -11,7 +11,7 @@ libkjsembedbuiltins_la_SOURCES =	stdaction_imp.cpp \
 					qdir_imp.cpp \
 					qfile_imp.cpp
 
-libkjsembedbuiltins_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+libkjsembedbuiltins_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 libkjsembedbuiltins_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) \
 				$(LIB_KFILE) -lkjs $(LIBSOCKET)
 
diff --git a/kjsembed/docs/ChangeLog b/kjsembed/docs/ChangeLog
index 95cedca2..c9af0f97 100644
--- a/kjsembed/docs/ChangeLog
+++ b/kjsembed/docs/ChangeLog
@@ -2742,7 +2742,7 @@
 
 	- Extended the code for dumping slots so the output includes the return type.
 
-	- Added a debug area (80001) to the list in kdecore and changed all the debug
+	- Added a debug area (80001) to the list in tdecore and changed all the debug
 	  messages to use it.
 
 	- Added the ability to tell the factory that particular class names are
diff --git a/kjsembed/docs/embedding/simple-embed/Makefile.am b/kjsembed/docs/embedding/simple-embed/Makefile.am
index b3f7afe7..f3757571 100644
--- a/kjsembed/docs/embedding/simple-embed/Makefile.am
+++ b/kjsembed/docs/embedding/simple-embed/Makefile.am
@@ -8,7 +8,7 @@ bin_PROGRAMS = embedjs
 INCLUDES         = -I$(top_srcdir) $(all_includes)
 
 # the library search path. 
-embedjs_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+embedjs_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 # the libraries to link against.
 embedjs_LDADD   = $(LIB_KFILE) $(LIB_KDEPRINT) -lkjs $(top_builddir)/kjsembed/libkjsembed.la
diff --git a/kjsembed/docs/examples/docviewer/docviewer.js b/kjsembed/docs/examples/docviewer/docviewer.js
index 56ccfa0e..3fed8a78 100644
--- a/kjsembed/docs/examples/docviewer/docviewer.js
+++ b/kjsembed/docs/examples/docviewer/docviewer.js
@@ -57,7 +57,7 @@ view.set_class = function( clazz )
    if ( /^Q/.test(clazz) )
       nm = 'http://doc.trolltech.com/3.2/' + clazz.toLowerCase() + '.html';
    else if ( /^K/.test(clazz) )
-      nm = 'http://developer.kde.org/documentation/library/cvs-api/kdeui/html/class' + clazz + '.html';
+      nm = 'http://developer.kde.org/documentation/library/cvs-api/tdeui/html/class' + clazz + '.html';
 
 
    cppview.openURL( nm );
diff --git a/kjsembed/docs/examples/imageinfo/example.html b/kjsembed/docs/examples/imageinfo/example.html
index 82af5e0b..2f616027 100644
--- a/kjsembed/docs/examples/imageinfo/example.html
+++ b/kjsembed/docs/examples/imageinfo/example.html
@@ -21,7 +21,7 @@ include HTML markup <b>like</b> <i>this</i>, and even
 <tr>
 <td align="center"><a href="example2.png"><img border=0 width=217 height=160 src=thumb-example2.png></a></td>
 <td width="60%" valign="top" align="justify"><b><a href="example2.png">example2.png</a></b> (340x250)<p>This image shows
-<a href="http://developer.kde.org/documentation/library/cvs-api/classref/kdeui/KPassivePopup.html">KPassivePopup</a>
+<a href="http://developer.kde.org/documentation/library/cvs-api/classref/tdeui/KPassivePopup.html">KPassivePopup</a>
 telling a user they have new mail. The popup is adject to the source of the
 message (in this example that is <a href="http://kmail.kde.org/">KMail</a>) and
 <i>does not steal the focus</i>, or otherwise interfere with whatever the user is
diff --git a/kjsembed/docs/examples/imageinfo/example2.htm b/kjsembed/docs/examples/imageinfo/example2.htm
index 651048b3..16a84284 100644
--- a/kjsembed/docs/examples/imageinfo/example2.htm
+++ b/kjsembed/docs/examples/imageinfo/example2.htm
@@ -1,5 +1,5 @@
 This image shows
-<a href="http://developer.kde.org/documentation/library/cvs-api/classref/kdeui/KPassivePopup.html">KPassivePopup</a>
+<a href="http://developer.kde.org/documentation/library/cvs-api/classref/tdeui/KPassivePopup.html">KPassivePopup</a>
 telling a user they have new mail. The popup is adject to the source of the
 message (in this example that is <a href="http://kmail.kde.org/">KMail</a>) and
 <i>does not steal the focus</i>, or otherwise interfere with whatever the user is
diff --git a/kjsembed/docs/examples/imageinfo/thumbs.html b/kjsembed/docs/examples/imageinfo/thumbs.html
index 663246a0..dd8ae478 100644
--- a/kjsembed/docs/examples/imageinfo/thumbs.html
+++ b/kjsembed/docs/examples/imageinfo/thumbs.html
@@ -21,7 +21,7 @@ include HTML markup <b>like</b> <i>this</i>, and even
 <tr>
 <td align="center"><a href="example2.png"><img border=0 width=217 height=160 src="thumb-example2.png"></a></td>
 <td width="60%" valign="top" align="justify"><b><a href="example2.png">example2.png</a></b> (340x250)<p>This image shows
-<a href="http://developer.kde.org/documentation/library/cvs-api/classref/kdeui/KPassivePopup.html">KPassivePopup</a>
+<a href="http://developer.kde.org/documentation/library/cvs-api/classref/tdeui/KPassivePopup.html">KPassivePopup</a>
 telling a user they have new mail. The popup is adject to the source of the
 message (in this example that is <a href="http://kmail.kde.org/">KMail</a>) and
 <i>does not steal the focus</i>, or otherwise interfere with whatever the user is
diff --git a/kjsembed/kscript/Makefile.am b/kjsembed/kscript/Makefile.am
index f96195df..2efe1a79 100644
--- a/kjsembed/kscript/Makefile.am
+++ b/kjsembed/kscript/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = -I$(srcdir) -I$(top_srcdir) $(all_includes)
 kde_module_LTLIBRARIES = libjavascript.la
 
 libjavascript_la_SOURCES = javascript.cpp
-libjavascript_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -no-undefined -avoid-version
+libjavascript_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -no-undefined -avoid-version
 libjavascript_la_LIBADD = -lkscript ../libkjsembed.la
 
 
diff --git a/kjsembed/plugin/Makefile.am b/kjsembed/plugin/Makefile.am
index 0c36bf20..1ccdb914 100644
--- a/kjsembed/plugin/Makefile.am
+++ b/kjsembed/plugin/Makefile.am
@@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = libjsconsoleplugin.la
 METASOURCES = AUTO
 
 libjsconsoleplugin_la_SOURCES = jsconsoleplugin.cpp
-libjsconsoleplugin_la_LIBADD  = -lDCOP -lkdecore -lkdeui -lkjs $(LIB_QT) $(LIB_KPARTS) ../libkjsembed.la
+libjsconsoleplugin_la_LIBADD  = -lDCOP -ltdecore -ltdeui -lkjs $(LIB_QT) $(LIB_KPARTS) ../libkjsembed.la
 libjsconsoleplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH)
 
 #pluginsdir   = $(kde_datadir)/konqueror/kpartplugins
diff --git a/kjsembed/plugins/Makefile.am b/kjsembed/plugins/Makefile.am
index ee697f4a..d7d3ce70 100644
--- a/kjsembed/plugins/Makefile.am
+++ b/kjsembed/plugins/Makefile.am
@@ -7,27 +7,27 @@ METASOURCES = AUTO
 
 # the Plugin's source, library search path, and link libraries
 libcustomobjectplugin_la_SOURCES = customobject_plugin.cpp
-libcustomobjectplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx $(KDE_RPATH) $(all_libraries)
+libcustomobjectplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx $(KDE_RPATH) $(all_libraries)
 libcustomobjectplugin_la_LIBADD  = $(LIB_QT) $(LIB_KPARTS) $(LIB_KDECORE) $(LIB_KFILE) ../libkjsembed.la
 
 # the Plugin's source, library search path, and link libraries
 libcustomqobjectplugin_la_SOURCES = customqobject_plugin.cpp
-libcustomqobjectplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx $(KDE_RPATH) $(all_libraries)
+libcustomqobjectplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx $(KDE_RPATH) $(all_libraries)
 libcustomqobjectplugin_la_LIBADD  = $(LIB_QT) $(LIB_KPARTS) $(LIB_KDECORE) $(LIB_KFILE) ../libkjsembed.la
 
 # the Plugin's source, library search path, and link libraries
 libimagefxplugin_la_SOURCES = imagefx_plugin.cpp
-libimagefxplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx $(KDE_RPATH) $(all_libraries)
+libimagefxplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx $(KDE_RPATH) $(all_libraries)
 libimagefxplugin_la_LIBADD  = $(LIB_QT) $(LIB_KPARTS) $(LIB_KDECORE) $(LIB_KFILE) ../libkjsembed.la
 
 # the Plugin's source, library search path, and link libraries
 libqprocessplugin_la_SOURCES = qprocess_plugin.cpp
-libqprocessplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx $(KDE_RPATH) $(all_libraries)
+libqprocessplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx $(KDE_RPATH) $(all_libraries)
 libqprocessplugin_la_LIBADD  = $(LIB_QT) $(LIB_KPARTS) $(LIB_KDECORE) $(LIB_KFILE) ../libkjsembed.la
 
 # the Plugin's source, library search path, and link libraries
 libfileitemplugin_la_SOURCES = kfileitemloader.cpp
-libfileitemplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx $(all_libraries)
+libfileitemplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx $(all_libraries)
 libfileitemplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KFILE) ../libkjsembed.la
 
 
diff --git a/korundum/bin/krubyinit.cpp b/korundum/bin/krubyinit.cpp
index bbd7c806..7ed0b0a4 100644
--- a/korundum/bin/krubyinit.cpp
+++ b/korundum/bin/krubyinit.cpp
@@ -1,7 +1,7 @@
 #include <ruby.h>
 
 /***************************************************************************
-       krubyinit  -  makes use of kdeinit_wrapper possible for ruby programs
+       krubyinit  -  makes use of tdeinit_wrapper possible for ruby programs
                              -------------------
     begin                : Wed Jan 7 2004
     copyright            : (C) 2004 by Alexander Kellett
diff --git a/korundum/rubylib/rbkconfig_compiler/Makefile.am b/korundum/rubylib/rbkconfig_compiler/Makefile.am
index 670ca429..7f38dbcb 100644
--- a/korundum/rubylib/rbkconfig_compiler/Makefile.am
+++ b/korundum/rubylib/rbkconfig_compiler/Makefile.am
@@ -8,11 +8,11 @@ RBUIC=rbuic
 exampleprefs_base.rb: $(srcdir)/example.kcfg rbkconfig_compiler $(srcdir)/exampleprefs_base.kcfgc
 	./rbkconfig_compiler $(srcdir)/example.kcfg $(srcdir)/exampleprefs_base.kcfgc
 
-AM_CPPFLAGS = -I$(top_srcdir)/kdecore -I$(top_srcdir) $(all_includes)
+AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir) $(all_includes)
 
 bin_PROGRAMS = rbkconfig_compiler
 
-rbkconfig_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+rbkconfig_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 rbkconfig_compiler_LDADD = $(LIB_KDECORE)
 rbkconfig_compiler_SOURCES = rbkconfig_compiler.cpp
 
diff --git a/qtruby/README.1st b/qtruby/README.1st
index 00c2cd4e..0c4164ea 100644
--- a/qtruby/README.1st
+++ b/qtruby/README.1st
@@ -13,5 +13,5 @@ With the program krubyinit from korundum/bin installed it is
 possible to simply replace a programs shebang line with:
    #!/usr/bin/env krubyinit
 Incidently as well as majorly fixing up pthread related startup
-crashes, this also makes it possible for kdeinit_wrapper usage,
+crashes, this also makes it possible for tdeinit_wrapper usage,
 therefore improving startup speed yet further.
diff --git a/qtruby/bin/qtrubyinit.cpp b/qtruby/bin/qtrubyinit.cpp
index 2451e002..c4e80240 100644
--- a/qtruby/bin/qtrubyinit.cpp
+++ b/qtruby/bin/qtrubyinit.cpp
@@ -1,7 +1,7 @@
 #include <ruby.h>
 
 /***************************************************************************
-qrubyinit  -  makes use of kdeinit_wrapper possible for ruby programs
+qrubyinit  -  makes use of tdeinit_wrapper possible for ruby programs
 -------------------
     begin                : Wed Jan 7 2004
     copyright            : (C) 2004 by Alexander Kellett
diff --git a/smoke/kde/generate.pl.in b/smoke/kde/generate.pl.in
index a628b731..f4cfde2a 100644
--- a/smoke/kde/generate.pl.in
+++ b/smoke/kde/generate.pl.in
@@ -101,7 +101,7 @@ my %kdeexcludes = (
 	'kdirnotify_stub.h' => 1,
 	'kio/uiserver_stub.h' => 1,
 	'kio/uiserver.h' => 1,
-	'kio/kdesasl.h' => 1,
+	'kio/tdesasl.h' => 1,
 	'kio/kpac.h' => 1,
 	'kio/thumbcreator.h' => 1,
 	'kio/file.h' => 1,
diff --git a/smoke/kde/kde_header_list b/smoke/kde/kde_header_list
index f5bcbeb6..c0c4ba3c 100644
--- a/smoke/kde/kde_header_list
+++ b/smoke/kde/kde_header_list
@@ -250,7 +250,7 @@ kpreferencesmodule.h
 kpreviewwidgetbase.h
 kprintaction.h
 kprinter.h
-kdeprint/kpreloadobject.h
+tdeprint/kpreloadobject.h
 kprocctrl.h
 kprocess.h
 kprocio.h
@@ -406,7 +406,7 @@ kio/http_slave_defaults.h
 kio/ioslave_defaults.h
 kio/jobclasses.h
 kio/job.h
-kio/kdesasl.h
+kio/tdesasl.h
 kio/kmdbase.h
 kio/kmdcodec.h
 kio/kpac.h