Rename a number of libraries and executables to avoid conflicts with KDE4

81 files changed, 138 insertions, 138 deletions

diff --git a/kdejava/ChangeLog b/kdejava/ChangeLog
index a46c28c9..ce043d5b 100644
--- a/kdejava/ChangeLog
+++ b/kdejava/ChangeLog
@@ -67,7 +67,7 @@
 2003-12-30  Richard Dale  <Richard_Dale@tipitina.demon.co.uk>
 
 	* Fixed/removed some compiler warnings from the generated code
-	* Removed -lkjs, -lkscipt and -lkmid libs from the link options
+	* Removed -lkjs, -lkscipt and -ltdemid libs from the link options
 	* Removed KDockWindow, KLineEditDlg, KPrinter, KNamedCommand, TDESocket and KRegExpr
 	  classes
 	* Added KInputDialog, KExtendedSocket, TDEBufferedIO, KAsyncIO, KDirLister, RenameDlg,
@@ -217,7 +217,7 @@
 2002-02-02  Dirk Mueller  <dmuell@gmx.net>
 	* koala/kdejava/Makefile.am: removed KKeyChooser as
 	it doesn't compile anymore with current tdelibs.
-	* Remove private method bindings from khtml/MouseEvent
+	* Remove private method bindings from tdehtml/MouseEvent
 	* Removed KAccelAction (private header)
 2002-02-01  Richard Dale <duke@tipitina.demon.co.uk>
 	* Removed KToolBarButtonList class
diff --git a/kdejava/TODO b/kdejava/TODO
index 7e9a34ce..28297865 100644
--- a/kdejava/TODO
+++ b/kdejava/TODO
@@ -1,4 +1,4 @@
-- Split up and group java classes into sub packages such as 'org.kde.koala.kparts',
+- Split up and group java classes into sub packages such as 'org.kde.koala.tdeparts',
 	and 'org.kde.koala.tdecore'.
 
 - Split up shared libs into smaller sub-libraries for faster loading, or write
diff --git a/kdejava/koala.kdevprj b/kdejava/koala.kdevprj
index 4850e002..7090674c 100644
--- a/kdejava/koala.kdevprj
+++ b/kdejava/koala.kdevprj
@@ -20,7 +20,7 @@ type=DATA
 addcxxflags=
 bin_program=koala
 cxxflags=\s-O0 -Wall
-ldadd=$(LIB_KSPELL) -lqtjava -lkparts $(LIB_KIO) -lXext -lX11
+ldadd=$(LIB_KSPELL) -lqtjava -ltdeparts $(LIB_KIO) -lXext -lX11
 ldflags=
 
 [General]
diff --git a/kdejava/koala/Makefile.am b/kdejava/koala/Makefile.am
index 907dace1..b7ad22fd 100644
--- a/kdejava/koala/Makefile.am
+++ b/kdejava/koala/Makefile.am
@@ -4,7 +4,7 @@ noinst_PROGRAMS = koala
 ## INCLUDES were found outside tdevelop specific part
 
 koala_SOURCES = main.cpp 
-koala_LDADD   = ./kdejava/libkdejava.la ../../qtjava/javalib/qtjava/libqtjava.la $(LIB_KSPELL) -lkparts $(LIB_KIO) -lXext -lX11 $(LIBSOCKET)
+koala_LDADD   = ./kdejava/libkdejava.la ../../qtjava/javalib/qtjava/libqtjava.la $(LIB_KSPELL) -ltdeparts $(LIB_KIO) -lXext -lX11 $(LIBSOCKET)
 
 SUBDIRS = org kdejava 
 
@@ -36,7 +36,7 @@ INCLUDES= $(all_includes)
 koala_METASOURCES = AUTO
 
 # the library search path. 
-koala_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+koala_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 # them while "make clean", use CLEANFILES
 CLEANFILES = koala.jar
diff --git a/kdejava/koala/kdejava/BrowserExtension.cpp b/kdejava/koala/kdejava/BrowserExtension.cpp
index a98764ca..5be10ce9 100644
--- a/kdejava/koala/kdejava/BrowserExtension.cpp
+++ b/kdejava/koala/kdejava/BrowserExtension.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 #include <tqdatastream.h>
 #include <tqstring.h>
 #include <tqpoint.h>
diff --git a/kdejava/koala/kdejava/BrowserHostExtension.cpp b/kdejava/koala/kdejava/BrowserHostExtension.cpp
index 726f87fd..7391bd68 100644
--- a/kdejava/koala/kdejava/BrowserHostExtension.cpp
+++ b/kdejava/koala/kdejava/BrowserHostExtension.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <kurl.h>
diff --git a/kdejava/koala/kdejava/BrowserRun.cpp b/kdejava/koala/kdejava/BrowserRun.cpp
index cdc5952a..01501670 100644
--- a/kdejava/koala/kdejava/BrowserRun.cpp
+++ b/kdejava/koala/kdejava/BrowserRun.cpp
@@ -1,7 +1,7 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <kservice.h>
-#include <kparts/browserrun.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/browserrun.h>
+#include <tdeparts/browserextension.h>
 #include <tqstring.h>
 #include <kurl.h>
 
diff --git a/kdejava/koala/kdejava/DockMainWindow.cpp b/kdejava/koala/kdejava/DockMainWindow.cpp
index a142fe0a..8cd0c023 100644
--- a/kdejava/koala/kdejava/DockMainWindow.cpp
+++ b/kdejava/koala/kdejava/DockMainWindow.cpp
@@ -1,7 +1,7 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqstring.h>
-#include <kparts/dockmainwindow.h>
-#include <kparts/part.h>
+#include <tdeparts/dockmainwindow.h>
+#include <tdeparts/part.h>
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/kdejava/koala/kdejava/Element.cpp b/kdejava/koala/kdejava/Element.cpp
index 91c34285..d54c7e0a 100644
--- a/kdejava/koala/kdejava/Element.cpp
+++ b/kdejava/koala/kdejava/Element.cpp
@@ -110,47 +110,47 @@ Java_org_kde_koala_Element_isHTMLElement(JNIEnv* env, jobject obj)
 }
 
 JNIEXPORT jboolean JNICALL
-Java_org_kde_koala_Element_khtmlMalformedPrefix(JNIEnv* env, jclass cls, jstring name)
+Java_org_kde_koala_Element_tdehtmlMalformedPrefix(JNIEnv* env, jclass cls, jstring name)
 {
 	(void) cls;
 static DOM::DOMString* _domstring_name = 0;
-	jboolean xret = (jboolean) ElementJBridge::khtmlMalformedPrefix((DOM::DOMString)*(DOM::DOMString*) KDESupport::toDOMString(env, name, &_domstring_name));
+	jboolean xret = (jboolean) ElementJBridge::tdehtmlMalformedPrefix((DOM::DOMString)*(DOM::DOMString*) KDESupport::toDOMString(env, name, &_domstring_name));
 	return xret;
 }
 
 JNIEXPORT jboolean JNICALL
-Java_org_kde_koala_Element_khtmlMalformedQualifiedName(JNIEnv* env, jclass cls, jstring name)
+Java_org_kde_koala_Element_tdehtmlMalformedQualifiedName(JNIEnv* env, jclass cls, jstring name)
 {
 	(void) cls;
 static DOM::DOMString* _domstring_name = 0;
-	jboolean xret = (jboolean) ElementJBridge::khtmlMalformedQualifiedName((DOM::DOMString)*(DOM::DOMString*) KDESupport::toDOMString(env, name, &_domstring_name));
+	jboolean xret = (jboolean) ElementJBridge::tdehtmlMalformedQualifiedName((DOM::DOMString)*(DOM::DOMString*) KDESupport::toDOMString(env, name, &_domstring_name));
 	return xret;
 }
 
 JNIEXPORT jboolean JNICALL
-Java_org_kde_koala_Element_khtmlValidAttrName(JNIEnv* env, jclass cls, jstring name)
+Java_org_kde_koala_Element_tdehtmlValidAttrName(JNIEnv* env, jclass cls, jstring name)
 {
 	(void) cls;
 static DOM::DOMString* _domstring_name = 0;
-	jboolean xret = (jboolean) ElementJBridge::khtmlValidAttrName((DOM::DOMString)*(DOM::DOMString*) KDESupport::toDOMString(env, name, &_domstring_name));
+	jboolean xret = (jboolean) ElementJBridge::tdehtmlValidAttrName((DOM::DOMString)*(DOM::DOMString*) KDESupport::toDOMString(env, name, &_domstring_name));
 	return xret;
 }
 
 JNIEXPORT jboolean JNICALL
-Java_org_kde_koala_Element_khtmlValidPrefix(JNIEnv* env, jclass cls, jstring name)
+Java_org_kde_koala_Element_tdehtmlValidPrefix(JNIEnv* env, jclass cls, jstring name)
 {
 	(void) cls;
 static DOM::DOMString* _domstring_name = 0;
-	jboolean xret = (jboolean) ElementJBridge::khtmlValidPrefix((DOM::DOMString)*(DOM::DOMString*) KDESupport::toDOMString(env, name, &_domstring_name));
+	jboolean xret = (jboolean) ElementJBridge::tdehtmlValidPrefix((DOM::DOMString)*(DOM::DOMString*) KDESupport::toDOMString(env, name, &_domstring_name));
 	return xret;
 }
 
 JNIEXPORT jboolean JNICALL
-Java_org_kde_koala_Element_khtmlValidQualifiedName(JNIEnv* env, jclass cls, jstring name)
+Java_org_kde_koala_Element_tdehtmlValidQualifiedName(JNIEnv* env, jclass cls, jstring name)
 {
 	(void) cls;
 static DOM::DOMString* _domstring_name = 0;
-	jboolean xret = (jboolean) ElementJBridge::khtmlValidQualifiedName((DOM::DOMString)*(DOM::DOMString*) KDESupport::toDOMString(env, name, &_domstring_name));
+	jboolean xret = (jboolean) ElementJBridge::tdehtmlValidQualifiedName((DOM::DOMString)*(DOM::DOMString*) KDESupport::toDOMString(env, name, &_domstring_name));
 	return xret;
 }
 
diff --git a/kdejava/koala/kdejava/Element.h b/kdejava/koala/kdejava/Element.h
index 047520c4..cdd5e4be 100644
--- a/kdejava/koala/kdejava/Element.h
+++ b/kdejava/koala/kdejava/Element.h
@@ -34,11 +34,11 @@ extern JNIEXPORT jboolean JNICALL Java_org_kde_koala_Element_contentEditable (JN
 extern JNIEXPORT void JNICALL Java_org_kde_koala_Element_setContentEditable (JNIEnv *env, jobject, jboolean);
 extern JNIEXPORT jboolean JNICALL Java_org_kde_koala_Element_isHTMLElement (JNIEnv *env, jobject);
 extern JNIEXPORT jobject JNICALL Java_org_kde_koala_Element_form (JNIEnv *env, jobject);
-extern JNIEXPORT jboolean JNICALL Java_org_kde_koala_Element_khtmlValidAttrName (JNIEnv *env, jclass, jstring);
-extern JNIEXPORT jboolean JNICALL Java_org_kde_koala_Element_khtmlValidPrefix (JNIEnv *env, jclass, jstring);
-extern JNIEXPORT jboolean JNICALL Java_org_kde_koala_Element_khtmlValidQualifiedName (JNIEnv *env, jclass, jstring);
-extern JNIEXPORT jboolean JNICALL Java_org_kde_koala_Element_khtmlMalformedQualifiedName (JNIEnv *env, jclass, jstring);
-extern JNIEXPORT jboolean JNICALL Java_org_kde_koala_Element_khtmlMalformedPrefix (JNIEnv *env, jclass, jstring);
+extern JNIEXPORT jboolean JNICALL Java_org_kde_koala_Element_tdehtmlValidAttrName (JNIEnv *env, jclass, jstring);
+extern JNIEXPORT jboolean JNICALL Java_org_kde_koala_Element_tdehtmlValidPrefix (JNIEnv *env, jclass, jstring);
+extern JNIEXPORT jboolean JNICALL Java_org_kde_koala_Element_tdehtmlValidQualifiedName (JNIEnv *env, jclass, jstring);
+extern JNIEXPORT jboolean JNICALL Java_org_kde_koala_Element_tdehtmlMalformedQualifiedName (JNIEnv *env, jclass, jstring);
+extern JNIEXPORT jboolean JNICALL Java_org_kde_koala_Element_tdehtmlMalformedPrefix (JNIEnv *env, jclass, jstring);
 
 #ifdef __cplusplus
 }
diff --git a/kdejava/koala/kdejava/Event.cpp b/kdejava/koala/kdejava/Event.cpp
index 2c3820f3..7305e287 100644
--- a/kdejava/koala/kdejava/Event.cpp
+++ b/kdejava/koala/kdejava/Event.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kparts/event.h>
+#include <tdeparts/event.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/Factory.cpp b/kdejava/koala/kdejava/Factory.cpp
index 94fbd1f5..44a75ad0 100644
--- a/kdejava/koala/kdejava/Factory.cpp
+++ b/kdejava/koala/kdejava/Factory.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqstringlist.h>
-#include <kparts/factory.h>
+#include <tdeparts/factory.h>
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/kdejava/koala/kdejava/GUIActivateEvent.cpp b/kdejava/koala/kdejava/GUIActivateEvent.cpp
index 8b0fc956..2fc9ef6b 100644
--- a/kdejava/koala/kdejava/GUIActivateEvent.cpp
+++ b/kdejava/koala/kdejava/GUIActivateEvent.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kparts/event.h>
+#include <tdeparts/event.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/HistoryProvider.cpp b/kdejava/koala/kdejava/HistoryProvider.cpp
index 566e3bc1..68c491c5 100644
--- a/kdejava/koala/kdejava/HistoryProvider.cpp
+++ b/kdejava/koala/kdejava/HistoryProvider.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqstring.h>
-#include <kparts/historyprovider.h>
+#include <tdeparts/historyprovider.h>
 #include <tqstringlist.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/kdejava/koala/kdejava/KCombiView.cpp b/kdejava/koala/kdejava/KCombiView.cpp
index 11dfb845..0613d6f4 100644
--- a/kdejava/koala/kdejava/KCombiView.cpp
+++ b/kdejava/koala/kdejava/KCombiView.cpp
@@ -4,7 +4,7 @@
 #include <tqstring.h>
 #include <kio/global.h>
 #include <kfileview.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 #include <kfile.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/kdejava/koala/kdejava/KDEJavaSlot.h b/kdejava/koala/kdejava/KDEJavaSlot.h
index 90c63db0..f1644724 100644
--- a/kdejava/koala/kdejava/KDEJavaSlot.h
+++ b/kdejava/koala/kdejava/KDEJavaSlot.h
@@ -24,7 +24,7 @@
 
 #include <dom/dom_node.h>
 #include <kxmlguiclient.h>
-#include <kspell.h>
+#include <tdespell.h>
 #include <kurlrequester.h>
 #include <ktoolbar.h>
 #include <kaction.h>
@@ -36,14 +36,14 @@
 #include <klistview.h>
 #include <kprocio.h>
 #include <kprocess.h>
-#include <kparts/part.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/part.h>
+#include <tdeparts/browserextension.h>
 #include <kio/slave.h>
 #include <kio/skipdlg.h>
 #include <kbookmark.h>
 #include <kdatatool.h>
 #include <kfiletreeviewitem.h>
-#include <kmdichildfrm.h>
+#include <tdemdichildfrm.h>
 
 class KDEJavaSlotFactory;
 
diff --git a/kdejava/koala/kdejava/KDirLister.cpp b/kdejava/koala/kdejava/KDirLister.cpp
index c84c0452..ddf550ca 100644
--- a/kdejava/koala/kdejava/KDirLister.cpp
+++ b/kdejava/koala/kdejava/KDirLister.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <kio/global.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 #include <kdirlister.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
diff --git a/kdejava/koala/kdejava/KDirOperator.cpp b/kdejava/koala/kdejava/KDirOperator.cpp
index ab05c563..94036ad3 100644
--- a/kdejava/koala/kdejava/KDirOperator.cpp
+++ b/kdejava/koala/kdejava/KDirOperator.cpp
@@ -1,7 +1,7 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <kdiroperator.h>
 #include <tqdir.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 #include <kaction.h>
 #include <tqstring.h>
 #include <tqpoint.h>
diff --git a/kdejava/koala/kdejava/KDirSize.cpp b/kdejava/koala/kdejava/KDirSize.cpp
index 045d5b22..fbf1027d 100644
--- a/kdejava/koala/kdejava/KDirSize.cpp
+++ b/kdejava/koala/kdejava/KDirSize.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <kio/global.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 #include <kdirsize.h>
 #include <kurl.h>
 
diff --git a/kdejava/koala/kdejava/KFileDetailView.cpp b/kdejava/koala/kdejava/KFileDetailView.cpp
index 69d145be..c6888d7e 100644
--- a/kdejava/koala/kdejava/KFileDetailView.cpp
+++ b/kdejava/koala/kdejava/KFileDetailView.cpp
@@ -2,7 +2,7 @@
 #include <tqdir.h>
 #include <kio/global.h>
 #include <kfileview.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 #include <tqstring.h>
 #include <kfiledetailview.h>
 #include <kurl.h>
diff --git a/kdejava/koala/kdejava/KFileIconView.cpp b/kdejava/koala/kdejava/KFileIconView.cpp
index 4b5aaf63..cb0e9b51 100644
--- a/kdejava/koala/kdejava/KFileIconView.cpp
+++ b/kdejava/koala/kdejava/KFileIconView.cpp
@@ -2,7 +2,7 @@
 #include <tqdir.h>
 #include <kio/global.h>
 #include <kfileview.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 #include <kfileiconview.h>
 #include <tqstring.h>
 #include <kurl.h>
diff --git a/kdejava/koala/kdejava/KFilePreview.cpp b/kdejava/koala/kdejava/KFilePreview.cpp
index 90eb2fca..217d290c 100644
--- a/kdejava/koala/kdejava/KFilePreview.cpp
+++ b/kdejava/koala/kdejava/KFilePreview.cpp
@@ -2,7 +2,7 @@
 #include <tqdir.h>
 #include <kio/global.h>
 #include <kfileview.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 #include <kfilepreview.h>
 #include <tqstring.h>
 #include <kurl.h>
diff --git a/kdejava/koala/kdejava/KFileView.cpp b/kdejava/koala/kdejava/KFileView.cpp
index 942e4244..2cbaa8e0 100644
--- a/kdejava/koala/kdejava/KFileView.cpp
+++ b/kdejava/koala/kdejava/KFileView.cpp
@@ -2,7 +2,7 @@
 #include <tqdir.h>
 #include <kio/global.h>
 #include <kfileview.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 #include <tqstring.h>
 #include <kfile.h>
 
diff --git a/kdejava/koala/kdejava/KHTMLPart.cpp b/kdejava/koala/kdejava/KHTMLPart.cpp
index 6397ede3..b06200c0 100644
--- a/kdejava/koala/kdejava/KHTMLPart.cpp
+++ b/kdejava/koala/kdejava/KHTMLPart.cpp
@@ -3,14 +3,14 @@
 #include <dom/dom2_range.h>
 #include <tqcursor.h>
 #include <tqrect.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 #include <tqdatastream.h>
 #include <dom/dom_node.h>
 #include <tqstring.h>
 #include <tqpoint.h>
 #include <tqstringlist.h>
 #include <tqvariant.h>
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 #include <dom/dom_doc.h>
 #include <kurl.h>
 #include <tqcstring.h>
diff --git a/kdejava/koala/kdejava/KHTMLSettings.cpp b/kdejava/koala/kdejava/KHTMLSettings.cpp
index 78c280d9..66d4d10d 100644
--- a/kdejava/koala/kdejava/KHTMLSettings.cpp
+++ b/kdejava/koala/kdejava/KHTMLSettings.cpp
@@ -1,7 +1,7 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqstring.h>
 #include <tqcolor.h>
-#include <khtml_settings.h>
+#include <tdehtml_settings.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/KHTMLView.cpp b/kdejava/koala/kdejava/KHTMLView.cpp
index 723fed59..32896aec 100644
--- a/kdejava/koala/kdejava/KHTMLView.cpp
+++ b/kdejava/koala/kdejava/KHTMLView.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqscrollview.h>
-#include <khtmlview.h>
+#include <tdehtmlview.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/KMdi.cpp b/kdejava/koala/kdejava/KMdi.cpp
index 5f4a3aa8..d8ca2f90 100644
--- a/kdejava/koala/kdejava/KMdi.cpp
+++ b/kdejava/koala/kdejava/KMdi.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kmdidefines.h>
+#include <tdemdidefines.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/KMdiChildArea.cpp b/kdejava/koala/kdejava/KMdiChildArea.cpp
index a81ebcf0..8e49aa77 100644
--- a/kdejava/koala/kdejava/KMdiChildArea.cpp
+++ b/kdejava/koala/kdejava/KMdiChildArea.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kmdichildarea.h>
+#include <tdemdichildarea.h>
 #include <tqfont.h>
 #include <tqpoint.h>
 #include <tqcolor.h>
diff --git a/kdejava/koala/kdejava/KMdiChildFrm.cpp b/kdejava/koala/kdejava/KMdiChildFrm.cpp
index dd154176..b7e43903 100644
--- a/kdejava/koala/kdejava/KMdiChildFrm.cpp
+++ b/kdejava/koala/kdejava/KMdiChildFrm.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqrect.h>
-#include <kmdichildfrm.h>
+#include <tdemdichildfrm.h>
 #include <tqpixmap.h>
 #include <tqstring.h>
 #include <tqpoint.h>
diff --git a/kdejava/koala/kdejava/KMdiChildFrmCaption.cpp b/kdejava/koala/kdejava/KMdiChildFrmCaption.cpp
index 695b25cb..3f5a7794 100644
--- a/kdejava/koala/kdejava/KMdiChildFrmCaption.cpp
+++ b/kdejava/koala/kdejava/KMdiChildFrmCaption.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqstring.h>
-#include <kmdichildfrmcaption.h>
+#include <tdemdichildfrmcaption.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/KMdiChildFrmDragBeginEvent.cpp b/kdejava/koala/kdejava/KMdiChildFrmDragBeginEvent.cpp
index 2d9643e4..8438a5a9 100644
--- a/kdejava/koala/kdejava/KMdiChildFrmDragBeginEvent.cpp
+++ b/kdejava/koala/kdejava/KMdiChildFrmDragBeginEvent.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kmdichildfrm.h>
+#include <tdemdichildfrm.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/KMdiChildFrmDragEndEvent.cpp b/kdejava/koala/kdejava/KMdiChildFrmDragEndEvent.cpp
index a0e17118..59b74509 100644
--- a/kdejava/koala/kdejava/KMdiChildFrmDragEndEvent.cpp
+++ b/kdejava/koala/kdejava/KMdiChildFrmDragEndEvent.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kmdichildfrm.h>
+#include <tdemdichildfrm.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/KMdiChildFrmMoveEvent.cpp b/kdejava/koala/kdejava/KMdiChildFrmMoveEvent.cpp
index 6bdfb821..f68f73dd 100644
--- a/kdejava/koala/kdejava/KMdiChildFrmMoveEvent.cpp
+++ b/kdejava/koala/kdejava/KMdiChildFrmMoveEvent.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kmdichildfrm.h>
+#include <tdemdichildfrm.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/KMdiChildFrmResizeBeginEvent.cpp b/kdejava/koala/kdejava/KMdiChildFrmResizeBeginEvent.cpp
index fa51ccf1..60e2339b 100644
--- a/kdejava/koala/kdejava/KMdiChildFrmResizeBeginEvent.cpp
+++ b/kdejava/koala/kdejava/KMdiChildFrmResizeBeginEvent.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kmdichildfrm.h>
+#include <tdemdichildfrm.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/KMdiChildFrmResizeEndEvent.cpp b/kdejava/koala/kdejava/KMdiChildFrmResizeEndEvent.cpp
index da2152aa..c1f8ff97 100644
--- a/kdejava/koala/kdejava/KMdiChildFrmResizeEndEvent.cpp
+++ b/kdejava/koala/kdejava/KMdiChildFrmResizeEndEvent.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kmdichildfrm.h>
+#include <tdemdichildfrm.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/KMdiChildView.cpp b/kdejava/koala/kdejava/KMdiChildView.cpp
index 1ce47560..8f7e711d 100644
--- a/kdejava/koala/kdejava/KMdiChildView.cpp
+++ b/kdejava/koala/kdejava/KMdiChildView.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqdatetime.h>
-#include <kmdichildview.h>
+#include <tdemdichildview.h>
 #include <tqrect.h>
 #include <tqpixmap.h>
 #include <tqstring.h>
diff --git a/kdejava/koala/kdejava/KMdiMainFrm.cpp b/kdejava/koala/kdejava/KMdiMainFrm.cpp
index 27dbfcb7..7181f64d 100644
--- a/kdejava/koala/kdejava/KMdiMainFrm.cpp
+++ b/kdejava/koala/kdejava/KMdiMainFrm.cpp
@@ -3,12 +3,12 @@
 #include <tqrect.h>
 #include <tqpixmap.h>
 #include <kdockwidget.h>
-#include <kmdidefines.h>
+#include <tdemdidefines.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <tqpoint.h>
 #include <tqcolor.h>
-#include <kmdimainfrm.h>
+#include <tdemdimainfrm.h>
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/kdejava/koala/kdejava/KMdiTaskBar.cpp b/kdejava/koala/kdejava/KMdiTaskBar.cpp
index a118b38c..c8ece526 100644
--- a/kdejava/koala/kdejava/KMdiTaskBar.cpp
+++ b/kdejava/koala/kdejava/KMdiTaskBar.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kmditaskbar.h>
+#include <tdemditaskbar.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/KMdiTaskBarButton.cpp b/kdejava/koala/kdejava/KMdiTaskBarButton.cpp
index ca53cb2c..e8212341 100644
--- a/kdejava/koala/kdejava/KMdiTaskBarButton.cpp
+++ b/kdejava/koala/kdejava/KMdiTaskBarButton.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kmditaskbar.h>
+#include <tdemditaskbar.h>
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/kdejava/koala/kdejava/KMdiToolViewAccessor.cpp b/kdejava/koala/kdejava/KMdiToolViewAccessor.cpp
index 445d5162..677abd0c 100644
--- a/kdejava/koala/kdejava/KMdiToolViewAccessor.cpp
+++ b/kdejava/koala/kdejava/KMdiToolViewAccessor.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kmditoolviewaccessor.h>
+#include <tdemditoolviewaccessor.h>
 #include <kdockwidget.h>
 #include <tqstring.h>
 
diff --git a/kdejava/koala/kdejava/KMdiViewCloseEvent.cpp b/kdejava/koala/kdejava/KMdiViewCloseEvent.cpp
index b46d6b17..c86c3636 100644
--- a/kdejava/koala/kdejava/KMdiViewCloseEvent.cpp
+++ b/kdejava/koala/kdejava/KMdiViewCloseEvent.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kmdimainfrm.h>
+#include <tdemdimainfrm.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/KMdiWin32IconButton.cpp b/kdejava/koala/kdejava/KMdiWin32IconButton.cpp
index c6e7c922..38ec281b 100644
--- a/kdejava/koala/kdejava/KMdiWin32IconButton.cpp
+++ b/kdejava/koala/kdejava/KMdiWin32IconButton.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kmdichildfrm.h>
+#include <tdemdichildfrm.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/KMultiTabBar.cpp b/kdejava/koala/kdejava/KMultiTabBar.cpp
index f1ebc919..9e689f0f 100644
--- a/kdejava/koala/kdejava/KMultiTabBar.cpp
+++ b/kdejava/koala/kdejava/KMultiTabBar.cpp
@@ -2,7 +2,7 @@
 #include <tqpixmap.h>
 #include <tqfont.h>
 #include <tqstring.h>
-#include <kmultitabbar.h>
+#include <tdemultitabbar.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/KMultiTabBarButton.cpp b/kdejava/koala/kdejava/KMultiTabBarButton.cpp
index 1dc1a223..70f5e668 100644
--- a/kdejava/koala/kdejava/KMultiTabBarButton.cpp
+++ b/kdejava/koala/kdejava/KMultiTabBarButton.cpp
@@ -2,7 +2,7 @@
 #include <tqsize.h>
 #include <tqpixmap.h>
 #include <tqstring.h>
-#include <kmultitabbar.h>
+#include <tdemultitabbar.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/KMultiTabBarTab.cpp b/kdejava/koala/kdejava/KMultiTabBarTab.cpp
index 22580109..33afa189 100644
--- a/kdejava/koala/kdejava/KMultiTabBarTab.cpp
+++ b/kdejava/koala/kdejava/KMultiTabBarTab.cpp
@@ -1,7 +1,7 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqpixmap.h>
 #include <tqstring.h>
-#include <kmultitabbar.h>
+#include <tdemultitabbar.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/KMultipleDrag.cpp b/kdejava/koala/kdejava/KMultipleDrag.cpp
index 78a589a8..a71dbfb8 100644
--- a/kdejava/koala/kdejava/KMultipleDrag.cpp
+++ b/kdejava/koala/kdejava/KMultipleDrag.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kmultipledrag.h>
+#include <tdemultipledrag.h>
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/kdejava/koala/kdejava/KSpell.cpp b/kdejava/koala/kdejava/KSpell.cpp
index 5d47ade1..1bb6c1b3 100644
--- a/kdejava/koala/kdejava/KSpell.cpp
+++ b/kdejava/koala/kdejava/KSpell.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <ksconfig.h>
-#include <kspell.h>
+#include <tdespell.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
 
diff --git a/kdejava/koala/kdejava/KSpellDlg.cpp b/kdejava/koala/kdejava/KSpellDlg.cpp
index 882633ea..4590383d 100644
--- a/kdejava/koala/kdejava/KSpellDlg.cpp
+++ b/kdejava/koala/kdejava/KSpellDlg.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kspelldlg.h>
+#include <tdespelldlg.h>
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/kdejava/koala/kdejava/KSycoca.cpp b/kdejava/koala/kdejava/KSycoca.cpp
index e5a13153..41673aa4 100644
--- a/kdejava/koala/kdejava/KSycoca.cpp
+++ b/kdejava/koala/kdejava/KSycoca.cpp
@@ -1,11 +1,11 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqglobal.h>
-#include <ksycoca.h>
+#include <tdesycoca.h>
 #include <dcopclient.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <dcopobject.h>
-#include <ksycocatype.h>
+#include <tdesycocatype.h>
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/kdejava/koala/kdejava/KSycocaEntry.cpp b/kdejava/koala/kdejava/KSycocaEntry.cpp
index 8e5bb930..06529e1c 100644
--- a/kdejava/koala/kdejava/KSycocaEntry.cpp
+++ b/kdejava/koala/kdejava/KSycocaEntry.cpp
@@ -1,9 +1,9 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <ksycocaentry.h>
+#include <tdesycocaentry.h>
 #include <tqdatastream.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <ksycocatype.h>
+#include <tdesycocatype.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/LiveConnectExtension.cpp b/kdejava/koala/kdejava/LiveConnectExtension.cpp
index ed06df0b..f1c327e7 100644
--- a/kdejava/koala/kdejava/LiveConnectExtension.cpp
+++ b/kdejava/koala/kdejava/LiveConnectExtension.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
 
diff --git a/kdejava/koala/kdejava/MainWindow.cpp b/kdejava/koala/kdejava/MainWindow.cpp
index 84f44e34..b3905615 100644
--- a/kdejava/koala/kdejava/MainWindow.cpp
+++ b/kdejava/koala/kdejava/MainWindow.cpp
@@ -1,7 +1,7 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kparts/mainwindow.h>
+#include <tdeparts/mainwindow.h>
 #include <tqstring.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/kdejava/koala/kdejava/Makefile.am b/kdejava/koala/kdejava/Makefile.am
index d2df9c4f..70da0cc0 100644
--- a/kdejava/koala/kdejava/Makefile.am
+++ b/kdejava/koala/kdejava/Makefile.am
@@ -33,6 +33,6 @@ noinst_HEADERS = KDESupport.h KDEJavaSlot.h
 
 libkdejava_la_LDFLAGS = $(all_libraries) -no-undefined -version-info $(SOMAJOR):$(SOMINOR):$(SOSUBMINOR) 
 
-libkdejava_la_LIBADD = $(top_builddir)/qtjava/javalib/qtjava/libqtjavasupport.la -lkmdi $(LIB_KHTML) $(LIB_KSPELL) $(LIB_KIO) $(LIB_TDECORE) $(LIB_KPARTS) $(LIB_TDEUI) $(LIB_KUTILS) $(LIB_TDEPRINT) -lDCOP -ltdefx
+libkdejava_la_LIBADD = $(top_builddir)/qtjava/javalib/qtjava/libqtjavasupport.la -ltdemdi $(LIB_KHTML) $(LIB_KSPELL) $(LIB_KIO) $(LIB_TDECORE) $(LIB_KPARTS) $(LIB_TDEUI) $(LIB_KUTILS) $(LIB_TDEPRINT) -lDCOP -ltdefx
 
 KDE_OPTIONS = qtonly nofinal
diff --git a/kdejava/koala/kdejava/MetaInfoJob.cpp b/kdejava/koala/kdejava/MetaInfoJob.cpp
index 0887597c..b02493ce 100644
--- a/kdejava/koala/kdejava/MetaInfoJob.cpp
+++ b/kdejava/koala/kdejava/MetaInfoJob.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <kio/metainfojob.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 #include <tqstringlist.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/kdejava/koala/kdejava/OpenURLEvent.cpp b/kdejava/koala/kdejava/OpenURLEvent.cpp
index 37076d72..221137bc 100644
--- a/kdejava/koala/kdejava/OpenURLEvent.cpp
+++ b/kdejava/koala/kdejava/OpenURLEvent.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 #include <kurl.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/kdejava/koala/kdejava/Part.cpp b/kdejava/koala/kdejava/Part.cpp
index c1a75faa..e62da8a6 100644
--- a/kdejava/koala/kdejava/Part.cpp
+++ b/kdejava/koala/kdejava/Part.cpp
@@ -1,7 +1,7 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqstring.h>
 #include <tqpoint.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/PartActivateEvent.cpp b/kdejava/koala/kdejava/PartActivateEvent.cpp
index d40a4e8a..fbb3cd20 100644
--- a/kdejava/koala/kdejava/PartActivateEvent.cpp
+++ b/kdejava/koala/kdejava/PartActivateEvent.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kparts/event.h>
+#include <tdeparts/event.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/PartBase.cpp b/kdejava/koala/kdejava/PartBase.cpp
index be497590..5d9b03e0 100644
--- a/kdejava/koala/kdejava/PartBase.cpp
+++ b/kdejava/koala/kdejava/PartBase.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/PartManager.cpp b/kdejava/koala/kdejava/PartManager.cpp
index 01d6dab5..08c48f7c 100644
--- a/kdejava/koala/kdejava/PartManager.cpp
+++ b/kdejava/koala/kdejava/PartManager.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kparts/partmanager.h>
+#include <tdeparts/partmanager.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/PartSelectEvent.cpp b/kdejava/koala/kdejava/PartSelectEvent.cpp
index 0e50bc49..1efabfe1 100644
--- a/kdejava/koala/kdejava/PartSelectEvent.cpp
+++ b/kdejava/koala/kdejava/PartSelectEvent.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kparts/event.h>
+#include <tdeparts/event.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/Plugin.cpp b/kdejava/koala/kdejava/Plugin.cpp
index e516137a..6e7ca8e1 100644
--- a/kdejava/koala/kdejava/Plugin.cpp
+++ b/kdejava/koala/kdejava/Plugin.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <kxmlguiclient.h>
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <tqdom.h>
diff --git a/kdejava/koala/kdejava/PreviewJob.cpp b/kdejava/koala/kdejava/PreviewJob.cpp
index 0997bbc8..7ea76580 100644
--- a/kdejava/koala/kdejava/PreviewJob.cpp
+++ b/kdejava/koala/kdejava/PreviewJob.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 #include <tqpixmap.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
diff --git a/kdejava/koala/kdejava/ReadOnlyPart.cpp b/kdejava/koala/kdejava/ReadOnlyPart.cpp
index 712df487..db8a1870 100644
--- a/kdejava/koala/kdejava/ReadOnlyPart.cpp
+++ b/kdejava/koala/kdejava/ReadOnlyPart.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqstring.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kurl.h>
 #include <tqcstring.h>
 
diff --git a/kdejava/koala/kdejava/ReadWritePart.cpp b/kdejava/koala/kdejava/ReadWritePart.cpp
index 130e196a..890ace43 100644
--- a/kdejava/koala/kdejava/ReadWritePart.cpp
+++ b/kdejava/koala/kdejava/ReadWritePart.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kurl.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/kdejava/koala/kdejava/StatusBarExtension.cpp b/kdejava/koala/kdejava/StatusBarExtension.cpp
index 330a89a6..b92234e7 100644
--- a/kdejava/koala/kdejava/StatusBarExtension.cpp
+++ b/kdejava/koala/kdejava/StatusBarExtension.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kparts/statusbarextension.h>
+#include <tdeparts/statusbarextension.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/TDEIO.cpp b/kdejava/koala/kdejava/TDEIO.cpp
index 12aeca9d..5e94eb16 100644
--- a/kdejava/koala/kdejava/TDEIO.cpp
+++ b/kdejava/koala/kdejava/TDEIO.cpp
@@ -1,12 +1,12 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <kio/renamedlg.h>
 #include <kio/global.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 #include <tqdatastream.h>
 #include <kio/authinfo.h>
 #include <tqstring.h>
 #include <tqdom.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kurl.h>
 #include <kio/skipdlg.h>
 #include <tqcstring.h>
diff --git a/kdejava/koala/kdejava/URLArgs.cpp b/kdejava/koala/kdejava/URLArgs.cpp
index d6a85867..1c0ced4b 100644
--- a/kdejava/koala/kdejava/URLArgs.cpp
+++ b/kdejava/koala/kdejava/URLArgs.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/kdejava/koala/kdejava/WindowArgs.cpp b/kdejava/koala/kdejava/WindowArgs.cpp
index 325f5cf3..bf5e0c3e 100644
--- a/kdejava/koala/kdejava/WindowArgs.cpp
+++ b/kdejava/koala/kdejava/WindowArgs.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqrect.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/org/kde/koala/Element.java b/kdejava/koala/org/kde/koala/Element.java
index 4edb66e3..80c809b1 100644
--- a/kdejava/koala/org/kde/koala/Element.java
+++ b/kdejava/koala/org/kde/koala/Element.java
@@ -317,10 +317,10 @@ public class Element extends Node  {
 		     		@short    KHTML extension to DOM  This method returns the associated form element.
 	*/
 	public native Element form();
-	public static native boolean khtmlValidAttrName(String name);
-	public static native boolean khtmlValidPrefix(String name);
-	public static native boolean khtmlValidQualifiedName(String name);
-	public static native boolean khtmlMalformedQualifiedName(String name);
-	public static native boolean khtmlMalformedPrefix(String name);
+	public static native boolean tdehtmlValidAttrName(String name);
+	public static native boolean tdehtmlValidPrefix(String name);
+	public static native boolean tdehtmlValidQualifiedName(String name);
+	public static native boolean tdehtmlMalformedQualifiedName(String name);
+	public static native boolean tdehtmlMalformedPrefix(String name);
 	// DOM::Element* Element(DOM::ElementImpl* arg1); >>>> NOT CONVERTED
 }
diff --git a/kdejava/koala/org/kde/koala/Factory.java b/kdejava/koala/org/kde/koala/Factory.java
index 80be6662..912d7454 100644
--- a/kdejava/koala/org/kde/koala/Factory.java
+++ b/kdejava/koala/org/kde/koala/Factory.java
@@ -25,7 +25,7 @@ public class Factory extends KLibFactory  {
 			 The ArrayList can be used to pass additional arguments to the part.
 		 If the part needs additional arguments, it should take them as
 		 name="value" pairs. This is the way additional arguments will get passed
-		 to the part from eg. khtml. You can for example embed the part into HTML
+		 to the part from eg. tdehtml. You can for example embed the part into HTML
 		 by using the following code:
 		 <pre>
 		    <object type="my_mimetype" data="url_to_my_data">
diff --git a/kdejava/koala/org/kde/koala/HistoryProvider.java b/kdejava/koala/org/kde/koala/HistoryProvider.java
index b40c8799..5f101526 100644
--- a/kdejava/koala/org/kde/koala/HistoryProvider.java
+++ b/kdejava/koala/org/kde/koala/HistoryProvider.java
@@ -12,9 +12,9 @@ import org.kde.qt.TQObject;
  Basic class to manage a history of "items". This class is only meant
  for fast lookup, if an item is in the history or not.
  May be subclassed to implement a persistent history for example.
- For usage with khtml, just create your provider and call the
- HistoryProvider constructor _before_ you do any khtml stuff. That way,
- khtml, using the self()-method, will use your subclassed provider.
+ For usage with tdehtml, just create your provider and call the
+ HistoryProvider constructor _before_ you do any tdehtml stuff. That way,
+ tdehtml, using the self()-method, will use your subclassed provider.
  See {@link HistoryProviderSignals} for signals emitted by HistoryProvider
 		@author Carsten Pfeiffer <pfeiffer@kde.org>
  
diff --git a/kdejava/koala/org/kde/koala/KHTMLPart.java b/kdejava/koala/org/kde/koala/KHTMLPart.java
index 56f5b35f..13abfc0f 100644
--- a/kdejava/koala/org/kde/koala/KHTMLPart.java
+++ b/kdejava/koala/org/kde/koala/KHTMLPart.java
@@ -17,7 +17,7 @@ import org.kde.qt.TQWidget;
 
 /**
 
- This class is khtml's main class. It features an almost complete
+ This class is tdehtml's main class. It features an almost complete
  web browser, and html renderer.
  The easiest way to use this class (if you just want to display an HTML
  page at some URL) is the following:
@@ -216,7 +216,7 @@ public class KHTMLPart extends ReadOnlyPart  {
 		   		@short    Returns a pointer to the KParts.BrowserExtension.
 	*/
 	public native BrowserExtension browserExtension();
-	// KParts::LiveConnectExtension* liveConnectExtension(const khtml::RenderPart* arg1); >>>> NOT CONVERTED
+	// KParts::LiveConnectExtension* liveConnectExtension(const tdehtml::RenderPart* arg1); >>>> NOT CONVERTED
 	public native BrowserHostExtension browserHostExtension();
 	/**	
 		 Returns a pointer to the HTML document's view.
@@ -734,7 +734,7 @@ public class KHTMLPart extends ReadOnlyPart  {
 		 frame info in <code>childFrame</code>
 				@short    Recursively finds the part containing the frame with name <code>f</code>  and checks if it is accessible by <code>callingPart</code>  Returns 0L if no suitable frame can't be found.
 	*/
-	// KHTMLPart* findFrameParent(KParts::ReadOnlyPart* arg1,const TQString& arg2,khtml::ChildFrame** arg3); >>>> NOT CONVERTED
+	// KHTMLPart* findFrameParent(KParts::ReadOnlyPart* arg1,const TQString& arg2,tdehtml::ChildFrame** arg3); >>>> NOT CONVERTED
 	public native KHTMLPart findFrameParent(ReadOnlyPart callingPart, String f);
 	/**	
 		 Return the current frame (the one that has focus)
@@ -931,30 +931,30 @@ public class KHTMLPart extends ReadOnlyPart  {
 	protected native void htmlError(int errorCode, String text, KURL reqUrl);
 	protected native void customEvent(TQCustomEvent event);
 	/**	
-		 Eventhandler of the khtml.MousePressEvent.
-		   		@short    Eventhandler of the khtml.MousePressEvent.
+		 Eventhandler of the tdehtml.MousePressEvent.
+		   		@short    Eventhandler of the tdehtml.MousePressEvent.
 	*/
-	// void khtmlMousePressEvent(khtml::MousePressEvent* arg1); >>>> NOT CONVERTED
+	// void tdehtmlMousePressEvent(tdehtml::MousePressEvent* arg1); >>>> NOT CONVERTED
 	/**	
-		 Eventhandler for the khtml.MouseDoubleClickEvent.
-		   		@short    Eventhandler for the khtml.MouseDoubleClickEvent.
+		 Eventhandler for the tdehtml.MouseDoubleClickEvent.
+		   		@short    Eventhandler for the tdehtml.MouseDoubleClickEvent.
 	*/
-	// void khtmlMouseDoubleClickEvent(khtml::MouseDoubleClickEvent* arg1); >>>> NOT CONVERTED
+	// void tdehtmlMouseDoubleClickEvent(tdehtml::MouseDoubleClickEvent* arg1); >>>> NOT CONVERTED
 	/**	
-		 Eventhandler for the khtml.MouseMouseMoveEvent.
-		   		@short    Eventhandler for the khtml.MouseMouseMoveEvent.
+		 Eventhandler for the tdehtml.MouseMouseMoveEvent.
+		   		@short    Eventhandler for the tdehtml.MouseMouseMoveEvent.
 	*/
-	// void khtmlMouseMoveEvent(khtml::MouseMoveEvent* arg1); >>>> NOT CONVERTED
+	// void tdehtmlMouseMoveEvent(tdehtml::MouseMoveEvent* arg1); >>>> NOT CONVERTED
 	/**	
-		 Eventhandler for the khtml.MouseMouseReleaseEvent.
-		   		@short    Eventhandler for the khtml.MouseMouseReleaseEvent.
+		 Eventhandler for the tdehtml.MouseMouseReleaseEvent.
+		   		@short    Eventhandler for the tdehtml.MouseMouseReleaseEvent.
 	*/
-	// void khtmlMouseReleaseEvent(khtml::MouseReleaseEvent* arg1); >>>> NOT CONVERTED
+	// void tdehtmlMouseReleaseEvent(tdehtml::MouseReleaseEvent* arg1); >>>> NOT CONVERTED
 	/**	
-		 Eventhandler for the khtml.DrawContentsEvent.
-		   		@short    Eventhandler for the khtml.DrawContentsEvent.
+		 Eventhandler for the tdehtml.DrawContentsEvent.
+		   		@short    Eventhandler for the tdehtml.DrawContentsEvent.
 	*/
-	// void khtmlDrawContentsEvent(khtml::DrawContentsEvent* arg1); >>>> NOT CONVERTED
+	// void tdehtmlDrawContentsEvent(tdehtml::DrawContentsEvent* arg1); >>>> NOT CONVERTED
 	/**	
 		 Internal reimplementation of KParts.Part.guiActivateEvent .
 		   		@short    Internal reimplementation of KParts.Part.guiActivateEvent .
diff --git a/kdejava/koala/org/kde/koala/KServiceGroup.java b/kdejava/koala/org/kde/koala/KServiceGroup.java
index fcbb89ef..a76f60a3 100644
--- a/kdejava/koala/org/kde/koala/KServiceGroup.java
+++ b/kdejava/koala/org/kde/koala/KServiceGroup.java
@@ -122,7 +122,7 @@ public class KServiceGroup extends KSycocaEntry  {
 	public native int childCount();
 	/**	
 		 Returns true if the NoDisplay flag was set, i.e. if this
-		 group should be hidden from menus, while still being in ksycoca.
+		 group should be hidden from menus, while still being in tdesycoca.
 				@return true to hide this service group, false to display it
 
 		@short    Returns true if the NoDisplay flag was set, i.
diff --git a/kdejava/koala/org/kde/koala/KSpell.java b/kdejava/koala/org/kde/koala/KSpell.java
index 3ea6d3e0..a1535e00 100644
--- a/kdejava/koala/org/kde/koala/KSpell.java
+++ b/kdejava/koala/org/kde/koala/KSpell.java
@@ -243,7 +243,7 @@ public class KSpell extends TQObject  {
 			 After calling checkWord, you can use this to get the dialog box's
 		  result code.
 		 The possible
-		  values are (from kspelldlg.h):
+		  values are (from tdespelldlg.h):
 		
 			<li>
 			KS_CANCEL
diff --git a/kdejava/koala/org/kde/koala/KSpellConfig.java b/kdejava/koala/org/kde/koala/KSpellConfig.java
index c5cf1e85..57b018dd 100644
--- a/kdejava/koala/org/kde/koala/KSpellConfig.java
+++ b/kdejava/koala/org/kde/koala/KSpellConfig.java
@@ -178,8 +178,8 @@ public class KSpellConfig extends TQWidget  {
 	*/
 	protected native boolean interpret(StringBuffer fname, StringBuffer lname, StringBuffer hname);
 	/**	
-		 Invokes the help documentation for kspell
-		     		@short    Invokes the help documentation for kspell
+		 Invokes the help documentation for tdespell
+		     		@short    Invokes the help documentation for tdespell
 	*/
 	protected native void sHelp();
 	protected native void sNoAff(boolean arg1);
diff --git a/kdejava/koala/org/kde/koala/KStringHandler.java b/kdejava/koala/org/kde/koala/KStringHandler.java
index 6897854a..3e271c22 100644
--- a/kdejava/koala/org/kde/koala/KStringHandler.java
+++ b/kdejava/koala/org/kde/koala/KStringHandler.java
@@ -327,8 +327,8 @@ public class KStringHandler implements QtSupport {
 		 will be extracted. The final token will be the remainder of the string.
 			 Example:
 		 <pre>
-		 perlSplit(' ', "kparts reaches the parts other parts can't", 3)
-		 ArrayList contains: "kparts", "reaches", "the parts other parts can't"
+		 perlSplit(' ', "tdeparts reaches the parts other parts can't", 3)
+		 ArrayList contains: "tdeparts", "reaches", "the parts other parts can't"
 		 </pre>
 			@param sep is the character to use to delimit s.
 			@param s is the input string
diff --git a/kdejava/koala/org/kde/koala/KSycoca.java b/kdejava/koala/org/kde/koala/KSycoca.java
index ea1317c1..6386cafa 100644
--- a/kdejava/koala/org/kde/koala/KSycoca.java
+++ b/kdejava/koala/org/kde/koala/KSycoca.java
@@ -54,7 +54,7 @@ public class KSycoca extends TQObject implements DCOPObjectInterface {
 	public native int timeStamp();
 	/**	
 			 Signature that keeps track of changes to
-		 $TDEDIR/share/services/update_ksycoca
+		 $TDEDIR/share/services/update_tdesycoca
 			 Touching this file causes the database to be recreated
 		 from scratch.
 		    		@short
diff --git a/kdejava/koala/org/kde/koala/KSycocaEntry.java b/kdejava/koala/org/kde/koala/KSycocaEntry.java
index a7695d3d..89efbcec 100644
--- a/kdejava/koala/org/kde/koala/KSycocaEntry.java
+++ b/kdejava/koala/org/kde/koala/KSycocaEntry.java
@@ -11,7 +11,7 @@ import org.kde.qt.TQDataStream;
  You can't create an instance of KSycocaEntry, but it provides
  the common functionality for servicetypes and services.
 		@short    Base class for all Sycoca entries.
-		@see #http://developer#kde#org/documentation/library/kdeqt/trinityarch/ksycoca#html
+		@see #http://developer#kde#org/documentation/library/kdeqt/trinityarch/tdesycoca#html
 
 */
 public class KSycocaEntry extends KShared  {
diff --git a/kdejava/koala/org/kde/koala/KTrader.java b/kdejava/koala/org/kde/koala/KTrader.java
index 8b28f6c2..db0fdb0a 100644
--- a/kdejava/koala/org/kde/koala/KTrader.java
+++ b/kdejava/koala/org/kde/koala/KTrader.java
@@ -19,7 +19,7 @@ import org.kde.qt.TQObject;
  \par Examples
  A few examples will make this a lot more clear.
  Say you have an application that will display HTML.  In this
- example, you don't want to link to khtml... and furthermore, you
+ example, you don't want to link to tdehtml... and furthermore, you
  really don't care if the HTML browser is ours or not, as long as
  it works.  The way that you formulate your query as well as the way
  that you execute the browser depends on whether or not you want the
diff --git a/kdejava/koala/org/kde/koala/Part.java b/kdejava/koala/org/kde/koala/Part.java
index 9bd399c7..179e67b7 100644
--- a/kdejava/koala/org/kde/koala/Part.java
+++ b/kdejava/koala/org/kde/koala/Part.java
@@ -96,7 +96,7 @@ public class Part extends TQObject implements PartBaseInterface {
 		 Returns the part (this, or a child part) at the given global position.
 		 This is called by the part manager to ask whether a part should be activated
 		 when clicking somewhere. In most cases the default implementation is enough.
-		 Reimplement this if your part has child parts in some areas (like in khtml or koffice)
+		 Reimplement this if your part has child parts in some areas (like in tdehtml or koffice)
 			@param widget the part widget being clicked - usually the same as widget(), except in koffice.
 			@param globalPos the mouse coordinates in global coordinates
 		     		@short    Returns the part (this, or a child part) at the given global position.
diff --git a/kdejava/koala/test/simplebrowser/KSimpleBrowser.java b/kdejava/koala/test/simplebrowser/KSimpleBrowser.java
index 051dfeab..3af57ba5 100644
--- a/kdejava/koala/test/simplebrowser/KSimpleBrowser.java
+++ b/kdejava/koala/test/simplebrowser/KSimpleBrowser.java
@@ -23,7 +23,7 @@ public class KSimpleBrowser extends KMainWindow {
 
    static final int URLLined = 1;
 
-   KHTMLPart khtmlpart;
+   KHTMLPart tdehtmlpart;
 
    public KSimpleBrowser (String name) {
 
@@ -35,25 +35,25 @@ public class KSimpleBrowser extends KMainWindow {
 
       toolBar().setItemAutoSized(URLLined);
 
-      khtmlpart = new KHTMLPart(this);
-      khtmlpart.begin();
+      tdehtmlpart = new KHTMLPart(this);
+      tdehtmlpart.begin();
 
-      khtmlpart.write("<HTML><BODY><H1>KSimpleBrowser</H1>" +
+      tdehtmlpart.write("<HTML><BODY><H1>KSimpleBrowser</H1>" +
                         "<P>To load a web page, type its URL in the line " +
                         "edit box and press enter,</P>" +
                         "</BODY></HTML>");
 
-      khtmlpart.end();
+      tdehtmlpart.end();
 
       setCaption("KDE 2 Development book example - KSimpleBrowser");
 
-      setCentralWidget(khtmlpart.view());
+      setCentralWidget(tdehtmlpart.view());
 
    }
 
    public void slotNewURL () {
 
-      khtmlpart.openURL(new KURL(this.toolBar().getLinedText(URLLined)))   ;
+      tdehtmlpart.openURL(new KURL(this.toolBar().getLinedText(URLLined)))   ;
    }