Rename KInstance and KAboutData to avoid conflicts with KDE4

111 files changed, 730 insertions, 730 deletions

diff --git a/kdejava/koala/examples/kscribble/Main.java b/kdejava/koala/examples/kscribble/Main.java
index 5a0dd5bc..c27bbd29 100644
--- a/kdejava/koala/examples/kscribble/Main.java
+++ b/kdejava/koala/examples/kscribble/Main.java
@@ -40,8 +40,8 @@ static String VERSION = "0.1";
 
    public static void main(String[] cmdLineArgs) {
 
-      KAboutData aboutData = new KAboutData( "kscribble", "KScribble",
-         VERSION, description, KAboutData.License_GPL,
+      TDEAboutData aboutData = new TDEAboutData( "kscribble", "KScribble",
+         VERSION, description, TDEAboutData.License_GPL,
          "(C) 2000 by Ralf Nolden");
       TDECmdLineArgs.init( cmdLineArgs, aboutData );
       TDECmdLineArgs.addCmdLineOptions( options ); // Add our own options.
diff --git a/kdejava/koala/kdejava/DockMainWindow.cpp b/kdejava/koala/kdejava/DockMainWindow.cpp
index df5f43ce..542e87d7 100644
--- a/kdejava/koala/kdejava/DockMainWindow.cpp
+++ b/kdejava/koala/kdejava/DockMainWindow.cpp
@@ -31,15 +31,15 @@ public:
 		KParts::DockMainWindow::slotSetStatusBarText(arg1);
 		return;
 	}
-	void protected_setInstance(KInstance* arg1) {
+	void protected_setInstance(TDEInstance* arg1) {
 		KParts::PartBase::setInstance(arg1);
 		return;
 	}
-	void protected_setInstance(KInstance* arg1,bool arg2) {
+	void protected_setInstance(TDEInstance* arg1,bool arg2) {
 		KParts::PartBase::setInstance(arg1,arg2);
 		return;
 	}
-	void protected_loadPlugins(TQObject* arg1,KXMLGUIClient* arg2,KInstance* arg3) {
+	void protected_loadPlugins(TQObject* arg1,KXMLGUIClient* arg2,TDEInstance* arg3) {
 		KParts::PartBase::loadPlugins(arg1,arg2,arg3);
 		return;
 	}
@@ -485,7 +485,7 @@ Java_org_kde_koala_DockMainWindow_createShellGUI__Z(JNIEnv* env, jobject obj, jb
 JNIEXPORT void JNICALL
 Java_org_kde_koala_DockMainWindow_loadPlugins(JNIEnv* env, jobject obj, jobject parent, jobject parentGUIClient, jobject instance)
 {
-	((DockMainWindowJBridge*) QtSupport::getQt(env, obj))->protected_loadPlugins((TQObject*) QtSupport::getQt(env, parent), (KXMLGUIClient*) QtSupport::getQt(env, parentGUIClient), (KInstance*) QtSupport::getQt(env, instance));
+	((DockMainWindowJBridge*) QtSupport::getQt(env, obj))->protected_loadPlugins((TQObject*) QtSupport::getQt(env, parent), (KXMLGUIClient*) QtSupport::getQt(env, parentGUIClient), (TDEInstance*) QtSupport::getQt(env, instance));
 	return;
 }
 
@@ -546,16 +546,16 @@ Java_org_kde_koala_DockMainWindow_partObject(JNIEnv* env, jobject obj)
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_DockMainWindow_setInstance__Lorg_kde_koala_KInstanceInterface_2(JNIEnv* env, jobject obj, jobject instance)
+Java_org_kde_koala_DockMainWindow_setInstance__Lorg_kde_koala_TDEInstanceInterface_2(JNIEnv* env, jobject obj, jobject instance)
 {
-	((DockMainWindowJBridge*) QtSupport::getQt(env, obj))->protected_setInstance((KInstance*) QtSupport::getQt(env, instance));
+	((DockMainWindowJBridge*) QtSupport::getQt(env, obj))->protected_setInstance((TDEInstance*) QtSupport::getQt(env, instance));
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_DockMainWindow_setInstance__Lorg_kde_koala_KInstanceInterface_2Z(JNIEnv* env, jobject obj, jobject instance, jboolean loadPlugins)
+Java_org_kde_koala_DockMainWindow_setInstance__Lorg_kde_koala_TDEInstanceInterface_2Z(JNIEnv* env, jobject obj, jobject instance, jboolean loadPlugins)
 {
-	((DockMainWindowJBridge*) QtSupport::getQt(env, obj))->protected_setInstance((KInstance*) QtSupport::getQt(env, instance), (bool) loadPlugins);
+	((DockMainWindowJBridge*) QtSupport::getQt(env, obj))->protected_setInstance((TDEInstance*) QtSupport::getQt(env, instance), (bool) loadPlugins);
 	return;
 }
 
diff --git a/kdejava/koala/kdejava/DockMainWindow.h b/kdejava/koala/kdejava/DockMainWindow.h
index 2ffa451f..61cf596a 100644
--- a/kdejava/koala/kdejava/DockMainWindow.h
+++ b/kdejava/koala/kdejava/DockMainWindow.h
@@ -22,8 +22,8 @@ extern JNIEXPORT void JNICALL Java_org_kde_koala_DockMainWindow_createGUI (JNIEn
 extern JNIEXPORT void JNICALL Java_org_kde_koala_DockMainWindow_slotSetStatusBarText (JNIEnv *env, jobject, jstring);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_DockMainWindow_setPartObject (JNIEnv *env, jobject, jobject);
 extern JNIEXPORT jobject JNICALL Java_org_kde_koala_DockMainWindow_partObject (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_DockMainWindow_setInstance__Lorg_kde_koala_KInstanceInterface_2 (JNIEnv *env, jobject, jobject);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_DockMainWindow_setInstance__Lorg_kde_koala_KInstanceInterface_2Z (JNIEnv *env, jobject, jobject, jboolean);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_DockMainWindow_setInstance__Lorg_kde_koala_TDEInstanceInterface_2 (JNIEnv *env, jobject, jobject);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_DockMainWindow_setInstance__Lorg_kde_koala_TDEInstanceInterface_2Z (JNIEnv *env, jobject, jobject, jboolean);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_DockMainWindow_loadPlugins (JNIEnv *env, jobject, jobject, jobject, jobject);
 
 #ifdef __cplusplus
diff --git a/kdejava/koala/kdejava/Factory.cpp b/kdejava/koala/kdejava/Factory.cpp
index 52a5cd2b..94fbd1f5 100644
--- a/kdejava/koala/kdejava/Factory.cpp
+++ b/kdejava/koala/kdejava/Factory.cpp
@@ -87,14 +87,14 @@ Java_org_kde_koala_Factory_partInstanceFromLibrary(JNIEnv* env, jclass cls, jstr
 {
 	(void) cls;
 static TQCString* _qcstring_libraryName = 0;
-	jobject xret = QtSupport::objectForQtKey(env, (void*)KParts::Factory::partInstanceFromLibrary((const TQCString&)*(TQCString*) QtSupport::toTQCString(env, libraryName, &_qcstring_libraryName)), "org.kde.koala.KInstanceInterface");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)KParts::Factory::partInstanceFromLibrary((const TQCString&)*(TQCString*) QtSupport::toTQCString(env, libraryName, &_qcstring_libraryName)), "org.kde.koala.TDEInstanceInterface");
 	return xret;
 }
 
 JNIEXPORT jobject JNICALL
 Java_org_kde_koala_Factory_partInstance(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)((KParts::Factory*) QtSupport::getQt(env, obj))->partInstance(), "org.kde.koala.KInstanceInterface");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)((KParts::Factory*) QtSupport::getQt(env, obj))->partInstance(), "org.kde.koala.TDEInstanceInterface");
 	return xret;
 }
 
diff --git a/kdejava/koala/kdejava/KAboutApplication.cpp b/kdejava/koala/kdejava/KAboutApplication.cpp
index 9de0b5d2..6762b939 100644
--- a/kdejava/koala/kdejava/KAboutApplication.cpp
+++ b/kdejava/koala/kdejava/KAboutApplication.cpp
@@ -12,11 +12,11 @@ public:
 	KAboutApplicationJBridge(TQWidget* arg1,const char* arg2) : KAboutApplication(arg1,arg2) {};
 	KAboutApplicationJBridge(TQWidget* arg1) : KAboutApplication(arg1) {};
 	KAboutApplicationJBridge() : KAboutApplication() {};
-	KAboutApplicationJBridge(const KAboutData* arg1,TQWidget* arg2,const char* arg3,bool arg4) : KAboutApplication(arg1,arg2,arg3,arg4) {};
-	KAboutApplicationJBridge(const KAboutData* arg1,TQWidget* arg2,const char* arg3) : KAboutApplication(arg1,arg2,arg3) {};
-	KAboutApplicationJBridge(const KAboutData* arg1,TQWidget* arg2) : KAboutApplication(arg1,arg2) {};
-	KAboutApplicationJBridge(const KAboutData* arg1) : KAboutApplication(arg1) {};
-	void protected_buildDialog(const KAboutData* arg1) {
+	KAboutApplicationJBridge(const TDEAboutData* arg1,TQWidget* arg2,const char* arg3,bool arg4) : KAboutApplication(arg1,arg2,arg3,arg4) {};
+	KAboutApplicationJBridge(const TDEAboutData* arg1,TQWidget* arg2,const char* arg3) : KAboutApplication(arg1,arg2,arg3) {};
+	KAboutApplicationJBridge(const TDEAboutData* arg1,TQWidget* arg2) : KAboutApplication(arg1,arg2) {};
+	KAboutApplicationJBridge(const TDEAboutData* arg1) : KAboutApplication(arg1) {};
+	void protected_buildDialog(const TDEAboutData* arg1) {
 		KAboutApplication::buildDialog(arg1);
 		return;
 	}
@@ -443,7 +443,7 @@ public:
 JNIEXPORT void JNICALL
 Java_org_kde_koala_KAboutApplication_buildDialog(JNIEnv* env, jobject obj, jobject aboutData)
 {
-	((KAboutApplicationJBridge*) QtSupport::getQt(env, obj))->protected_buildDialog((const KAboutData*) QtSupport::getQt(env, aboutData));
+	((KAboutApplicationJBridge*) QtSupport::getQt(env, obj))->protected_buildDialog((const TDEAboutData*) QtSupport::getQt(env, aboutData));
 	return;
 }
 
@@ -481,42 +481,42 @@ Java_org_kde_koala_KAboutApplication_newKAboutApplication__(JNIEnv* env, jobject
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KAboutApplication_newKAboutApplication__Lorg_kde_koala_KAboutData_2(JNIEnv* env, jobject obj, jobject aboutData)
+Java_org_kde_koala_KAboutApplication_newKAboutApplication__Lorg_kde_koala_TDEAboutData_2(JNIEnv* env, jobject obj, jobject aboutData)
 {
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new KAboutApplicationJBridge((const KAboutData*) QtSupport::getQt(env, aboutData)));
+		QtSupport::setQt(env, obj, new KAboutApplicationJBridge((const TDEAboutData*) QtSupport::getQt(env, aboutData)));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KAboutApplication_newKAboutApplication__Lorg_kde_koala_KAboutData_2Lorg_kde_qt_QWidget_2(JNIEnv* env, jobject obj, jobject aboutData, jobject parent)
+Java_org_kde_koala_KAboutApplication_newKAboutApplication__Lorg_kde_koala_TDEAboutData_2Lorg_kde_qt_QWidget_2(JNIEnv* env, jobject obj, jobject aboutData, jobject parent)
 {
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new KAboutApplicationJBridge((const KAboutData*) QtSupport::getQt(env, aboutData), (TQWidget*) QtSupport::getQt(env, parent)));
+		QtSupport::setQt(env, obj, new KAboutApplicationJBridge((const TDEAboutData*) QtSupport::getQt(env, aboutData), (TQWidget*) QtSupport::getQt(env, parent)));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KAboutApplication_newKAboutApplication__Lorg_kde_koala_KAboutData_2Lorg_kde_qt_QWidget_2Ljava_lang_String_2(JNIEnv* env, jobject obj, jobject aboutData, jobject parent, jstring name)
+Java_org_kde_koala_KAboutApplication_newKAboutApplication__Lorg_kde_koala_TDEAboutData_2Lorg_kde_qt_QWidget_2Ljava_lang_String_2(JNIEnv* env, jobject obj, jobject aboutData, jobject parent, jstring name)
 {
 static TQCString* _qstring_name = 0;
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new KAboutApplicationJBridge((const KAboutData*) QtSupport::getQt(env, aboutData), (TQWidget*) QtSupport::getQt(env, parent), (const char*) QtSupport::toCharString(env, name, &_qstring_name)));
+		QtSupport::setQt(env, obj, new KAboutApplicationJBridge((const TDEAboutData*) QtSupport::getQt(env, aboutData), (TQWidget*) QtSupport::getQt(env, parent), (const char*) QtSupport::toCharString(env, name, &_qstring_name)));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KAboutApplication_newKAboutApplication__Lorg_kde_koala_KAboutData_2Lorg_kde_qt_QWidget_2Ljava_lang_String_2Z(JNIEnv* env, jobject obj, jobject aboutData, jobject parent, jstring name, jboolean modal)
+Java_org_kde_koala_KAboutApplication_newKAboutApplication__Lorg_kde_koala_TDEAboutData_2Lorg_kde_qt_QWidget_2Ljava_lang_String_2Z(JNIEnv* env, jobject obj, jobject aboutData, jobject parent, jstring name, jboolean modal)
 {
 static TQCString* _qstring_name = 0;
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new KAboutApplicationJBridge((const KAboutData*) QtSupport::getQt(env, aboutData), (TQWidget*) QtSupport::getQt(env, parent), (const char*) QtSupport::toCharString(env, name, &_qstring_name), (bool) modal));
+		QtSupport::setQt(env, obj, new KAboutApplicationJBridge((const TDEAboutData*) QtSupport::getQt(env, aboutData), (TQWidget*) QtSupport::getQt(env, parent), (const char*) QtSupport::toCharString(env, name, &_qstring_name), (bool) modal));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
diff --git a/kdejava/koala/kdejava/KAboutApplication.h b/kdejava/koala/kdejava/KAboutApplication.h
index 03cb2fa8..9f2c4dc8 100644
--- a/kdejava/koala/kdejava/KAboutApplication.h
+++ b/kdejava/koala/kdejava/KAboutApplication.h
@@ -14,10 +14,10 @@ extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutApplication_newKAboutAppl
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutApplication_newKAboutApplication__Lorg_kde_qt_QWidget_2Ljava_lang_String_2 (JNIEnv *env, jobject, jobject, jstring);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutApplication_newKAboutApplication__Lorg_kde_qt_QWidget_2 (JNIEnv *env, jobject, jobject);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutApplication_newKAboutApplication__ (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutApplication_newKAboutApplication__Lorg_kde_koala_KAboutData_2Lorg_kde_qt_QWidget_2Ljava_lang_String_2Z (JNIEnv *env, jobject, jobject, jobject, jstring, jboolean);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutApplication_newKAboutApplication__Lorg_kde_koala_KAboutData_2Lorg_kde_qt_QWidget_2Ljava_lang_String_2 (JNIEnv *env, jobject, jobject, jobject, jstring);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutApplication_newKAboutApplication__Lorg_kde_koala_KAboutData_2Lorg_kde_qt_QWidget_2 (JNIEnv *env, jobject, jobject, jobject);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutApplication_newKAboutApplication__Lorg_kde_koala_KAboutData_2 (JNIEnv *env, jobject, jobject);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutApplication_newKAboutApplication__Lorg_kde_koala_TDEAboutData_2Lorg_kde_qt_QWidget_2Ljava_lang_String_2Z (JNIEnv *env, jobject, jobject, jobject, jstring, jboolean);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutApplication_newKAboutApplication__Lorg_kde_koala_TDEAboutData_2Lorg_kde_qt_QWidget_2Ljava_lang_String_2 (JNIEnv *env, jobject, jobject, jobject, jstring);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutApplication_newKAboutApplication__Lorg_kde_koala_TDEAboutData_2Lorg_kde_qt_QWidget_2 (JNIEnv *env, jobject, jobject, jobject);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutApplication_newKAboutApplication__Lorg_kde_koala_TDEAboutData_2 (JNIEnv *env, jobject, jobject);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutApplication_buildDialog (JNIEnv *env, jobject, jobject);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutApplication_finalize (JNIEnv *env, jobject);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutApplication_dispose (JNIEnv *env, jobject);
diff --git a/kdejava/koala/kdejava/KAboutData.cpp b/kdejava/koala/kdejava/KAboutData.cpp
index aa5acbe9..34f80276 100644
--- a/kdejava/koala/kdejava/KAboutData.cpp
+++ b/kdejava/koala/kdejava/KAboutData.cpp
@@ -5,235 +5,235 @@
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
-#include <kdejava/KAboutData.h>
+#include <kdejava/TDEAboutData.h>
 
-class KAboutDataJBridge : public KAboutData
+class TDEAboutDataJBridge : public TDEAboutData
 {
 public:
-	KAboutDataJBridge(const char* arg1,const char* arg2,const char* arg3,const char* arg4,int arg5,const char* arg6,const char* arg7,const char* arg8,const char* arg9) : KAboutData(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9) {};
-	KAboutDataJBridge(const char* arg1,const char* arg2,const char* arg3,const char* arg4,int arg5,const char* arg6,const char* arg7,const char* arg8) : KAboutData(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8) {};
-	KAboutDataJBridge(const char* arg1,const char* arg2,const char* arg3,const char* arg4,int arg5,const char* arg6,const char* arg7) : KAboutData(arg1,arg2,arg3,arg4,arg5,arg6,arg7) {};
-	KAboutDataJBridge(const char* arg1,const char* arg2,const char* arg3,const char* arg4,int arg5,const char* arg6) : KAboutData(arg1,arg2,arg3,arg4,arg5,arg6) {};
-	KAboutDataJBridge(const char* arg1,const char* arg2,const char* arg3,const char* arg4,int arg5) : KAboutData(arg1,arg2,arg3,arg4,arg5) {};
-	KAboutDataJBridge(const char* arg1,const char* arg2,const char* arg3,const char* arg4) : KAboutData(arg1,arg2,arg3,arg4) {};
-	KAboutDataJBridge(const char* arg1,const char* arg2,const char* arg3) : KAboutData(arg1,arg2,arg3) {};
-	~KAboutDataJBridge() {QtSupport::qtKeyDeleted(this);}
+	TDEAboutDataJBridge(const char* arg1,const char* arg2,const char* arg3,const char* arg4,int arg5,const char* arg6,const char* arg7,const char* arg8,const char* arg9) : TDEAboutData(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9) {};
+	TDEAboutDataJBridge(const char* arg1,const char* arg2,const char* arg3,const char* arg4,int arg5,const char* arg6,const char* arg7,const char* arg8) : TDEAboutData(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8) {};
+	TDEAboutDataJBridge(const char* arg1,const char* arg2,const char* arg3,const char* arg4,int arg5,const char* arg6,const char* arg7) : TDEAboutData(arg1,arg2,arg3,arg4,arg5,arg6,arg7) {};
+	TDEAboutDataJBridge(const char* arg1,const char* arg2,const char* arg3,const char* arg4,int arg5,const char* arg6) : TDEAboutData(arg1,arg2,arg3,arg4,arg5,arg6) {};
+	TDEAboutDataJBridge(const char* arg1,const char* arg2,const char* arg3,const char* arg4,int arg5) : TDEAboutData(arg1,arg2,arg3,arg4,arg5) {};
+	TDEAboutDataJBridge(const char* arg1,const char* arg2,const char* arg3,const char* arg4) : TDEAboutData(arg1,arg2,arg3,arg4) {};
+	TDEAboutDataJBridge(const char* arg1,const char* arg2,const char* arg3) : TDEAboutData(arg1,arg2,arg3) {};
+	~TDEAboutDataJBridge() {QtSupport::qtKeyDeleted(this);}
 };
 
 JNIEXPORT jstring JNICALL
-Java_org_kde_koala_KAboutData_aboutTranslationTeam(JNIEnv* env, jclass cls)
+Java_org_kde_koala_TDEAboutData_aboutTranslationTeam(JNIEnv* env, jclass cls)
 {
 	TQString  _qstring;
 	(void) cls;
-	_qstring = KAboutDataJBridge::aboutTranslationTeam();
+	_qstring = TDEAboutDataJBridge::aboutTranslationTeam();
 	return QtSupport::fromTQString(env, &_qstring);
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KAboutData_addAuthor__Ljava_lang_String_2(JNIEnv* env, jobject obj, jstring name)
+Java_org_kde_koala_TDEAboutData_addAuthor__Ljava_lang_String_2(JNIEnv* env, jobject obj, jstring name)
 {
 static TQCString* _qstring_name = 0;
-	((KAboutData*) QtSupport::getQt(env, obj))->addAuthor((const char*) QtSupport::toCharString(env, name, &_qstring_name));
+	((TDEAboutData*) QtSupport::getQt(env, obj))->addAuthor((const char*) QtSupport::toCharString(env, name, &_qstring_name));
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KAboutData_addAuthor__Ljava_lang_String_2Ljava_lang_String_2(JNIEnv* env, jobject obj, jstring name, jstring task)
+Java_org_kde_koala_TDEAboutData_addAuthor__Ljava_lang_String_2Ljava_lang_String_2(JNIEnv* env, jobject obj, jstring name, jstring task)
 {
 static TQCString* _qstring_name = 0;
 static TQCString* _qstring_task = 0;
-	((KAboutData*) QtSupport::getQt(env, obj))->addAuthor((const char*) QtSupport::toCharString(env, name, &_qstring_name), (const char*) QtSupport::toCharString(env, task, &_qstring_task));
+	((TDEAboutData*) QtSupport::getQt(env, obj))->addAuthor((const char*) QtSupport::toCharString(env, name, &_qstring_name), (const char*) QtSupport::toCharString(env, task, &_qstring_task));
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KAboutData_addAuthor__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2(JNIEnv* env, jobject obj, jstring name, jstring task, jstring emailAddress)
+Java_org_kde_koala_TDEAboutData_addAuthor__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2(JNIEnv* env, jobject obj, jstring name, jstring task, jstring emailAddress)
 {
 static TQCString* _qstring_name = 0;
 static TQCString* _qstring_task = 0;
 static TQCString* _qstring_emailAddress = 0;
-	((KAboutData*) QtSupport::getQt(env, obj))->addAuthor((const char*) QtSupport::toCharString(env, name, &_qstring_name), (const char*) QtSupport::toCharString(env, task, &_qstring_task), (const char*) QtSupport::toCharString(env, emailAddress, &_qstring_emailAddress));
+	((TDEAboutData*) QtSupport::getQt(env, obj))->addAuthor((const char*) QtSupport::toCharString(env, name, &_qstring_name), (const char*) QtSupport::toCharString(env, task, &_qstring_task), (const char*) QtSupport::toCharString(env, emailAddress, &_qstring_emailAddress));
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KAboutData_addAuthor__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2(JNIEnv* env, jobject obj, jstring name, jstring task, jstring emailAddress, jstring webAddress)
+Java_org_kde_koala_TDEAboutData_addAuthor__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2(JNIEnv* env, jobject obj, jstring name, jstring task, jstring emailAddress, jstring webAddress)
 {
 static TQCString* _qstring_name = 0;
 static TQCString* _qstring_task = 0;
 static TQCString* _qstring_emailAddress = 0;
 static TQCString* _qstring_webAddress = 0;
-	((KAboutData*) QtSupport::getQt(env, obj))->addAuthor((const char*) QtSupport::toCharString(env, name, &_qstring_name), (const char*) QtSupport::toCharString(env, task, &_qstring_task), (const char*) QtSupport::toCharString(env, emailAddress, &_qstring_emailAddress), (const char*) QtSupport::toCharString(env, webAddress, &_qstring_webAddress));
+	((TDEAboutData*) QtSupport::getQt(env, obj))->addAuthor((const char*) QtSupport::toCharString(env, name, &_qstring_name), (const char*) QtSupport::toCharString(env, task, &_qstring_task), (const char*) QtSupport::toCharString(env, emailAddress, &_qstring_emailAddress), (const char*) QtSupport::toCharString(env, webAddress, &_qstring_webAddress));
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KAboutData_addCredit__Ljava_lang_String_2(JNIEnv* env, jobject obj, jstring name)
+Java_org_kde_koala_TDEAboutData_addCredit__Ljava_lang_String_2(JNIEnv* env, jobject obj, jstring name)
 {
 static TQCString* _qstring_name = 0;
-	((KAboutData*) QtSupport::getQt(env, obj))->addCredit((const char*) QtSupport::toCharString(env, name, &_qstring_name));
+	((TDEAboutData*) QtSupport::getQt(env, obj))->addCredit((const char*) QtSupport::toCharString(env, name, &_qstring_name));
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KAboutData_addCredit__Ljava_lang_String_2Ljava_lang_String_2(JNIEnv* env, jobject obj, jstring name, jstring task)
+Java_org_kde_koala_TDEAboutData_addCredit__Ljava_lang_String_2Ljava_lang_String_2(JNIEnv* env, jobject obj, jstring name, jstring task)
 {
 static TQCString* _qstring_name = 0;
 static TQCString* _qstring_task = 0;
-	((KAboutData*) QtSupport::getQt(env, obj))->addCredit((const char*) QtSupport::toCharString(env, name, &_qstring_name), (const char*) QtSupport::toCharString(env, task, &_qstring_task));
+	((TDEAboutData*) QtSupport::getQt(env, obj))->addCredit((const char*) QtSupport::toCharString(env, name, &_qstring_name), (const char*) QtSupport::toCharString(env, task, &_qstring_task));
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KAboutData_addCredit__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2(JNIEnv* env, jobject obj, jstring name, jstring task, jstring emailAddress)
+Java_org_kde_koala_TDEAboutData_addCredit__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2(JNIEnv* env, jobject obj, jstring name, jstring task, jstring emailAddress)
 {
 static TQCString* _qstring_name = 0;
 static TQCString* _qstring_task = 0;
 static TQCString* _qstring_emailAddress = 0;
-	((KAboutData*) QtSupport::getQt(env, obj))->addCredit((const char*) QtSupport::toCharString(env, name, &_qstring_name), (const char*) QtSupport::toCharString(env, task, &_qstring_task), (const char*) QtSupport::toCharString(env, emailAddress, &_qstring_emailAddress));
+	((TDEAboutData*) QtSupport::getQt(env, obj))->addCredit((const char*) QtSupport::toCharString(env, name, &_qstring_name), (const char*) QtSupport::toCharString(env, task, &_qstring_task), (const char*) QtSupport::toCharString(env, emailAddress, &_qstring_emailAddress));
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KAboutData_addCredit__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2(JNIEnv* env, jobject obj, jstring name, jstring task, jstring emailAddress, jstring webAddress)
+Java_org_kde_koala_TDEAboutData_addCredit__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2(JNIEnv* env, jobject obj, jstring name, jstring task, jstring emailAddress, jstring webAddress)
 {
 static TQCString* _qstring_name = 0;
 static TQCString* _qstring_task = 0;
 static TQCString* _qstring_emailAddress = 0;
 static TQCString* _qstring_webAddress = 0;
-	((KAboutData*) QtSupport::getQt(env, obj))->addCredit((const char*) QtSupport::toCharString(env, name, &_qstring_name), (const char*) QtSupport::toCharString(env, task, &_qstring_task), (const char*) QtSupport::toCharString(env, emailAddress, &_qstring_emailAddress), (const char*) QtSupport::toCharString(env, webAddress, &_qstring_webAddress));
+	((TDEAboutData*) QtSupport::getQt(env, obj))->addCredit((const char*) QtSupport::toCharString(env, name, &_qstring_name), (const char*) QtSupport::toCharString(env, task, &_qstring_task), (const char*) QtSupport::toCharString(env, emailAddress, &_qstring_emailAddress), (const char*) QtSupport::toCharString(env, webAddress, &_qstring_webAddress));
 	return;
 }
 
 JNIEXPORT jstring JNICALL
-Java_org_kde_koala_KAboutData_appName(JNIEnv* env, jobject obj)
+Java_org_kde_koala_TDEAboutData_appName(JNIEnv* env, jobject obj)
 {
 	const char* _qstring;
-	_qstring = ((KAboutData*) QtSupport::getQt(env, obj))->appName();
+	_qstring = ((TDEAboutData*) QtSupport::getQt(env, obj))->appName();
 	return QtSupport::fromCharString(env, (char *) _qstring);
 }
 
 JNIEXPORT jstring JNICALL
-Java_org_kde_koala_KAboutData_bugAddress(JNIEnv* env, jobject obj)
+Java_org_kde_koala_TDEAboutData_bugAddress(JNIEnv* env, jobject obj)
 {
 	TQString  _qstring;
-	_qstring = ((KAboutData*) QtSupport::getQt(env, obj))->bugAddress();
+	_qstring = ((TDEAboutData*) QtSupport::getQt(env, obj))->bugAddress();
 	return QtSupport::fromTQString(env, &_qstring);
 }
 
 JNIEXPORT jstring JNICALL
-Java_org_kde_koala_KAboutData_copyrightStatement(JNIEnv* env, jobject obj)
+Java_org_kde_koala_TDEAboutData_copyrightStatement(JNIEnv* env, jobject obj)
 {
 	TQString  _qstring;
-	_qstring = ((KAboutData*) QtSupport::getQt(env, obj))->copyrightStatement();
+	_qstring = ((TDEAboutData*) QtSupport::getQt(env, obj))->copyrightStatement();
 	return QtSupport::fromTQString(env, &_qstring);
 }
 
 JNIEXPORT jstring JNICALL
-Java_org_kde_koala_KAboutData_customAuthorPlainText(JNIEnv* env, jobject obj)
+Java_org_kde_koala_TDEAboutData_customAuthorPlainText(JNIEnv* env, jobject obj)
 {
 	TQString  _qstring;
-	_qstring = ((KAboutData*) QtSupport::getQt(env, obj))->customAuthorPlainText();
+	_qstring = ((TDEAboutData*) QtSupport::getQt(env, obj))->customAuthorPlainText();
 	return QtSupport::fromTQString(env, &_qstring);
 }
 
 JNIEXPORT jstring JNICALL
-Java_org_kde_koala_KAboutData_customAuthorRichText(JNIEnv* env, jobject obj)
+Java_org_kde_koala_TDEAboutData_customAuthorRichText(JNIEnv* env, jobject obj)
 {
 	TQString  _qstring;
-	_qstring = ((KAboutData*) QtSupport::getQt(env, obj))->customAuthorRichText();
+	_qstring = ((TDEAboutData*) QtSupport::getQt(env, obj))->customAuthorRichText();
 	return QtSupport::fromTQString(env, &_qstring);
 }
 
 JNIEXPORT jboolean JNICALL
-Java_org_kde_koala_KAboutData_customAuthorTextEnabled(JNIEnv* env, jobject obj)
+Java_org_kde_koala_TDEAboutData_customAuthorTextEnabled(JNIEnv* env, jobject obj)
 {
-	jboolean xret = (jboolean) ((KAboutData*) QtSupport::getQt(env, obj))->customAuthorTextEnabled();
+	jboolean xret = (jboolean) ((TDEAboutData*) QtSupport::getQt(env, obj))->customAuthorTextEnabled();
 	return xret;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KAboutData_dispose(JNIEnv* env, jobject obj)
+Java_org_kde_koala_TDEAboutData_dispose(JNIEnv* env, jobject obj)
 {
-	Java_org_kde_koala_KAboutData_finalize(env, obj);
+	Java_org_kde_koala_TDEAboutData_finalize(env, obj);
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KAboutData_finalize(JNIEnv* env, jobject obj)
+Java_org_kde_koala_TDEAboutData_finalize(JNIEnv* env, jobject obj)
 {
 	if (QtSupport::allocatedInJavaWorld(env, obj)) {
-		delete (KAboutData*)QtSupport::getQt(env, obj);
+		delete (TDEAboutData*)QtSupport::getQt(env, obj);
 		QtSupport::setQt(env, obj, 0);
 	}
 	return;
 }
 
 JNIEXPORT jstring JNICALL
-Java_org_kde_koala_KAboutData_homepage(JNIEnv* env, jobject obj)
+Java_org_kde_koala_TDEAboutData_homepage(JNIEnv* env, jobject obj)
 {
 	TQString  _qstring;
-	_qstring = ((KAboutData*) QtSupport::getQt(env, obj))->homepage();
+	_qstring = ((TDEAboutData*) QtSupport::getQt(env, obj))->homepage();
 	return QtSupport::fromTQString(env, &_qstring);
 }
 
 JNIEXPORT jboolean JNICALL
-Java_org_kde_koala_KAboutData_isDisposed(JNIEnv* env, jobject obj)
+Java_org_kde_koala_TDEAboutData_isDisposed(JNIEnv* env, jobject obj)
 {
 	return (QtSupport::getQt(env, obj) == 0);
 }
 
 JNIEXPORT jstring JNICALL
-Java_org_kde_koala_KAboutData_license(JNIEnv* env, jobject obj)
+Java_org_kde_koala_TDEAboutData_license(JNIEnv* env, jobject obj)
 {
 	TQString  _qstring;
-	_qstring = ((KAboutData*) QtSupport::getQt(env, obj))->license();
+	_qstring = ((TDEAboutData*) QtSupport::getQt(env, obj))->license();
 	return QtSupport::fromTQString(env, &_qstring);
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KAboutData_newKAboutData__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2(JNIEnv* env, jobject obj, jstring appName, jstring programName, jstring version)
+Java_org_kde_koala_TDEAboutData_newTDEAboutData__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2(JNIEnv* env, jobject obj, jstring appName, jstring programName, jstring version)
 {
 static TQCString* _qstring_appName = 0;
 static TQCString* _qstring_programName = 0;
 static TQCString* _qstring_version = 0;
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new KAboutDataJBridge((const char*) QtSupport::toCharString(env, appName, &_qstring_appName), (const char*) QtSupport::toCharString(env, programName, &_qstring_programName), (const char*) QtSupport::toCharString(env, version, &_qstring_version)));
+		QtSupport::setQt(env, obj, new TDEAboutDataJBridge((const char*) QtSupport::toCharString(env, appName, &_qstring_appName), (const char*) QtSupport::toCharString(env, programName, &_qstring_programName), (const char*) QtSupport::toCharString(env, version, &_qstring_version)));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KAboutData_newKAboutData__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2(JNIEnv* env, jobject obj, jstring appName, jstring programName, jstring version, jstring shortDescription)
+Java_org_kde_koala_TDEAboutData_newTDEAboutData__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2(JNIEnv* env, jobject obj, jstring appName, jstring programName, jstring version, jstring shortDescription)
 {
 static TQCString* _qstring_appName = 0;
 static TQCString* _qstring_programName = 0;
 static TQCString* _qstring_version = 0;
 static TQCString* _qstring_shortDescription = 0;
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new KAboutDataJBridge((const char*) QtSupport::toCharString(env, appName, &_qstring_appName), (const char*) QtSupport::toCharString(env, programName, &_qstring_programName), (const char*) QtSupport::toCharString(env, version, &_qstring_version), (const char*) QtSupport::toCharString(env, shortDescription, &_qstring_shortDescription)));
+		QtSupport::setQt(env, obj, new TDEAboutDataJBridge((const char*) QtSupport::toCharString(env, appName, &_qstring_appName), (const char*) QtSupport::toCharString(env, programName, &_qstring_programName), (const char*) QtSupport::toCharString(env, version, &_qstring_version), (const char*) QtSupport::toCharString(env, shortDescription, &_qstring_shortDescription)));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KAboutData_newKAboutData__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2I(JNIEnv* env, jobject obj, jstring appName, jstring programName, jstring version, jstring shortDescription, jint licenseType)
+Java_org_kde_koala_TDEAboutData_newTDEAboutData__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2I(JNIEnv* env, jobject obj, jstring appName, jstring programName, jstring version, jstring shortDescription, jint licenseType)
 {
 static TQCString* _qstring_appName = 0;
 static TQCString* _qstring_programName = 0;
 static TQCString* _qstring_version = 0;
 static TQCString* _qstring_shortDescription = 0;
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new KAboutDataJBridge((const char*) QtSupport::toCharString(env, appName, &_qstring_appName), (const char*) QtSupport::toCharString(env, programName, &_qstring_programName), (const char*) QtSupport::toCharString(env, version, &_qstring_version), (const char*) QtSupport::toCharString(env, shortDescription, &_qstring_shortDescription), (int) licenseType));
+		QtSupport::setQt(env, obj, new TDEAboutDataJBridge((const char*) QtSupport::toCharString(env, appName, &_qstring_appName), (const char*) QtSupport::toCharString(env, programName, &_qstring_programName), (const char*) QtSupport::toCharString(env, version, &_qstring_version), (const char*) QtSupport::toCharString(env, shortDescription, &_qstring_shortDescription), (int) licenseType));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KAboutData_newKAboutData__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2ILjava_lang_String_2(JNIEnv* env, jobject obj, jstring appName, jstring programName, jstring version, jstring shortDescription, jint licenseType, jstring copyrightStatement)
+Java_org_kde_koala_TDEAboutData_newTDEAboutData__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2ILjava_lang_String_2(JNIEnv* env, jobject obj, jstring appName, jstring programName, jstring version, jstring shortDescription, jint licenseType, jstring copyrightStatement)
 {
 static TQCString* _qstring_appName = 0;
 static TQCString* _qstring_programName = 0;
@@ -241,14 +241,14 @@ static TQCString* _qstring_version = 0;
 static TQCString* _qstring_shortDescription = 0;
 static TQCString* _qstring_copyrightStatement = 0;
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new KAboutDataJBridge((const char*) QtSupport::toCharString(env, appName, &_qstring_appName), (const char*) QtSupport::toCharString(env, programName, &_qstring_programName), (const char*) QtSupport::toCharString(env, version, &_qstring_version), (const char*) QtSupport::toCharString(env, shortDescription, &_qstring_shortDescription), (int) licenseType, (const char*) QtSupport::toCharString(env, copyrightStatement, &_qstring_copyrightStatement)));
+		QtSupport::setQt(env, obj, new TDEAboutDataJBridge((const char*) QtSupport::toCharString(env, appName, &_qstring_appName), (const char*) QtSupport::toCharString(env, programName, &_qstring_programName), (const char*) QtSupport::toCharString(env, version, &_qstring_version), (const char*) QtSupport::toCharString(env, shortDescription, &_qstring_shortDescription), (int) licenseType, (const char*) QtSupport::toCharString(env, copyrightStatement, &_qstring_copyrightStatement)));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KAboutData_newKAboutData__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2ILjava_lang_String_2Ljava_lang_String_2(JNIEnv* env, jobject obj, jstring appName, jstring programName, jstring version, jstring shortDescription, jint licenseType, jstring copyrightStatement, jstring text)
+Java_org_kde_koala_TDEAboutData_newTDEAboutData__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2ILjava_lang_String_2Ljava_lang_String_2(JNIEnv* env, jobject obj, jstring appName, jstring programName, jstring version, jstring shortDescription, jint licenseType, jstring copyrightStatement, jstring text)
 {
 static TQCString* _qstring_appName = 0;
 static TQCString* _qstring_programName = 0;
@@ -257,14 +257,14 @@ static TQCString* _qstring_shortDescription = 0;
 static TQCString* _qstring_copyrightStatement = 0;
 static TQCString* _qstring_text = 0;
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new KAboutDataJBridge((const char*) QtSupport::toCharString(env, appName, &_qstring_appName), (const char*) QtSupport::toCharString(env, programName, &_qstring_programName), (const char*) QtSupport::toCharString(env, version, &_qstring_version), (const char*) QtSupport::toCharString(env, shortDescription, &_qstring_shortDescription), (int) licenseType, (const char*) QtSupport::toCharString(env, copyrightStatement, &_qstring_copyrightStatement), (const char*) QtSupport::toCharString(env, text, &_qstring_text)));
+		QtSupport::setQt(env, obj, new TDEAboutDataJBridge((const char*) QtSupport::toCharString(env, appName, &_qstring_appName), (const char*) QtSupport::toCharString(env, programName, &_qstring_programName), (const char*) QtSupport::toCharString(env, version, &_qstring_version), (const char*) QtSupport::toCharString(env, shortDescription, &_qstring_shortDescription), (int) licenseType, (const char*) QtSupport::toCharString(env, copyrightStatement, &_qstring_copyrightStatement), (const char*) QtSupport::toCharString(env, text, &_qstring_text)));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KAboutData_newKAboutData__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2ILjava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2(JNIEnv* env, jobject obj, jstring appName, jstring programName, jstring version, jstring shortDescription, jint licenseType, jstring copyrightStatement, jstring text, jstring homePageAddress)
+Java_org_kde_koala_TDEAboutData_newTDEAboutData__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2ILjava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2(JNIEnv* env, jobject obj, jstring appName, jstring programName, jstring version, jstring shortDescription, jint licenseType, jstring copyrightStatement, jstring text, jstring homePageAddress)
 {
 static TQCString* _qstring_appName = 0;
 static TQCString* _qstring_programName = 0;
@@ -274,14 +274,14 @@ static TQCString* _qstring_copyrightStatement = 0;
 static TQCString* _qstring_text = 0;
 static TQCString* _qstring_homePageAddress = 0;
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new KAboutDataJBridge((const char*) QtSupport::toCharString(env, appName, &_qstring_appName), (const char*) QtSupport::toCharString(env, programName, &_qstring_programName), (const char*) QtSupport::toCharString(env, version, &_qstring_version), (const char*) QtSupport::toCharString(env, shortDescription, &_qstring_shortDescription), (int) licenseType, (const char*) QtSupport::toCharString(env, copyrightStatement, &_qstring_copyrightStatement), (const char*) QtSupport::toCharString(env, text, &_qstring_text), (const char*) QtSupport::toCharString(env, homePageAddress, &_qstring_homePageAddress)));
+		QtSupport::setQt(env, obj, new TDEAboutDataJBridge((const char*) QtSupport::toCharString(env, appName, &_qstring_appName), (const char*) QtSupport::toCharString(env, programName, &_qstring_programName), (const char*) QtSupport::toCharString(env, version, &_qstring_version), (const char*) QtSupport::toCharString(env, shortDescription, &_qstring_shortDescription), (int) licenseType, (const char*) QtSupport::toCharString(env, copyrightStatement, &_qstring_copyrightStatement), (const char*) QtSupport::toCharString(env, text, &_qstring_text), (const char*) QtSupport::toCharString(env, homePageAddress, &_qstring_homePageAddress)));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KAboutData_newKAboutData__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2ILjava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2(JNIEnv* env, jobject obj, jstring appName, jstring programName, jstring version, jstring shortDescription, jint licenseType, jstring copyrightStatement, jstring text, jstring homePageAddress, jstring bugsEmailAddress)
+Java_org_kde_koala_TDEAboutData_newTDEAboutData__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2ILjava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2(JNIEnv* env, jobject obj, jstring appName, jstring programName, jstring version, jstring shortDescription, jint licenseType, jstring copyrightStatement, jstring text, jstring homePageAddress, jstring bugsEmailAddress)
 {
 static TQCString* _qstring_appName = 0;
 static TQCString* _qstring_programName = 0;
@@ -292,183 +292,183 @@ static TQCString* _qstring_text = 0;
 static TQCString* _qstring_homePageAddress = 0;
 static TQCString* _qstring_bugsEmailAddress = 0;
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new KAboutDataJBridge((const char*) QtSupport::toCharString(env, appName, &_qstring_appName), (const char*) QtSupport::toCharString(env, programName, &_qstring_programName), (const char*) QtSupport::toCharString(env, version, &_qstring_version), (const char*) QtSupport::toCharString(env, shortDescription, &_qstring_shortDescription), (int) licenseType, (const char*) QtSupport::toCharString(env, copyrightStatement, &_qstring_copyrightStatement), (const char*) QtSupport::toCharString(env, text, &_qstring_text), (const char*) QtSupport::toCharString(env, homePageAddress, &_qstring_homePageAddress), (const char*) QtSupport::toCharString(env, bugsEmailAddress, &_qstring_bugsEmailAddress)));
+		QtSupport::setQt(env, obj, new TDEAboutDataJBridge((const char*) QtSupport::toCharString(env, appName, &_qstring_appName), (const char*) QtSupport::toCharString(env, programName, &_qstring_programName), (const char*) QtSupport::toCharString(env, version, &_qstring_version), (const char*) QtSupport::toCharString(env, shortDescription, &_qstring_shortDescription), (int) licenseType, (const char*) QtSupport::toCharString(env, copyrightStatement, &_qstring_copyrightStatement), (const char*) QtSupport::toCharString(env, text, &_qstring_text), (const char*) QtSupport::toCharString(env, homePageAddress, &_qstring_homePageAddress), (const char*) QtSupport::toCharString(env, bugsEmailAddress, &_qstring_bugsEmailAddress)));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
 }
 
 JNIEXPORT jstring JNICALL
-Java_org_kde_koala_KAboutData_otherText(JNIEnv* env, jobject obj)
+Java_org_kde_koala_TDEAboutData_otherText(JNIEnv* env, jobject obj)
 {
 	TQString  _qstring;
-	_qstring = ((KAboutData*) QtSupport::getQt(env, obj))->otherText();
+	_qstring = ((TDEAboutData*) QtSupport::getQt(env, obj))->otherText();
 	return QtSupport::fromTQString(env, &_qstring);
 }
 
 JNIEXPORT jstring JNICALL
-Java_org_kde_koala_KAboutData_productName(JNIEnv* env, jobject obj)
+Java_org_kde_koala_TDEAboutData_productName(JNIEnv* env, jobject obj)
 {
 	const char* _qstring;
-	_qstring = ((KAboutData*) QtSupport::getQt(env, obj))->productName();
+	_qstring = ((TDEAboutData*) QtSupport::getQt(env, obj))->productName();
 	return QtSupport::fromCharString(env, (char *) _qstring);
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_koala_KAboutData_programLogo(JNIEnv* env, jobject obj)
+Java_org_kde_koala_TDEAboutData_programLogo(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)new TQImage(((KAboutData*) QtSupport::getQt(env, obj))->programLogo()), "org.kde.qt.TQImage", TRUE);
+	jobject xret = QtSupport::objectForQtKey(env, (void*)new TQImage(((TDEAboutData*) QtSupport::getQt(env, obj))->programLogo()), "org.kde.qt.TQImage", TRUE);
 	return xret;
 }
 
 JNIEXPORT jstring JNICALL
-Java_org_kde_koala_KAboutData_programName(JNIEnv* env, jobject obj)
+Java_org_kde_koala_TDEAboutData_programName(JNIEnv* env, jobject obj)
 {
 	TQString  _qstring;
-	_qstring = ((KAboutData*) QtSupport::getQt(env, obj))->programName();
+	_qstring = ((TDEAboutData*) QtSupport::getQt(env, obj))->programName();
 	return QtSupport::fromTQString(env, &_qstring);
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KAboutData_setAppName(JNIEnv* env, jobject obj, jstring appName)
+Java_org_kde_koala_TDEAboutData_setAppName(JNIEnv* env, jobject obj, jstring appName)
 {
 static TQCString* _qstring_appName = 0;
-	((KAboutData*) QtSupport::getQt(env, obj))->setAppName((const char*) QtSupport::toCharString(env, appName, &_qstring_appName));
+	((TDEAboutData*) QtSupport::getQt(env, obj))->setAppName((const char*) QtSupport::toCharString(env, appName, &_qstring_appName));
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KAboutData_setBugAddress(JNIEnv* env, jobject obj, jstring bugAddress)
+Java_org_kde_koala_TDEAboutData_setBugAddress(JNIEnv* env, jobject obj, jstring bugAddress)
 {
 static TQCString* _qstring_bugAddress = 0;
-	((KAboutData*) QtSupport::getQt(env, obj))->setBugAddress((const char*) QtSupport::toCharString(env, bugAddress, &_qstring_bugAddress));
+	((TDEAboutData*) QtSupport::getQt(env, obj))->setBugAddress((const char*) QtSupport::toCharString(env, bugAddress, &_qstring_bugAddress));
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KAboutData_setCopyrightStatement(JNIEnv* env, jobject obj, jstring copyrightStatement)
+Java_org_kde_koala_TDEAboutData_setCopyrightStatement(JNIEnv* env, jobject obj, jstring copyrightStatement)
 {
 static TQCString* _qstring_copyrightStatement = 0;
-	((KAboutData*) QtSupport::getQt(env, obj))->setCopyrightStatement((const char*) QtSupport::toCharString(env, copyrightStatement, &_qstring_copyrightStatement));
+	((TDEAboutData*) QtSupport::getQt(env, obj))->setCopyrightStatement((const char*) QtSupport::toCharString(env, copyrightStatement, &_qstring_copyrightStatement));
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KAboutData_setCustomAuthorText(JNIEnv* env, jobject obj, jstring plainText, jstring richText)
+Java_org_kde_koala_TDEAboutData_setCustomAuthorText(JNIEnv* env, jobject obj, jstring plainText, jstring richText)
 {
 static TQString* _qstring_plainText = 0;
 static TQString* _qstring_richText = 0;
-	((KAboutData*) QtSupport::getQt(env, obj))->setCustomAuthorText((const TQString&)*(TQString*) QtSupport::toTQString(env, plainText, &_qstring_plainText), (const TQString&)*(TQString*) QtSupport::toTQString(env, richText, &_qstring_richText));
+	((TDEAboutData*) QtSupport::getQt(env, obj))->setCustomAuthorText((const TQString&)*(TQString*) QtSupport::toTQString(env, plainText, &_qstring_plainText), (const TQString&)*(TQString*) QtSupport::toTQString(env, richText, &_qstring_richText));
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KAboutData_setHomepage(JNIEnv* env, jobject obj, jstring homepage)
+Java_org_kde_koala_TDEAboutData_setHomepage(JNIEnv* env, jobject obj, jstring homepage)
 {
 static TQCString* _qstring_homepage = 0;
-	((KAboutData*) QtSupport::getQt(env, obj))->setHomepage((const char*) QtSupport::toCharString(env, homepage, &_qstring_homepage));
+	((TDEAboutData*) QtSupport::getQt(env, obj))->setHomepage((const char*) QtSupport::toCharString(env, homepage, &_qstring_homepage));
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KAboutData_setLicenseTextFile(JNIEnv* env, jobject obj, jstring file)
+Java_org_kde_koala_TDEAboutData_setLicenseTextFile(JNIEnv* env, jobject obj, jstring file)
 {
 static TQString* _qstring_file = 0;
-	((KAboutData*) QtSupport::getQt(env, obj))->setLicenseTextFile((const TQString&)*(TQString*) QtSupport::toTQString(env, file, &_qstring_file));
+	((TDEAboutData*) QtSupport::getQt(env, obj))->setLicenseTextFile((const TQString&)*(TQString*) QtSupport::toTQString(env, file, &_qstring_file));
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KAboutData_setLicenseText(JNIEnv* env, jobject obj, jstring license)
+Java_org_kde_koala_TDEAboutData_setLicenseText(JNIEnv* env, jobject obj, jstring license)
 {
 static TQCString* _qstring_license = 0;
-	((KAboutData*) QtSupport::getQt(env, obj))->setLicenseText((const char*) QtSupport::toCharString(env, license, &_qstring_license));
+	((TDEAboutData*) QtSupport::getQt(env, obj))->setLicenseText((const char*) QtSupport::toCharString(env, license, &_qstring_license));
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KAboutData_setLicense(JNIEnv* env, jobject obj, jint licenseKey)
+Java_org_kde_koala_TDEAboutData_setLicense(JNIEnv* env, jobject obj, jint licenseKey)
 {
-	((KAboutData*) QtSupport::getQt(env, obj))->setLicense((KAboutData::LicenseKey) licenseKey);
+	((TDEAboutData*) QtSupport::getQt(env, obj))->setLicense((TDEAboutData::LicenseKey) licenseKey);
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KAboutData_setOtherText(JNIEnv* env, jobject obj, jstring otherText)
+Java_org_kde_koala_TDEAboutData_setOtherText(JNIEnv* env, jobject obj, jstring otherText)
 {
 static TQCString* _qstring_otherText = 0;
-	((KAboutData*) QtSupport::getQt(env, obj))->setOtherText((const char*) QtSupport::toCharString(env, otherText, &_qstring_otherText));
+	((TDEAboutData*) QtSupport::getQt(env, obj))->setOtherText((const char*) QtSupport::toCharString(env, otherText, &_qstring_otherText));
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KAboutData_setProductName(JNIEnv* env, jobject obj, jstring name)
+Java_org_kde_koala_TDEAboutData_setProductName(JNIEnv* env, jobject obj, jstring name)
 {
 static TQCString* _qstring_name = 0;
-	((KAboutData*) QtSupport::getQt(env, obj))->setProductName((const char*) QtSupport::toCharString(env, name, &_qstring_name));
+	((TDEAboutData*) QtSupport::getQt(env, obj))->setProductName((const char*) QtSupport::toCharString(env, name, &_qstring_name));
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KAboutData_setProgramLogo(JNIEnv* env, jobject obj, jobject image)
+Java_org_kde_koala_TDEAboutData_setProgramLogo(JNIEnv* env, jobject obj, jobject image)
 {
-	((KAboutData*) QtSupport::getQt(env, obj))->setProgramLogo((const TQImage&)*(const TQImage*) QtSupport::getQt(env, image));
+	((TDEAboutData*) QtSupport::getQt(env, obj))->setProgramLogo((const TQImage&)*(const TQImage*) QtSupport::getQt(env, image));
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KAboutData_setProgramName(JNIEnv* env, jobject obj, jstring programName)
+Java_org_kde_koala_TDEAboutData_setProgramName(JNIEnv* env, jobject obj, jstring programName)
 {
 static TQCString* _qstring_programName = 0;
-	((KAboutData*) QtSupport::getQt(env, obj))->setProgramName((const char*) QtSupport::toCharString(env, programName, &_qstring_programName));
+	((TDEAboutData*) QtSupport::getQt(env, obj))->setProgramName((const char*) QtSupport::toCharString(env, programName, &_qstring_programName));
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KAboutData_setShortDescription(JNIEnv* env, jobject obj, jstring shortDescription)
+Java_org_kde_koala_TDEAboutData_setShortDescription(JNIEnv* env, jobject obj, jstring shortDescription)
 {
 static TQCString* _qstring_shortDescription = 0;
-	((KAboutData*) QtSupport::getQt(env, obj))->setShortDescription((const char*) QtSupport::toCharString(env, shortDescription, &_qstring_shortDescription));
+	((TDEAboutData*) QtSupport::getQt(env, obj))->setShortDescription((const char*) QtSupport::toCharString(env, shortDescription, &_qstring_shortDescription));
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KAboutData_setTranslator(JNIEnv* env, jobject obj, jstring name, jstring emailAddress)
+Java_org_kde_koala_TDEAboutData_setTranslator(JNIEnv* env, jobject obj, jstring name, jstring emailAddress)
 {
 static TQCString* _qstring_name = 0;
 static TQCString* _qstring_emailAddress = 0;
-	((KAboutData*) QtSupport::getQt(env, obj))->setTranslator((const char*) QtSupport::toCharString(env, name, &_qstring_name), (const char*) QtSupport::toCharString(env, emailAddress, &_qstring_emailAddress));
+	((TDEAboutData*) QtSupport::getQt(env, obj))->setTranslator((const char*) QtSupport::toCharString(env, name, &_qstring_name), (const char*) QtSupport::toCharString(env, emailAddress, &_qstring_emailAddress));
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KAboutData_setVersion(JNIEnv* env, jobject obj, jstring version)
+Java_org_kde_koala_TDEAboutData_setVersion(JNIEnv* env, jobject obj, jstring version)
 {
 static TQCString* _qstring_version = 0;
-	((KAboutData*) QtSupport::getQt(env, obj))->setVersion((const char*) QtSupport::toCharString(env, version, &_qstring_version));
+	((TDEAboutData*) QtSupport::getQt(env, obj))->setVersion((const char*) QtSupport::toCharString(env, version, &_qstring_version));
 	return;
 }
 
 JNIEXPORT jstring JNICALL
-Java_org_kde_koala_KAboutData_shortDescription(JNIEnv* env, jobject obj)
+Java_org_kde_koala_TDEAboutData_shortDescription(JNIEnv* env, jobject obj)
 {
 	TQString  _qstring;
-	_qstring = ((KAboutData*) QtSupport::getQt(env, obj))->shortDescription();
+	_qstring = ((TDEAboutData*) QtSupport::getQt(env, obj))->shortDescription();
 	return QtSupport::fromTQString(env, &_qstring);
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KAboutData_unsetCustomAuthorText(JNIEnv* env, jobject obj)
+Java_org_kde_koala_TDEAboutData_unsetCustomAuthorText(JNIEnv* env, jobject obj)
 {
-	((KAboutData*) QtSupport::getQt(env, obj))->unsetCustomAuthorText();
+	((TDEAboutData*) QtSupport::getQt(env, obj))->unsetCustomAuthorText();
 	return;
 }
 
 JNIEXPORT jstring JNICALL
-Java_org_kde_koala_KAboutData_version(JNIEnv* env, jobject obj)
+Java_org_kde_koala_TDEAboutData_version(JNIEnv* env, jobject obj)
 {
 	TQString  _qstring;
-	_qstring = ((KAboutData*) QtSupport::getQt(env, obj))->version();
+	_qstring = ((TDEAboutData*) QtSupport::getQt(env, obj))->version();
 	return QtSupport::fromTQString(env, &_qstring);
 }
 
diff --git a/kdejava/koala/kdejava/KAboutData.h b/kdejava/koala/kdejava/KAboutData.h
index d107ebdd..e436e10e 100644
--- a/kdejava/koala/kdejava/KAboutData.h
+++ b/kdejava/koala/kdejava/KAboutData.h
@@ -1,7 +1,7 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
 
-#ifndef __org_kde_koala_KAboutData__
-#define __org_kde_koala_KAboutData__
+#ifndef __org_kde_koala_TDEAboutData__
+#define __org_kde_koala_TDEAboutData__
 
 #include <jni.h>
 
@@ -10,58 +10,58 @@ extern "C"
 {
 #endif
 
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutData_newKAboutData__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2ILjava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jobject, jstring, jstring, jstring, jstring, jint, jstring, jstring, jstring, jstring);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutData_newKAboutData__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2ILjava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jobject, jstring, jstring, jstring, jstring, jint, jstring, jstring, jstring);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutData_newKAboutData__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2ILjava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jobject, jstring, jstring, jstring, jstring, jint, jstring, jstring);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutData_newKAboutData__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2ILjava_lang_String_2 (JNIEnv *env, jobject, jstring, jstring, jstring, jstring, jint, jstring);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutData_newKAboutData__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2I (JNIEnv *env, jobject, jstring, jstring, jstring, jstring, jint);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutData_newKAboutData__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jobject, jstring, jstring, jstring, jstring);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutData_newKAboutData__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jobject, jstring, jstring, jstring);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutData_addAuthor__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jobject, jstring, jstring, jstring, jstring);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutData_addAuthor__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jobject, jstring, jstring, jstring);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutData_addAuthor__Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jobject, jstring, jstring);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutData_addAuthor__Ljava_lang_String_2 (JNIEnv *env, jobject, jstring);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutData_addCredit__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jobject, jstring, jstring, jstring, jstring);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutData_addCredit__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jobject, jstring, jstring, jstring);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutData_addCredit__Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jobject, jstring, jstring);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutData_addCredit__Ljava_lang_String_2 (JNIEnv *env, jobject, jstring);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutData_setTranslator (JNIEnv *env, jobject, jstring, jstring);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutData_setLicenseText (JNIEnv *env, jobject, jstring);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutData_setLicenseTextFile (JNIEnv *env, jobject, jstring);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutData_setAppName (JNIEnv *env, jobject, jstring);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutData_setProgramName (JNIEnv *env, jobject, jstring);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutData_setProgramLogo (JNIEnv *env, jobject, jobject);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutData_setVersion (JNIEnv *env, jobject, jstring);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutData_setShortDescription (JNIEnv *env, jobject, jstring);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutData_setLicense (JNIEnv *env, jobject, jint);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutData_setCopyrightStatement (JNIEnv *env, jobject, jstring);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutData_setOtherText (JNIEnv *env, jobject, jstring);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutData_setHomepage (JNIEnv *env, jobject, jstring);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutData_setBugAddress (JNIEnv *env, jobject, jstring);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutData_setProductName (JNIEnv *env, jobject, jstring);
-extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KAboutData_appName (JNIEnv *env, jobject);
-extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KAboutData_productName (JNIEnv *env, jobject);
-extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KAboutData_programName (JNIEnv *env, jobject);
-extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KAboutData_programLogo (JNIEnv *env, jobject);
-extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KAboutData_version (JNIEnv *env, jobject);
-extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KAboutData_shortDescription (JNIEnv *env, jobject);
-extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KAboutData_homepage (JNIEnv *env, jobject);
-extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KAboutData_bugAddress (JNIEnv *env, jobject);
-extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KAboutData_otherText (JNIEnv *env, jobject);
-extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KAboutData_license (JNIEnv *env, jobject);
-extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KAboutData_copyrightStatement (JNIEnv *env, jobject);
-extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KAboutData_customAuthorPlainText (JNIEnv *env, jobject);
-extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KAboutData_customAuthorRichText (JNIEnv *env, jobject);
-extern JNIEXPORT jboolean JNICALL Java_org_kde_koala_KAboutData_customAuthorTextEnabled (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutData_setCustomAuthorText (JNIEnv *env, jobject, jstring, jstring);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutData_unsetCustomAuthorText (JNIEnv *env, jobject);
-extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KAboutData_aboutTranslationTeam (JNIEnv *env, jclass);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutData_finalize (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KAboutData_dispose (JNIEnv *env, jobject);
-extern JNIEXPORT jboolean JNICALL Java_org_kde_koala_KAboutData_isDisposed (JNIEnv *env, jobject);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEAboutData_newTDEAboutData__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2ILjava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jobject, jstring, jstring, jstring, jstring, jint, jstring, jstring, jstring, jstring);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEAboutData_newTDEAboutData__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2ILjava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jobject, jstring, jstring, jstring, jstring, jint, jstring, jstring, jstring);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEAboutData_newTDEAboutData__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2ILjava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jobject, jstring, jstring, jstring, jstring, jint, jstring, jstring);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEAboutData_newTDEAboutData__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2ILjava_lang_String_2 (JNIEnv *env, jobject, jstring, jstring, jstring, jstring, jint, jstring);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEAboutData_newTDEAboutData__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2I (JNIEnv *env, jobject, jstring, jstring, jstring, jstring, jint);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEAboutData_newTDEAboutData__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jobject, jstring, jstring, jstring, jstring);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEAboutData_newTDEAboutData__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jobject, jstring, jstring, jstring);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEAboutData_addAuthor__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jobject, jstring, jstring, jstring, jstring);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEAboutData_addAuthor__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jobject, jstring, jstring, jstring);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEAboutData_addAuthor__Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jobject, jstring, jstring);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEAboutData_addAuthor__Ljava_lang_String_2 (JNIEnv *env, jobject, jstring);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEAboutData_addCredit__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jobject, jstring, jstring, jstring, jstring);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEAboutData_addCredit__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jobject, jstring, jstring, jstring);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEAboutData_addCredit__Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jobject, jstring, jstring);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEAboutData_addCredit__Ljava_lang_String_2 (JNIEnv *env, jobject, jstring);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEAboutData_setTranslator (JNIEnv *env, jobject, jstring, jstring);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEAboutData_setLicenseText (JNIEnv *env, jobject, jstring);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEAboutData_setLicenseTextFile (JNIEnv *env, jobject, jstring);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEAboutData_setAppName (JNIEnv *env, jobject, jstring);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEAboutData_setProgramName (JNIEnv *env, jobject, jstring);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEAboutData_setProgramLogo (JNIEnv *env, jobject, jobject);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEAboutData_setVersion (JNIEnv *env, jobject, jstring);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEAboutData_setShortDescription (JNIEnv *env, jobject, jstring);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEAboutData_setLicense (JNIEnv *env, jobject, jint);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEAboutData_setCopyrightStatement (JNIEnv *env, jobject, jstring);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEAboutData_setOtherText (JNIEnv *env, jobject, jstring);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEAboutData_setHomepage (JNIEnv *env, jobject, jstring);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEAboutData_setBugAddress (JNIEnv *env, jobject, jstring);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEAboutData_setProductName (JNIEnv *env, jobject, jstring);
+extern JNIEXPORT jstring JNICALL Java_org_kde_koala_TDEAboutData_appName (JNIEnv *env, jobject);
+extern JNIEXPORT jstring JNICALL Java_org_kde_koala_TDEAboutData_productName (JNIEnv *env, jobject);
+extern JNIEXPORT jstring JNICALL Java_org_kde_koala_TDEAboutData_programName (JNIEnv *env, jobject);
+extern JNIEXPORT jobject JNICALL Java_org_kde_koala_TDEAboutData_programLogo (JNIEnv *env, jobject);
+extern JNIEXPORT jstring JNICALL Java_org_kde_koala_TDEAboutData_version (JNIEnv *env, jobject);
+extern JNIEXPORT jstring JNICALL Java_org_kde_koala_TDEAboutData_shortDescription (JNIEnv *env, jobject);
+extern JNIEXPORT jstring JNICALL Java_org_kde_koala_TDEAboutData_homepage (JNIEnv *env, jobject);
+extern JNIEXPORT jstring JNICALL Java_org_kde_koala_TDEAboutData_bugAddress (JNIEnv *env, jobject);
+extern JNIEXPORT jstring JNICALL Java_org_kde_koala_TDEAboutData_otherText (JNIEnv *env, jobject);
+extern JNIEXPORT jstring JNICALL Java_org_kde_koala_TDEAboutData_license (JNIEnv *env, jobject);
+extern JNIEXPORT jstring JNICALL Java_org_kde_koala_TDEAboutData_copyrightStatement (JNIEnv *env, jobject);
+extern JNIEXPORT jstring JNICALL Java_org_kde_koala_TDEAboutData_customAuthorPlainText (JNIEnv *env, jobject);
+extern JNIEXPORT jstring JNICALL Java_org_kde_koala_TDEAboutData_customAuthorRichText (JNIEnv *env, jobject);
+extern JNIEXPORT jboolean JNICALL Java_org_kde_koala_TDEAboutData_customAuthorTextEnabled (JNIEnv *env, jobject);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEAboutData_setCustomAuthorText (JNIEnv *env, jobject, jstring, jstring);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEAboutData_unsetCustomAuthorText (JNIEnv *env, jobject);
+extern JNIEXPORT jstring JNICALL Java_org_kde_koala_TDEAboutData_aboutTranslationTeam (JNIEnv *env, jclass);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEAboutData_finalize (JNIEnv *env, jobject);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEAboutData_dispose (JNIEnv *env, jobject);
+extern JNIEXPORT jboolean JNICALL Java_org_kde_koala_TDEAboutData_isDisposed (JNIEnv *env, jobject);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* __org_kde_koala_KAboutData__ */
+#endif /* __org_kde_koala_TDEAboutData__ */
diff --git a/kdejava/koala/kdejava/KActionCollection.cpp b/kdejava/koala/kdejava/KActionCollection.cpp
index 3ac500ba..d823124c 100644
--- a/kdejava/koala/kdejava/KActionCollection.cpp
+++ b/kdejava/koala/kdejava/KActionCollection.cpp
@@ -10,14 +10,14 @@
 class KActionCollectionJBridge : public KActionCollection
 {
 public:
-	KActionCollectionJBridge(TQWidget* arg1,const char* arg2,KInstance* arg3) : KActionCollection(arg1,arg2,arg3) {};
+	KActionCollectionJBridge(TQWidget* arg1,const char* arg2,TDEInstance* arg3) : KActionCollection(arg1,arg2,arg3) {};
 	KActionCollectionJBridge(TQWidget* arg1,const char* arg2) : KActionCollection(arg1,arg2) {};
 	KActionCollectionJBridge(TQWidget* arg1) : KActionCollection(arg1) {};
-	KActionCollectionJBridge(TQWidget* arg1,TQObject* arg2,const char* arg3,KInstance* arg4) : KActionCollection(arg1,arg2,arg3,arg4) {};
+	KActionCollectionJBridge(TQWidget* arg1,TQObject* arg2,const char* arg3,TDEInstance* arg4) : KActionCollection(arg1,arg2,arg3,arg4) {};
 	KActionCollectionJBridge(TQWidget* arg1,TQObject* arg2,const char* arg3) : KActionCollection(arg1,arg2,arg3) {};
 	KActionCollectionJBridge(TQWidget* arg1,TQObject* arg2) : KActionCollection(arg1,arg2) {};
 	KActionCollectionJBridge(const KActionCollection& arg1) : KActionCollection(arg1) {};
-	KActionCollectionJBridge(TQObject* arg1,const char* arg2,KInstance* arg3) : KActionCollection(arg1,arg2,arg3) {};
+	KActionCollectionJBridge(TQObject* arg1,const char* arg2,TDEInstance* arg3) : KActionCollection(arg1,arg2,arg3) {};
 	KActionCollectionJBridge(TQObject* arg1,const char* arg2) : KActionCollection(arg1,arg2) {};
 	KActionCollectionJBridge(TQObject* arg1) : KActionCollection(arg1) {};
 	~KActionCollectionJBridge() {QtSupport::qtKeyDeleted(this);}
@@ -182,7 +182,7 @@ Java_org_kde_koala_KActionCollection_insert(JNIEnv* env, jobject obj, jobject ac
 JNIEXPORT jobject JNICALL
 Java_org_kde_koala_KActionCollection_instance(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)((KActionCollection*) QtSupport::getQt(env, obj))->instance(), "org.kde.koala.KInstanceInterface");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)((KActionCollection*) QtSupport::getQt(env, obj))->instance(), "org.kde.koala.TDEInstanceInterface");
 	return xret;
 }
 
@@ -252,11 +252,11 @@ static TQCString* _qstring_name = 0;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KActionCollection_newKActionCollection__Lorg_kde_qt_QObject_2Ljava_lang_String_2Lorg_kde_koala_KInstanceInterface_2(JNIEnv* env, jobject obj, jobject parent, jstring name, jobject instance)
+Java_org_kde_koala_KActionCollection_newKActionCollection__Lorg_kde_qt_QObject_2Ljava_lang_String_2Lorg_kde_koala_TDEInstanceInterface_2(JNIEnv* env, jobject obj, jobject parent, jstring name, jobject instance)
 {
 static TQCString* _qstring_name = 0;
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new KActionCollectionJBridge((TQObject*) QtSupport::getQt(env, parent), (const char*) QtSupport::toCharString(env, name, &_qstring_name), (KInstance*) QtSupport::getQt(env, instance)));
+		QtSupport::setQt(env, obj, new KActionCollectionJBridge((TQObject*) QtSupport::getQt(env, parent), (const char*) QtSupport::toCharString(env, name, &_qstring_name), (TDEInstance*) QtSupport::getQt(env, instance)));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
@@ -284,11 +284,11 @@ static TQCString* _qstring_name = 0;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KActionCollection_newKActionCollection__Lorg_kde_qt_QWidget_2Ljava_lang_String_2Lorg_kde_koala_KInstanceInterface_2(JNIEnv* env, jobject obj, jobject parent, jstring name, jobject instance)
+Java_org_kde_koala_KActionCollection_newKActionCollection__Lorg_kde_qt_QWidget_2Ljava_lang_String_2Lorg_kde_koala_TDEInstanceInterface_2(JNIEnv* env, jobject obj, jobject parent, jstring name, jobject instance)
 {
 static TQCString* _qstring_name = 0;
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new KActionCollectionJBridge((TQWidget*) QtSupport::getQt(env, parent), (const char*) QtSupport::toCharString(env, name, &_qstring_name), (KInstance*) QtSupport::getQt(env, instance)));
+		QtSupport::setQt(env, obj, new KActionCollectionJBridge((TQWidget*) QtSupport::getQt(env, parent), (const char*) QtSupport::toCharString(env, name, &_qstring_name), (TDEInstance*) QtSupport::getQt(env, instance)));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
@@ -316,11 +316,11 @@ static TQCString* _qstring_name = 0;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KActionCollection_newKActionCollection__Lorg_kde_qt_QWidget_2Lorg_kde_qt_QObject_2Ljava_lang_String_2Lorg_kde_koala_KInstanceInterface_2(JNIEnv* env, jobject obj, jobject watch, jobject parent, jstring name, jobject instance)
+Java_org_kde_koala_KActionCollection_newKActionCollection__Lorg_kde_qt_QWidget_2Lorg_kde_qt_QObject_2Ljava_lang_String_2Lorg_kde_koala_TDEInstanceInterface_2(JNIEnv* env, jobject obj, jobject watch, jobject parent, jstring name, jobject instance)
 {
 static TQCString* _qstring_name = 0;
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new KActionCollectionJBridge((TQWidget*) QtSupport::getQt(env, watch), (TQObject*) QtSupport::getQt(env, parent), (const char*) QtSupport::toCharString(env, name, &_qstring_name), (KInstance*) QtSupport::getQt(env, instance)));
+		QtSupport::setQt(env, obj, new KActionCollectionJBridge((TQWidget*) QtSupport::getQt(env, watch), (TQObject*) QtSupport::getQt(env, parent), (const char*) QtSupport::toCharString(env, name, &_qstring_name), (TDEInstance*) QtSupport::getQt(env, instance)));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
@@ -394,7 +394,7 @@ Java_org_kde_koala_KActionCollection_setHighlightingEnabled(JNIEnv* env, jobject
 JNIEXPORT void JNICALL
 Java_org_kde_koala_KActionCollection_setInstance(JNIEnv* env, jobject obj, jobject instance)
 {
-	((KActionCollection*) QtSupport::getQt(env, obj))->setInstance((KInstance*) QtSupport::getQt(env, instance));
+	((KActionCollection*) QtSupport::getQt(env, obj))->setInstance((TDEInstance*) QtSupport::getQt(env, instance));
 	return;
 }
 
diff --git a/kdejava/koala/kdejava/KActionCollection.h b/kdejava/koala/kdejava/KActionCollection.h
index 3c43d510..f47d46ed 100644
--- a/kdejava/koala/kdejava/KActionCollection.h
+++ b/kdejava/koala/kdejava/KActionCollection.h
@@ -12,10 +12,10 @@ extern "C"
 
 extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KActionCollection_metaObject (JNIEnv *env, jobject);
 extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KActionCollection_className (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KActionCollection_newKActionCollection__Lorg_kde_qt_QWidget_2Ljava_lang_String_2Lorg_kde_koala_KInstanceInterface_2 (JNIEnv *env, jobject, jobject, jstring, jobject);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_KActionCollection_newKActionCollection__Lorg_kde_qt_QWidget_2Ljava_lang_String_2Lorg_kde_koala_TDEInstanceInterface_2 (JNIEnv *env, jobject, jobject, jstring, jobject);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KActionCollection_newKActionCollection__Lorg_kde_qt_QWidget_2Ljava_lang_String_2 (JNIEnv *env, jobject, jobject, jstring);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KActionCollection_newKActionCollection__Lorg_kde_qt_QWidget_2 (JNIEnv *env, jobject, jobject);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KActionCollection_newKActionCollection__Lorg_kde_qt_QWidget_2Lorg_kde_qt_QObject_2Ljava_lang_String_2Lorg_kde_koala_KInstanceInterface_2 (JNIEnv *env, jobject, jobject, jobject, jstring, jobject);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_KActionCollection_newKActionCollection__Lorg_kde_qt_QWidget_2Lorg_kde_qt_QObject_2Ljava_lang_String_2Lorg_kde_koala_TDEInstanceInterface_2 (JNIEnv *env, jobject, jobject, jobject, jstring, jobject);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KActionCollection_newKActionCollection__Lorg_kde_qt_QWidget_2Lorg_kde_qt_QObject_2Ljava_lang_String_2 (JNIEnv *env, jobject, jobject, jobject, jstring);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KActionCollection_newKActionCollection__Lorg_kde_qt_QWidget_2Lorg_kde_qt_QObject_2 (JNIEnv *env, jobject, jobject, jobject);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KActionCollection_newKActionCollection__Lorg_kde_koala_KActionCollection_2 (JNIEnv *env, jobject, jobject);
@@ -44,7 +44,7 @@ extern JNIEXPORT jboolean JNICALL Java_org_kde_koala_KActionCollection_highlight
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KActionCollection_connectHighlight (JNIEnv *env, jobject, jobject, jobject);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KActionCollection_disconnectHighlight (JNIEnv *env, jobject, jobject, jobject);
 extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KActionCollection_parentGUIClient (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KActionCollection_newKActionCollection__Lorg_kde_qt_QObject_2Ljava_lang_String_2Lorg_kde_koala_KInstanceInterface_2 (JNIEnv *env, jobject, jobject, jstring, jobject);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_KActionCollection_newKActionCollection__Lorg_kde_qt_QObject_2Ljava_lang_String_2Lorg_kde_koala_TDEInstanceInterface_2 (JNIEnv *env, jobject, jobject, jstring, jobject);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KActionCollection_newKActionCollection__Lorg_kde_qt_QObject_2Ljava_lang_String_2 (JNIEnv *env, jobject, jobject, jstring);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KActionCollection_newKActionCollection__Lorg_kde_qt_QObject_2 (JNIEnv *env, jobject, jobject);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KActionCollection_insert (JNIEnv *env, jobject, jobject);
diff --git a/kdejava/koala/kdejava/KActionShortcutList.cpp b/kdejava/koala/kdejava/KActionShortcutList.cpp
index 0845d25c..47bf32f3 100644
--- a/kdejava/koala/kdejava/KActionShortcutList.cpp
+++ b/kdejava/koala/kdejava/KActionShortcutList.cpp
@@ -57,7 +57,7 @@ Java_org_kde_koala_KActionShortcutList_getOther(JNIEnv* env, jobject obj, jint a
 JNIEXPORT jobject JNICALL
 Java_org_kde_koala_KActionShortcutList_instance(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)((KActionShortcutList*) QtSupport::getQt(env, obj))->instance(), "org.kde.koala.KInstanceInterface");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)((KActionShortcutList*) QtSupport::getQt(env, obj))->instance(), "org.kde.koala.TDEInstanceInterface");
 	return xret;
 }
 
diff --git a/kdejava/koala/kdejava/KBugReport.cpp b/kdejava/koala/kdejava/KBugReport.cpp
index 03452b85..3ca3aa28 100644
--- a/kdejava/koala/kdejava/KBugReport.cpp
+++ b/kdejava/koala/kdejava/KBugReport.cpp
@@ -9,7 +9,7 @@
 class KBugReportJBridge : public KBugReport
 {
 public:
-	KBugReportJBridge(TQWidget* arg1,bool arg2,const KAboutData* arg3) : KBugReport(arg1,arg2,arg3) {};
+	KBugReportJBridge(TQWidget* arg1,bool arg2,const TDEAboutData* arg3) : KBugReport(arg1,arg2,arg3) {};
 	KBugReportJBridge(TQWidget* arg1,bool arg2) : KBugReport(arg1,arg2) {};
 	KBugReportJBridge(TQWidget* arg1) : KBugReport(arg1) {};
 	KBugReportJBridge() : KBugReport() {};
@@ -545,10 +545,10 @@ Java_org_kde_koala_KBugReport_newKBugReport__Lorg_kde_qt_QWidget_2Z(JNIEnv* env,
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KBugReport_newKBugReport__Lorg_kde_qt_QWidget_2ZLorg_kde_koala_KAboutData_2(JNIEnv* env, jobject obj, jobject parent, jboolean modal, jobject aboutData)
+Java_org_kde_koala_KBugReport_newKBugReport__Lorg_kde_qt_QWidget_2ZLorg_kde_koala_TDEAboutData_2(JNIEnv* env, jobject obj, jobject parent, jboolean modal, jobject aboutData)
 {
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new KBugReportJBridge((TQWidget*) QtSupport::getQt(env, parent), (bool) modal, (const KAboutData*) QtSupport::getQt(env, aboutData)));
+		QtSupport::setQt(env, obj, new KBugReportJBridge((TQWidget*) QtSupport::getQt(env, parent), (bool) modal, (const TDEAboutData*) QtSupport::getQt(env, aboutData)));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
diff --git a/kdejava/koala/kdejava/KBugReport.h b/kdejava/koala/kdejava/KBugReport.h
index cca415e4..4247ddef 100644
--- a/kdejava/koala/kdejava/KBugReport.h
+++ b/kdejava/koala/kdejava/KBugReport.h
@@ -12,7 +12,7 @@ extern "C"
 
 extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KBugReport_metaObject (JNIEnv *env, jobject);
 extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KBugReport_className (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KBugReport_newKBugReport__Lorg_kde_qt_QWidget_2ZLorg_kde_koala_KAboutData_2 (JNIEnv *env, jobject, jobject, jboolean, jobject);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_KBugReport_newKBugReport__Lorg_kde_qt_QWidget_2ZLorg_kde_koala_TDEAboutData_2 (JNIEnv *env, jobject, jobject, jboolean, jobject);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KBugReport_newKBugReport__Lorg_kde_qt_QWidget_2Z (JNIEnv *env, jobject, jobject, jboolean);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KBugReport_newKBugReport__Lorg_kde_qt_QWidget_2 (JNIEnv *env, jobject, jobject);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KBugReport_newKBugReport__ (JNIEnv *env, jobject);
diff --git a/kdejava/koala/kdejava/KCModule.cpp b/kdejava/koala/kdejava/KCModule.cpp
index cd162352..0813089a 100644
--- a/kdejava/koala/kdejava/KCModule.cpp
+++ b/kdejava/koala/kdejava/KCModule.cpp
@@ -14,9 +14,9 @@ public:
 	KCModuleJBridge(TQWidget* arg1,const char* arg2) : KCModule(arg1,arg2) {};
 	KCModuleJBridge(TQWidget* arg1) : KCModule(arg1) {};
 	KCModuleJBridge() : KCModule() {};
-	KCModuleJBridge(KInstance* arg1,TQWidget* arg2,const TQStringList& arg3) : KCModule(arg1,arg2,arg3) {};
-	KCModuleJBridge(KInstance* arg1,TQWidget* arg2) : KCModule(arg1,arg2) {};
-	KCModuleJBridge(KInstance* arg1) : KCModule(arg1) {};
+	KCModuleJBridge(TDEInstance* arg1,TQWidget* arg2,const TQStringList& arg3) : KCModule(arg1,arg2,arg3) {};
+	KCModuleJBridge(TDEInstance* arg1,TQWidget* arg2) : KCModule(arg1,arg2) {};
+	KCModuleJBridge(TDEInstance* arg1) : KCModule(arg1) {};
 	void public_load() {
 		KCModule::load();
 		return;
@@ -440,7 +440,7 @@ public:
 JNIEXPORT jobject JNICALL
 Java_org_kde_koala_KCModule_aboutData(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)((KCModule*) QtSupport::getQt(env, obj))->aboutData(), "org.kde.koala.KAboutData");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)((KCModule*) QtSupport::getQt(env, obj))->aboutData(), "org.kde.koala.TDEAboutData");
 	return xret;
 }
 
@@ -493,7 +493,7 @@ Java_org_kde_koala_KCModule_finalize(JNIEnv* env, jobject obj)
 JNIEXPORT jobject JNICALL
 Java_org_kde_koala_KCModule_instance(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)((KCModule*) QtSupport::getQt(env, obj))->instance(), "org.kde.koala.KInstanceInterface");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)((KCModule*) QtSupport::getQt(env, obj))->instance(), "org.kde.koala.TDEInstanceInterface");
 	return xret;
 }
 
@@ -535,31 +535,31 @@ Java_org_kde_koala_KCModule_newKCModule__(JNIEnv* env, jobject obj)
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KCModule_newKCModule__Lorg_kde_koala_KInstanceInterface_2(JNIEnv* env, jobject obj, jobject instance)
+Java_org_kde_koala_KCModule_newKCModule__Lorg_kde_koala_TDEInstanceInterface_2(JNIEnv* env, jobject obj, jobject instance)
 {
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new KCModuleJBridge((KInstance*) QtSupport::getQt(env, instance)));
+		QtSupport::setQt(env, obj, new KCModuleJBridge((TDEInstance*) QtSupport::getQt(env, instance)));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KCModule_newKCModule__Lorg_kde_koala_KInstanceInterface_2Lorg_kde_qt_QWidget_2(JNIEnv* env, jobject obj, jobject instance, jobject parent)
+Java_org_kde_koala_KCModule_newKCModule__Lorg_kde_koala_TDEInstanceInterface_2Lorg_kde_qt_QWidget_2(JNIEnv* env, jobject obj, jobject instance, jobject parent)
 {
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new KCModuleJBridge((KInstance*) QtSupport::getQt(env, instance), (TQWidget*) QtSupport::getQt(env, parent)));
+		QtSupport::setQt(env, obj, new KCModuleJBridge((TDEInstance*) QtSupport::getQt(env, instance), (TQWidget*) QtSupport::getQt(env, parent)));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KCModule_newKCModule__Lorg_kde_koala_KInstanceInterface_2Lorg_kde_qt_QWidget_2_3Ljava_lang_String_2(JNIEnv* env, jobject obj, jobject instance, jobject parent, jobjectArray args)
+Java_org_kde_koala_KCModule_newKCModule__Lorg_kde_koala_TDEInstanceInterface_2Lorg_kde_qt_QWidget_2_3Ljava_lang_String_2(JNIEnv* env, jobject obj, jobject instance, jobject parent, jobjectArray args)
 {
 static TQStringList* _qlist_args = 0;
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new KCModuleJBridge((KInstance*) QtSupport::getQt(env, instance), (TQWidget*) QtSupport::getQt(env, parent), (const TQStringList&)*(TQStringList*) QtSupport::toTQStringList(env, args, &_qlist_args)));
+		QtSupport::setQt(env, obj, new KCModuleJBridge((TDEInstance*) QtSupport::getQt(env, instance), (TQWidget*) QtSupport::getQt(env, parent), (const TQStringList&)*(TQStringList*) QtSupport::toTQStringList(env, args, &_qlist_args)));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
@@ -624,7 +624,7 @@ Java_org_kde_koala_KCModule_save(JNIEnv* env, jobject obj)
 JNIEXPORT void JNICALL
 Java_org_kde_koala_KCModule_setAboutData(JNIEnv* env, jobject obj, jobject about)
 {
-	((KCModule*) QtSupport::getQt(env, obj))->setAboutData((KAboutData*) QtSupport::getQt(env, about));
+	((KCModule*) QtSupport::getQt(env, obj))->setAboutData((TDEAboutData*) QtSupport::getQt(env, about));
 	return;
 }
 
diff --git a/kdejava/koala/kdejava/KCModule.h b/kdejava/koala/kdejava/KCModule.h
index 4e30f2e2..00eb2f1f 100644
--- a/kdejava/koala/kdejava/KCModule.h
+++ b/kdejava/koala/kdejava/KCModule.h
@@ -16,9 +16,9 @@ extern JNIEXPORT void JNICALL Java_org_kde_koala_KCModule_newKCModule__Lorg_kde_
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KCModule_newKCModule__Lorg_kde_qt_QWidget_2Ljava_lang_String_2 (JNIEnv *env, jobject, jobject, jstring);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KCModule_newKCModule__Lorg_kde_qt_QWidget_2 (JNIEnv *env, jobject, jobject);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KCModule_newKCModule__ (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KCModule_newKCModule__Lorg_kde_koala_KInstanceInterface_2Lorg_kde_qt_QWidget_2_3Ljava_lang_String_2 (JNIEnv *env, jobject, jobject, jobject, jobjectArray);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KCModule_newKCModule__Lorg_kde_koala_KInstanceInterface_2Lorg_kde_qt_QWidget_2 (JNIEnv *env, jobject, jobject, jobject);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KCModule_newKCModule__Lorg_kde_koala_KInstanceInterface_2 (JNIEnv *env, jobject, jobject);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_KCModule_newKCModule__Lorg_kde_koala_TDEInstanceInterface_2Lorg_kde_qt_QWidget_2_3Ljava_lang_String_2 (JNIEnv *env, jobject, jobject, jobject, jobjectArray);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_KCModule_newKCModule__Lorg_kde_koala_TDEInstanceInterface_2Lorg_kde_qt_QWidget_2 (JNIEnv *env, jobject, jobject, jobject);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_KCModule_newKCModule__Lorg_kde_koala_TDEInstanceInterface_2 (JNIEnv *env, jobject, jobject);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KCModule_load (JNIEnv *env, jobject);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KCModule_save (JNIEnv *env, jobject);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KCModule_defaults (JNIEnv *env, jobject);
diff --git a/kdejava/koala/kdejava/KDE.cpp b/kdejava/koala/kdejava/KDE.cpp
index 08c15047..68d62183 100644
--- a/kdejava/koala/kdejava/KDE.cpp
+++ b/kdejava/koala/kdejava/KDE.cpp
@@ -54,11 +54,11 @@ static TQString* _qstring_name = 0;
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_koala_KDE_BarIconSet__Ljava_lang_String_2ILorg_kde_koala_KInstanceInterface_2(JNIEnv* env, jclass cls, jstring name, jint size, jobject instance)
+Java_org_kde_koala_KDE_BarIconSet__Ljava_lang_String_2ILorg_kde_koala_TDEInstanceInterface_2(JNIEnv* env, jclass cls, jstring name, jint size, jobject instance)
 {
 	(void) cls;
 static TQString* _qstring_name = 0;
-	jobject xret = QtSupport::objectForQtKey(env, (void*)new TQIconSet(::BarIconSet((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (int) size, (KInstance*) QtSupport::getQt(env, instance))), "org.kde.qt.TQIconSet", TRUE);
+	jobject xret = QtSupport::objectForQtKey(env, (void*)new TQIconSet(::BarIconSet((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (int) size, (TDEInstance*) QtSupport::getQt(env, instance))), "org.kde.qt.TQIconSet", TRUE);
 	return xret;
 }
 
@@ -90,20 +90,20 @@ static TQString* _qstring_name = 0;
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_koala_KDE_BarIcon__Ljava_lang_String_2IILorg_kde_koala_KInstanceInterface_2(JNIEnv* env, jclass cls, jstring name, jint size, jint state, jobject instance)
+Java_org_kde_koala_KDE_BarIcon__Ljava_lang_String_2IILorg_kde_koala_TDEInstanceInterface_2(JNIEnv* env, jclass cls, jstring name, jint size, jint state, jobject instance)
 {
 	(void) cls;
 static TQString* _qstring_name = 0;
-	jobject xret = QtSupport::objectForQtKey(env, (void*)new TQPixmap(::BarIcon((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (int) size, (int) state, (KInstance*) QtSupport::getQt(env, instance))), "org.kde.qt.TQPixmap", TRUE);
+	jobject xret = QtSupport::objectForQtKey(env, (void*)new TQPixmap(::BarIcon((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (int) size, (int) state, (TDEInstance*) QtSupport::getQt(env, instance))), "org.kde.qt.TQPixmap", TRUE);
 	return xret;
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_koala_KDE_BarIcon__Ljava_lang_String_2Lorg_kde_koala_KInstanceInterface_2(JNIEnv* env, jclass cls, jstring name, jobject instance)
+Java_org_kde_koala_KDE_BarIcon__Ljava_lang_String_2Lorg_kde_koala_TDEInstanceInterface_2(JNIEnv* env, jclass cls, jstring name, jobject instance)
 {
 	(void) cls;
 static TQString* _qstring_name = 0;
-	jobject xret = QtSupport::objectForQtKey(env, (void*)new TQPixmap(::BarIcon((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (KInstance*) QtSupport::getQt(env, instance))), "org.kde.qt.TQPixmap", TRUE);
+	jobject xret = QtSupport::objectForQtKey(env, (void*)new TQPixmap(::BarIcon((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (TDEInstance*) QtSupport::getQt(env, instance))), "org.kde.qt.TQPixmap", TRUE);
 	return xret;
 }
 
@@ -126,11 +126,11 @@ static TQString* _qstring_name = 0;
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_koala_KDE_DesktopIconSet__Ljava_lang_String_2ILorg_kde_koala_KInstanceInterface_2(JNIEnv* env, jclass cls, jstring name, jint size, jobject instance)
+Java_org_kde_koala_KDE_DesktopIconSet__Ljava_lang_String_2ILorg_kde_koala_TDEInstanceInterface_2(JNIEnv* env, jclass cls, jstring name, jint size, jobject instance)
 {
 	(void) cls;
 static TQString* _qstring_name = 0;
-	jobject xret = QtSupport::objectForQtKey(env, (void*)new TQIconSet(::DesktopIconSet((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (int) size, (KInstance*) QtSupport::getQt(env, instance))), "org.kde.qt.TQIconSet", TRUE);
+	jobject xret = QtSupport::objectForQtKey(env, (void*)new TQIconSet(::DesktopIconSet((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (int) size, (TDEInstance*) QtSupport::getQt(env, instance))), "org.kde.qt.TQIconSet", TRUE);
 	return xret;
 }
 
@@ -162,20 +162,20 @@ static TQString* _qstring_name = 0;
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_koala_KDE_DesktopIcon__Ljava_lang_String_2IILorg_kde_koala_KInstanceInterface_2(JNIEnv* env, jclass cls, jstring name, jint size, jint state, jobject instance)
+Java_org_kde_koala_KDE_DesktopIcon__Ljava_lang_String_2IILorg_kde_koala_TDEInstanceInterface_2(JNIEnv* env, jclass cls, jstring name, jint size, jint state, jobject instance)
 {
 	(void) cls;
 static TQString* _qstring_name = 0;
-	jobject xret = QtSupport::objectForQtKey(env, (void*)new TQPixmap(::DesktopIcon((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (int) size, (int) state, (KInstance*) QtSupport::getQt(env, instance))), "org.kde.qt.TQPixmap", TRUE);
+	jobject xret = QtSupport::objectForQtKey(env, (void*)new TQPixmap(::DesktopIcon((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (int) size, (int) state, (TDEInstance*) QtSupport::getQt(env, instance))), "org.kde.qt.TQPixmap", TRUE);
 	return xret;
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_koala_KDE_DesktopIcon__Ljava_lang_String_2Lorg_kde_koala_KInstanceInterface_2(JNIEnv* env, jclass cls, jstring name, jobject instance)
+Java_org_kde_koala_KDE_DesktopIcon__Ljava_lang_String_2Lorg_kde_koala_TDEInstanceInterface_2(JNIEnv* env, jclass cls, jstring name, jobject instance)
 {
 	(void) cls;
 static TQString* _qstring_name = 0;
-	jobject xret = QtSupport::objectForQtKey(env, (void*)new TQPixmap(::DesktopIcon((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (KInstance*) QtSupport::getQt(env, instance))), "org.kde.qt.TQPixmap", TRUE);
+	jobject xret = QtSupport::objectForQtKey(env, (void*)new TQPixmap(::DesktopIcon((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (TDEInstance*) QtSupport::getQt(env, instance))), "org.kde.qt.TQPixmap", TRUE);
 	return xret;
 }
 
@@ -189,10 +189,10 @@ Java_org_kde_koala_KDE_IconSize__I(JNIEnv* env, jclass cls, jint group)
 }
 
 JNIEXPORT jint JNICALL
-Java_org_kde_koala_KDE_IconSize__ILorg_kde_koala_KInstanceInterface_2(JNIEnv* env, jclass cls, jint group, jobject instance)
+Java_org_kde_koala_KDE_IconSize__ILorg_kde_koala_TDEInstanceInterface_2(JNIEnv* env, jclass cls, jint group, jobject instance)
 {
 	(void) cls;
-	jint xret = (jint) ::IconSize((KIcon::Group) group, (KInstance*) QtSupport::getQt(env, instance));
+	jint xret = (jint) ::IconSize((KIcon::Group) group, (TDEInstance*) QtSupport::getQt(env, instance));
 	return xret;
 }
 
@@ -215,11 +215,11 @@ static TQString* _qstring_name = 0;
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_koala_KDE_MainBarIconSet__Ljava_lang_String_2ILorg_kde_koala_KInstanceInterface_2(JNIEnv* env, jclass cls, jstring name, jint size, jobject instance)
+Java_org_kde_koala_KDE_MainBarIconSet__Ljava_lang_String_2ILorg_kde_koala_TDEInstanceInterface_2(JNIEnv* env, jclass cls, jstring name, jint size, jobject instance)
 {
 	(void) cls;
 static TQString* _qstring_name = 0;
-	jobject xret = QtSupport::objectForQtKey(env, (void*)new TQIconSet(::MainBarIconSet((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (int) size, (KInstance*) QtSupport::getQt(env, instance))), "org.kde.qt.TQIconSet", TRUE);
+	jobject xret = QtSupport::objectForQtKey(env, (void*)new TQIconSet(::MainBarIconSet((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (int) size, (TDEInstance*) QtSupport::getQt(env, instance))), "org.kde.qt.TQIconSet", TRUE);
 	return xret;
 }
 
@@ -251,20 +251,20 @@ static TQString* _qstring_name = 0;
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_koala_KDE_MainBarIcon__Ljava_lang_String_2IILorg_kde_koala_KInstanceInterface_2(JNIEnv* env, jclass cls, jstring name, jint size, jint state, jobject instance)
+Java_org_kde_koala_KDE_MainBarIcon__Ljava_lang_String_2IILorg_kde_koala_TDEInstanceInterface_2(JNIEnv* env, jclass cls, jstring name, jint size, jint state, jobject instance)
 {
 	(void) cls;
 static TQString* _qstring_name = 0;
-	jobject xret = QtSupport::objectForQtKey(env, (void*)new TQPixmap(::MainBarIcon((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (int) size, (int) state, (KInstance*) QtSupport::getQt(env, instance))), "org.kde.qt.TQPixmap", TRUE);
+	jobject xret = QtSupport::objectForQtKey(env, (void*)new TQPixmap(::MainBarIcon((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (int) size, (int) state, (TDEInstance*) QtSupport::getQt(env, instance))), "org.kde.qt.TQPixmap", TRUE);
 	return xret;
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_koala_KDE_MainBarIcon__Ljava_lang_String_2Lorg_kde_koala_KInstanceInterface_2(JNIEnv* env, jclass cls, jstring name, jobject instance)
+Java_org_kde_koala_KDE_MainBarIcon__Ljava_lang_String_2Lorg_kde_koala_TDEInstanceInterface_2(JNIEnv* env, jclass cls, jstring name, jobject instance)
 {
 	(void) cls;
 static TQString* _qstring_name = 0;
-	jobject xret = QtSupport::objectForQtKey(env, (void*)new TQPixmap(::MainBarIcon((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (KInstance*) QtSupport::getQt(env, instance))), "org.kde.qt.TQPixmap", TRUE);
+	jobject xret = QtSupport::objectForQtKey(env, (void*)new TQPixmap(::MainBarIcon((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (TDEInstance*) QtSupport::getQt(env, instance))), "org.kde.qt.TQPixmap", TRUE);
 	return xret;
 }
 
@@ -287,11 +287,11 @@ static TQString* _qstring_name = 0;
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_koala_KDE_SmallIconSet__Ljava_lang_String_2ILorg_kde_koala_KInstanceInterface_2(JNIEnv* env, jclass cls, jstring name, jint size, jobject instance)
+Java_org_kde_koala_KDE_SmallIconSet__Ljava_lang_String_2ILorg_kde_koala_TDEInstanceInterface_2(JNIEnv* env, jclass cls, jstring name, jint size, jobject instance)
 {
 	(void) cls;
 static TQString* _qstring_name = 0;
-	jobject xret = QtSupport::objectForQtKey(env, (void*)new TQIconSet(::SmallIconSet((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (int) size, (KInstance*) QtSupport::getQt(env, instance))), "org.kde.qt.TQIconSet", TRUE);
+	jobject xret = QtSupport::objectForQtKey(env, (void*)new TQIconSet(::SmallIconSet((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (int) size, (TDEInstance*) QtSupport::getQt(env, instance))), "org.kde.qt.TQIconSet", TRUE);
 	return xret;
 }
 
@@ -323,20 +323,20 @@ static TQString* _qstring_name = 0;
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_koala_KDE_SmallIcon__Ljava_lang_String_2IILorg_kde_koala_KInstanceInterface_2(JNIEnv* env, jclass cls, jstring name, jint size, jint state, jobject instance)
+Java_org_kde_koala_KDE_SmallIcon__Ljava_lang_String_2IILorg_kde_koala_TDEInstanceInterface_2(JNIEnv* env, jclass cls, jstring name, jint size, jint state, jobject instance)
 {
 	(void) cls;
 static TQString* _qstring_name = 0;
-	jobject xret = QtSupport::objectForQtKey(env, (void*)new TQPixmap(::SmallIcon((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (int) size, (int) state, (KInstance*) QtSupport::getQt(env, instance))), "org.kde.qt.TQPixmap", TRUE);
+	jobject xret = QtSupport::objectForQtKey(env, (void*)new TQPixmap(::SmallIcon((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (int) size, (int) state, (TDEInstance*) QtSupport::getQt(env, instance))), "org.kde.qt.TQPixmap", TRUE);
 	return xret;
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_koala_KDE_SmallIcon__Ljava_lang_String_2Lorg_kde_koala_KInstanceInterface_2(JNIEnv* env, jclass cls, jstring name, jobject instance)
+Java_org_kde_koala_KDE_SmallIcon__Ljava_lang_String_2Lorg_kde_koala_TDEInstanceInterface_2(JNIEnv* env, jclass cls, jstring name, jobject instance)
 {
 	(void) cls;
 static TQString* _qstring_name = 0;
-	jobject xret = QtSupport::objectForQtKey(env, (void*)new TQPixmap(::SmallIcon((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (KInstance*) QtSupport::getQt(env, instance))), "org.kde.qt.TQPixmap", TRUE);
+	jobject xret = QtSupport::objectForQtKey(env, (void*)new TQPixmap(::SmallIcon((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (TDEInstance*) QtSupport::getQt(env, instance))), "org.kde.qt.TQPixmap", TRUE);
 	return xret;
 }
 
@@ -350,11 +350,11 @@ static TQString* _qstring_name = 0;
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_koala_KDE_UserIconSet__Ljava_lang_String_2Lorg_kde_koala_KInstanceInterface_2(JNIEnv* env, jclass cls, jstring name, jobject instance)
+Java_org_kde_koala_KDE_UserIconSet__Ljava_lang_String_2Lorg_kde_koala_TDEInstanceInterface_2(JNIEnv* env, jclass cls, jstring name, jobject instance)
 {
 	(void) cls;
 static TQString* _qstring_name = 0;
-	jobject xret = QtSupport::objectForQtKey(env, (void*)new TQIconSet(::UserIconSet((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (KInstance*) QtSupport::getQt(env, instance))), "org.kde.qt.TQIconSet", TRUE);
+	jobject xret = QtSupport::objectForQtKey(env, (void*)new TQIconSet(::UserIconSet((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (TDEInstance*) QtSupport::getQt(env, instance))), "org.kde.qt.TQIconSet", TRUE);
 	return xret;
 }
 
@@ -377,20 +377,20 @@ static TQString* _qstring_name = 0;
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_koala_KDE_UserIcon__Ljava_lang_String_2ILorg_kde_koala_KInstanceInterface_2(JNIEnv* env, jclass cls, jstring name, jint state, jobject instance)
+Java_org_kde_koala_KDE_UserIcon__Ljava_lang_String_2ILorg_kde_koala_TDEInstanceInterface_2(JNIEnv* env, jclass cls, jstring name, jint state, jobject instance)
 {
 	(void) cls;
 static TQString* _qstring_name = 0;
-	jobject xret = QtSupport::objectForQtKey(env, (void*)new TQPixmap(::UserIcon((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (int) state, (KInstance*) QtSupport::getQt(env, instance))), "org.kde.qt.TQPixmap", TRUE);
+	jobject xret = QtSupport::objectForQtKey(env, (void*)new TQPixmap(::UserIcon((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (int) state, (TDEInstance*) QtSupport::getQt(env, instance))), "org.kde.qt.TQPixmap", TRUE);
 	return xret;
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_koala_KDE_UserIcon__Ljava_lang_String_2Lorg_kde_koala_KInstanceInterface_2(JNIEnv* env, jclass cls, jstring name, jobject instance)
+Java_org_kde_koala_KDE_UserIcon__Ljava_lang_String_2Lorg_kde_koala_TDEInstanceInterface_2(JNIEnv* env, jclass cls, jstring name, jobject instance)
 {
 	(void) cls;
 static TQString* _qstring_name = 0;
-	jobject xret = QtSupport::objectForQtKey(env, (void*)new TQPixmap(::UserIcon((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (KInstance*) QtSupport::getQt(env, instance))), "org.kde.qt.TQPixmap", TRUE);
+	jobject xret = QtSupport::objectForQtKey(env, (void*)new TQPixmap(::UserIcon((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (TDEInstance*) QtSupport::getQt(env, instance))), "org.kde.qt.TQPixmap", TRUE);
 	return xret;
 }
 
@@ -750,13 +750,13 @@ static TQString* _qstring_filename = 0;
 }
 
 JNIEXPORT jstring JNICALL
-Java_org_kde_koala_KDE_locateLocal__Ljava_lang_String_2Ljava_lang_String_2Lorg_kde_koala_KInstanceInterface_2(JNIEnv* env, jclass cls, jstring type, jstring filename, jobject instance)
+Java_org_kde_koala_KDE_locateLocal__Ljava_lang_String_2Ljava_lang_String_2Lorg_kde_koala_TDEInstanceInterface_2(JNIEnv* env, jclass cls, jstring type, jstring filename, jobject instance)
 {
 	TQString  _qstring;
 	(void) cls;
 static TQCString* _qstring_type = 0;
 static TQString* _qstring_filename = 0;
-	_qstring = ::locateLocal((const char*) QtSupport::toCharString(env, type, &_qstring_type), (const TQString&)*(TQString*) QtSupport::toTQString(env, filename, &_qstring_filename), (const KInstance*) QtSupport::getQt(env, instance));
+	_qstring = ::locateLocal((const char*) QtSupport::toCharString(env, type, &_qstring_type), (const TQString&)*(TQString*) QtSupport::toTQString(env, filename, &_qstring_filename), (const TDEInstance*) QtSupport::getQt(env, instance));
 	return QtSupport::fromTQString(env, &_qstring);
 }
 
@@ -772,13 +772,13 @@ static TQString* _qstring_filename = 0;
 }
 
 JNIEXPORT jstring JNICALL
-Java_org_kde_koala_KDE_locateLocal__Ljava_lang_String_2Ljava_lang_String_2ZLorg_kde_koala_KInstanceInterface_2(JNIEnv* env, jclass cls, jstring type, jstring filename, jboolean createDir, jobject instance)
+Java_org_kde_koala_KDE_locateLocal__Ljava_lang_String_2Ljava_lang_String_2ZLorg_kde_koala_TDEInstanceInterface_2(JNIEnv* env, jclass cls, jstring type, jstring filename, jboolean createDir, jobject instance)
 {
 	TQString  _qstring;
 	(void) cls;
 static TQCString* _qstring_type = 0;
 static TQString* _qstring_filename = 0;
-	_qstring = ::locateLocal((const char*) QtSupport::toCharString(env, type, &_qstring_type), (const TQString&)*(TQString*) QtSupport::toTQString(env, filename, &_qstring_filename), (bool) createDir, (const KInstance*) QtSupport::getQt(env, instance));
+	_qstring = ::locateLocal((const char*) QtSupport::toCharString(env, type, &_qstring_type), (const TQString&)*(TQString*) QtSupport::toTQString(env, filename, &_qstring_filename), (bool) createDir, (const TDEInstance*) QtSupport::getQt(env, instance));
 	return QtSupport::fromTQString(env, &_qstring);
 }
 
@@ -794,13 +794,13 @@ static TQString* _qstring_filename = 0;
 }
 
 JNIEXPORT jstring JNICALL
-Java_org_kde_koala_KDE_locate__Ljava_lang_String_2Ljava_lang_String_2Lorg_kde_koala_KInstanceInterface_2(JNIEnv* env, jclass cls, jstring type, jstring filename, jobject instance)
+Java_org_kde_koala_KDE_locate__Ljava_lang_String_2Ljava_lang_String_2Lorg_kde_koala_TDEInstanceInterface_2(JNIEnv* env, jclass cls, jstring type, jstring filename, jobject instance)
 {
 	TQString  _qstring;
 	(void) cls;
 static TQCString* _qstring_type = 0;
 static TQString* _qstring_filename = 0;
-	_qstring = ::locate((const char*) QtSupport::toCharString(env, type, &_qstring_type), (const TQString&)*(TQString*) QtSupport::toTQString(env, filename, &_qstring_filename), (const KInstance*) QtSupport::getQt(env, instance));
+	_qstring = ::locate((const char*) QtSupport::toCharString(env, type, &_qstring_type), (const TQString&)*(TQString*) QtSupport::toTQString(env, filename, &_qstring_filename), (const TDEInstance*) QtSupport::getQt(env, instance));
 	return QtSupport::fromTQString(env, &_qstring);
 }
 
diff --git a/kdejava/koala/kdejava/KDE.h b/kdejava/koala/kdejava/KDE.h
index ea7bb616..88709b7f 100644
--- a/kdejava/koala/kdejava/KDE.h
+++ b/kdejava/koala/kdejava/KDE.h
@@ -39,51 +39,51 @@ extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_op_1read__Lorg_kde_qt_QD
 extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_op_1write__Lorg_kde_qt_QDataStream_2Z (JNIEnv *env, jclass, jobject, jboolean);
 extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_op_1read__Lorg_kde_qt_QDataStream_2Z (JNIEnv *env, jclass, jobject, jboolean);
 extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_op_1write__Lorg_kde_qt_QDataStream_2J (JNIEnv *env, jclass, jobject, jlong);
-extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_DesktopIcon__Ljava_lang_String_2IILorg_kde_koala_KInstanceInterface_2 (JNIEnv *env, jclass, jstring, jint, jint, jobject);
+extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_DesktopIcon__Ljava_lang_String_2IILorg_kde_koala_TDEInstanceInterface_2 (JNIEnv *env, jclass, jstring, jint, jint, jobject);
 extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_DesktopIcon__Ljava_lang_String_2II (JNIEnv *env, jclass, jstring, jint, jint);
 extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_DesktopIcon__Ljava_lang_String_2I (JNIEnv *env, jclass, jstring, jint);
 extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_DesktopIcon__Ljava_lang_String_2 (JNIEnv *env, jclass, jstring);
-extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_DesktopIcon__Ljava_lang_String_2Lorg_kde_koala_KInstanceInterface_2 (JNIEnv *env, jclass, jstring, jobject);
-extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_DesktopIconSet__Ljava_lang_String_2ILorg_kde_koala_KInstanceInterface_2 (JNIEnv *env, jclass, jstring, jint, jobject);
+extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_DesktopIcon__Ljava_lang_String_2Lorg_kde_koala_TDEInstanceInterface_2 (JNIEnv *env, jclass, jstring, jobject);
+extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_DesktopIconSet__Ljava_lang_String_2ILorg_kde_koala_TDEInstanceInterface_2 (JNIEnv *env, jclass, jstring, jint, jobject);
 extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_DesktopIconSet__Ljava_lang_String_2I (JNIEnv *env, jclass, jstring, jint);
 extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_DesktopIconSet__Ljava_lang_String_2 (JNIEnv *env, jclass, jstring);
-extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_BarIcon__Ljava_lang_String_2IILorg_kde_koala_KInstanceInterface_2 (JNIEnv *env, jclass, jstring, jint, jint, jobject);
+extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_BarIcon__Ljava_lang_String_2IILorg_kde_koala_TDEInstanceInterface_2 (JNIEnv *env, jclass, jstring, jint, jint, jobject);
 extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_BarIcon__Ljava_lang_String_2II (JNIEnv *env, jclass, jstring, jint, jint);
 extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_BarIcon__Ljava_lang_String_2I (JNIEnv *env, jclass, jstring, jint);
 extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_BarIcon__Ljava_lang_String_2 (JNIEnv *env, jclass, jstring);
-extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_BarIcon__Ljava_lang_String_2Lorg_kde_koala_KInstanceInterface_2 (JNIEnv *env, jclass, jstring, jobject);
-extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_BarIconSet__Ljava_lang_String_2ILorg_kde_koala_KInstanceInterface_2 (JNIEnv *env, jclass, jstring, jint, jobject);
+extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_BarIcon__Ljava_lang_String_2Lorg_kde_koala_TDEInstanceInterface_2 (JNIEnv *env, jclass, jstring, jobject);
+extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_BarIconSet__Ljava_lang_String_2ILorg_kde_koala_TDEInstanceInterface_2 (JNIEnv *env, jclass, jstring, jint, jobject);
 extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_BarIconSet__Ljava_lang_String_2I (JNIEnv *env, jclass, jstring, jint);
 extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_BarIconSet__Ljava_lang_String_2 (JNIEnv *env, jclass, jstring);
-extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_SmallIcon__Ljava_lang_String_2IILorg_kde_koala_KInstanceInterface_2 (JNIEnv *env, jclass, jstring, jint, jint, jobject);
+extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_SmallIcon__Ljava_lang_String_2IILorg_kde_koala_TDEInstanceInterface_2 (JNIEnv *env, jclass, jstring, jint, jint, jobject);
 extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_SmallIcon__Ljava_lang_String_2II (JNIEnv *env, jclass, jstring, jint, jint);
 extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_SmallIcon__Ljava_lang_String_2I (JNIEnv *env, jclass, jstring, jint);
 extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_SmallIcon__Ljava_lang_String_2 (JNIEnv *env, jclass, jstring);
-extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_SmallIcon__Ljava_lang_String_2Lorg_kde_koala_KInstanceInterface_2 (JNIEnv *env, jclass, jstring, jobject);
-extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_SmallIconSet__Ljava_lang_String_2ILorg_kde_koala_KInstanceInterface_2 (JNIEnv *env, jclass, jstring, jint, jobject);
+extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_SmallIcon__Ljava_lang_String_2Lorg_kde_koala_TDEInstanceInterface_2 (JNIEnv *env, jclass, jstring, jobject);
+extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_SmallIconSet__Ljava_lang_String_2ILorg_kde_koala_TDEInstanceInterface_2 (JNIEnv *env, jclass, jstring, jint, jobject);
 extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_SmallIconSet__Ljava_lang_String_2I (JNIEnv *env, jclass, jstring, jint);
 extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_SmallIconSet__Ljava_lang_String_2 (JNIEnv *env, jclass, jstring);
-extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_MainBarIcon__Ljava_lang_String_2IILorg_kde_koala_KInstanceInterface_2 (JNIEnv *env, jclass, jstring, jint, jint, jobject);
+extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_MainBarIcon__Ljava_lang_String_2IILorg_kde_koala_TDEInstanceInterface_2 (JNIEnv *env, jclass, jstring, jint, jint, jobject);
 extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_MainBarIcon__Ljava_lang_String_2II (JNIEnv *env, jclass, jstring, jint, jint);
 extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_MainBarIcon__Ljava_lang_String_2I (JNIEnv *env, jclass, jstring, jint);
 extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_MainBarIcon__Ljava_lang_String_2 (JNIEnv *env, jclass, jstring);
-extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_MainBarIcon__Ljava_lang_String_2Lorg_kde_koala_KInstanceInterface_2 (JNIEnv *env, jclass, jstring, jobject);
-extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_MainBarIconSet__Ljava_lang_String_2ILorg_kde_koala_KInstanceInterface_2 (JNIEnv *env, jclass, jstring, jint, jobject);
+extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_MainBarIcon__Ljava_lang_String_2Lorg_kde_koala_TDEInstanceInterface_2 (JNIEnv *env, jclass, jstring, jobject);
+extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_MainBarIconSet__Ljava_lang_String_2ILorg_kde_koala_TDEInstanceInterface_2 (JNIEnv *env, jclass, jstring, jint, jobject);
 extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_MainBarIconSet__Ljava_lang_String_2I (JNIEnv *env, jclass, jstring, jint);
 extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_MainBarIconSet__Ljava_lang_String_2 (JNIEnv *env, jclass, jstring);
-extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_UserIcon__Ljava_lang_String_2ILorg_kde_koala_KInstanceInterface_2 (JNIEnv *env, jclass, jstring, jint, jobject);
+extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_UserIcon__Ljava_lang_String_2ILorg_kde_koala_TDEInstanceInterface_2 (JNIEnv *env, jclass, jstring, jint, jobject);
 extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_UserIcon__Ljava_lang_String_2I (JNIEnv *env, jclass, jstring, jint);
 extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_UserIcon__Ljava_lang_String_2 (JNIEnv *env, jclass, jstring);
-extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_UserIcon__Ljava_lang_String_2Lorg_kde_koala_KInstanceInterface_2 (JNIEnv *env, jclass, jstring, jobject);
-extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_UserIconSet__Ljava_lang_String_2Lorg_kde_koala_KInstanceInterface_2 (JNIEnv *env, jclass, jstring, jobject);
+extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_UserIcon__Ljava_lang_String_2Lorg_kde_koala_TDEInstanceInterface_2 (JNIEnv *env, jclass, jstring, jobject);
+extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_UserIconSet__Ljava_lang_String_2Lorg_kde_koala_TDEInstanceInterface_2 (JNIEnv *env, jclass, jstring, jobject);
 extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KDE_UserIconSet__Ljava_lang_String_2 (JNIEnv *env, jclass, jstring);
-extern JNIEXPORT jint JNICALL Java_org_kde_koala_KDE_IconSize__ILorg_kde_koala_KInstanceInterface_2 (JNIEnv *env, jclass, jint, jobject);
+extern JNIEXPORT jint JNICALL Java_org_kde_koala_KDE_IconSize__ILorg_kde_koala_TDEInstanceInterface_2 (JNIEnv *env, jclass, jint, jobject);
 extern JNIEXPORT jint JNICALL Java_org_kde_koala_KDE_IconSize__I (JNIEnv *env, jclass, jint);
-extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KDE_locate__Ljava_lang_String_2Ljava_lang_String_2Lorg_kde_koala_KInstanceInterface_2 (JNIEnv *env, jclass, jstring, jstring, jobject);
+extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KDE_locate__Ljava_lang_String_2Ljava_lang_String_2Lorg_kde_koala_TDEInstanceInterface_2 (JNIEnv *env, jclass, jstring, jstring, jobject);
 extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KDE_locate__Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jclass, jstring, jstring);
-extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KDE_locateLocal__Ljava_lang_String_2Ljava_lang_String_2Lorg_kde_koala_KInstanceInterface_2 (JNIEnv *env, jclass, jstring, jstring, jobject);
+extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KDE_locateLocal__Ljava_lang_String_2Ljava_lang_String_2Lorg_kde_koala_TDEInstanceInterface_2 (JNIEnv *env, jclass, jstring, jstring, jobject);
 extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KDE_locateLocal__Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jclass, jstring, jstring);
-extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KDE_locateLocal__Ljava_lang_String_2Ljava_lang_String_2ZLorg_kde_koala_KInstanceInterface_2 (JNIEnv *env, jclass, jstring, jstring, jboolean, jobject);
+extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KDE_locateLocal__Ljava_lang_String_2Ljava_lang_String_2ZLorg_kde_koala_TDEInstanceInterface_2 (JNIEnv *env, jclass, jstring, jstring, jboolean, jobject);
 extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KDE_locateLocal__Ljava_lang_String_2Ljava_lang_String_2Z (JNIEnv *env, jclass, jstring, jstring, jboolean);
 extern JNIEXPORT jint JNICALL Java_org_kde_koala_KDE_op_1incr__I (JNIEnv *env, jclass, jint);
 extern JNIEXPORT jint JNICALL Java_org_kde_koala_KDE_op_1incr__II (JNIEnv *env, jclass, jint, jint);
diff --git a/kdejava/koala/kdejava/KDataTool.cpp b/kdejava/koala/kdejava/KDataTool.cpp
index 3d7c814a..a8377bfb 100644
--- a/kdejava/koala/kdejava/KDataTool.cpp
+++ b/kdejava/koala/kdejava/KDataTool.cpp
@@ -17,7 +17,7 @@ Java_org_kde_koala_KDataTool_className(JNIEnv* env, jobject obj)
 JNIEXPORT jobject JNICALL
 Java_org_kde_koala_KDataTool_instance(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)((KDataTool*) QtSupport::getQt(env, obj))->instance(), "org.kde.koala.KInstanceInterface");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)((KDataTool*) QtSupport::getQt(env, obj))->instance(), "org.kde.koala.TDEInstanceInterface");
 	return xret;
 }
 
@@ -31,7 +31,7 @@ Java_org_kde_koala_KDataTool_metaObject(JNIEnv* env, jobject obj)
 JNIEXPORT void JNICALL
 Java_org_kde_koala_KDataTool_setInstance(JNIEnv* env, jobject obj, jobject instance)
 {
-	((KDataTool*) QtSupport::getQt(env, obj))->setInstance((KInstance*) QtSupport::getQt(env, instance));
+	((KDataTool*) QtSupport::getQt(env, obj))->setInstance((TDEInstance*) QtSupport::getQt(env, instance));
 	return;
 }
 
diff --git a/kdejava/koala/kdejava/KDataToolInfo.cpp b/kdejava/koala/kdejava/KDataToolInfo.cpp
index 7c54ef93..1768a261 100644
--- a/kdejava/koala/kdejava/KDataToolInfo.cpp
+++ b/kdejava/koala/kdejava/KDataToolInfo.cpp
@@ -82,7 +82,7 @@ Java_org_kde_koala_KDataToolInfo_iconName(JNIEnv* env, jobject obj)
 JNIEXPORT jobject JNICALL
 Java_org_kde_koala_KDataToolInfo_instance(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)((KDataToolInfo*) QtSupport::getQt(env, obj))->instance(), "org.kde.koala.KInstanceInterface");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)((KDataToolInfo*) QtSupport::getQt(env, obj))->instance(), "org.kde.koala.TDEInstanceInterface");
 	return xret;
 }
 
diff --git a/kdejava/koala/kdejava/KDockMainWindow.cpp b/kdejava/koala/kdejava/KDockMainWindow.cpp
index 1494a993..7f7507a4 100644
--- a/kdejava/koala/kdejava/KDockMainWindow.cpp
+++ b/kdejava/koala/kdejava/KDockMainWindow.cpp
@@ -423,8 +423,8 @@ public:
 		}
 		return;
 	}
-	void setInstance(KInstance* arg1) {
-		if (!QtSupport::eventDelegate(this,"setInstance",(void*)arg1,"org.kde.koala.KInstanceInterface")) {
+	void setInstance(TDEInstance* arg1) {
+		if (!QtSupport::eventDelegate(this,"setInstance",(void*)arg1,"org.kde.koala.TDEInstanceInterface")) {
 			KXMLGUIClient::setInstance(arg1);
 		}
 		return;
diff --git a/kdejava/koala/kdejava/KEditToolbarWidget.cpp b/kdejava/koala/kdejava/KEditToolbarWidget.cpp
index e2050435..90ccbda4 100644
--- a/kdejava/koala/kdejava/KEditToolbarWidget.cpp
+++ b/kdejava/koala/kdejava/KEditToolbarWidget.cpp
@@ -89,7 +89,7 @@ public:
 		return;
 	}
 	~KEditToolbarWidgetJBridge() {QtSupport::qtKeyDeleted(this);}
-	void protected_setInstance(KInstance* arg1) {
+	void protected_setInstance(TDEInstance* arg1) {
 		KXMLGUIClient::setInstance(arg1);
 		return;
 	}
@@ -483,8 +483,8 @@ public:
 		}
 		return;
 	}
-	void setInstance(KInstance* arg1) {
-		if (!QtSupport::eventDelegate(this,"setInstance",(void*)arg1,"org.kde.koala.KInstanceInterface")) {
+	void setInstance(TDEInstance* arg1) {
+		if (!QtSupport::eventDelegate(this,"setInstance",(void*)arg1,"org.kde.koala.TDEInstanceInterface")) {
 			KXMLGUIClient::setInstance(arg1);
 		}
 		return;
@@ -641,7 +641,7 @@ Java_org_kde_koala_KEditToolbarWidget_insertChildClient(JNIEnv* env, jobject obj
 JNIEXPORT jobject JNICALL
 Java_org_kde_koala_KEditToolbarWidget_instance(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)((KXMLGUIClient*)(KEditToolbarWidget*) QtSupport::getQt(env, obj))->instance(), "org.kde.koala.KInstanceInterface");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)((KXMLGUIClient*)(KEditToolbarWidget*) QtSupport::getQt(env, obj))->instance(), "org.kde.koala.TDEInstanceInterface");
 	return xret;
 }
 
@@ -893,7 +893,7 @@ Java_org_kde_koala_KEditToolbarWidget_setFactory(JNIEnv* env, jobject obj, jobje
 JNIEXPORT void JNICALL
 Java_org_kde_koala_KEditToolbarWidget_setInstance(JNIEnv* env, jobject obj, jobject instance)
 {
-	((KEditToolbarWidgetJBridge*) QtSupport::getQt(env, obj))->protected_setInstance((KInstance*) QtSupport::getQt(env, instance));
+	((KEditToolbarWidgetJBridge*) QtSupport::getQt(env, obj))->protected_setInstance((TDEInstance*) QtSupport::getQt(env, instance));
 	return;
 }
 
diff --git a/kdejava/koala/kdejava/KGlobal.cpp b/kdejava/koala/kdejava/KGlobal.cpp
index 0a81bf2e..136d488a 100644
--- a/kdejava/koala/kdejava/KGlobal.cpp
+++ b/kdejava/koala/kdejava/KGlobal.cpp
@@ -17,7 +17,7 @@ JNIEXPORT jobject JNICALL
 Java_org_kde_koala_KGlobal_activeInstance(JNIEnv* env, jclass cls)
 {
 	(void) cls;
-	jobject xret = QtSupport::objectForQtKey(env, (void*)KGlobalJBridge::activeInstance(), "org.kde.koala.KInstanceInterface");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)KGlobalJBridge::activeInstance(), "org.kde.koala.TDEInstanceInterface");
 	return xret;
 }
 
@@ -83,7 +83,7 @@ JNIEXPORT jobject JNICALL
 Java_org_kde_koala_KGlobal_instance(JNIEnv* env, jclass cls)
 {
 	(void) cls;
-	jobject xret = QtSupport::objectForQtKey(env, (void*)KGlobalJBridge::instance(), "org.kde.koala.KInstanceInterface");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)KGlobalJBridge::instance(), "org.kde.koala.TDEInstanceInterface");
 	return xret;
 }
 
@@ -123,7 +123,7 @@ JNIEXPORT void JNICALL
 Java_org_kde_koala_KGlobal_setActiveInstance(JNIEnv* env, jclass cls, jobject d)
 {
 	(void) cls;
-	KGlobalJBridge::setActiveInstance((KInstance*) QtSupport::getQt(env, d));
+	KGlobalJBridge::setActiveInstance((TDEInstance*) QtSupport::getQt(env, d));
 	return;
 }
 
diff --git a/kdejava/koala/kdejava/KGuiItem.cpp b/kdejava/koala/kdejava/KGuiItem.cpp
index 6b3181fe..1c08c854 100644
--- a/kdejava/koala/kdejava/KGuiItem.cpp
+++ b/kdejava/koala/kdejava/KGuiItem.cpp
@@ -84,9 +84,9 @@ Java_org_kde_koala_KGuiItem_iconSet__II(JNIEnv* env, jobject obj, jint arg1, jin
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_koala_KGuiItem_iconSet__IILorg_kde_koala_KInstanceInterface_2(JNIEnv* env, jobject obj, jint arg1, jint size, jobject instance)
+Java_org_kde_koala_KGuiItem_iconSet__IILorg_kde_koala_TDEInstanceInterface_2(JNIEnv* env, jobject obj, jint arg1, jint size, jobject instance)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)new TQIconSet(((KGuiItem*) QtSupport::getQt(env, obj))->iconSet((KIcon::Group) arg1, (int) size, (KInstance*) QtSupport::getQt(env, instance))), "org.kde.qt.TQIconSet", TRUE);
+	jobject xret = QtSupport::objectForQtKey(env, (void*)new TQIconSet(((KGuiItem*) QtSupport::getQt(env, obj))->iconSet((KIcon::Group) arg1, (int) size, (TDEInstance*) QtSupport::getQt(env, instance))), "org.kde.qt.TQIconSet", TRUE);
 	return xret;
 }
 
diff --git a/kdejava/koala/kdejava/KGuiItem.h b/kdejava/koala/kdejava/KGuiItem.h
index 982c224a..94efd8d0 100644
--- a/kdejava/koala/kdejava/KGuiItem.h
+++ b/kdejava/koala/kdejava/KGuiItem.h
@@ -21,7 +21,7 @@ extern JNIEXPORT void JNICALL Java_org_kde_koala_KGuiItem_newKGuiItem__Ljava_lan
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KGuiItem_newKGuiItem__Lorg_kde_koala_KGuiItem_2 (JNIEnv *env, jobject, jobject);
 extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KGuiItem_text (JNIEnv *env, jobject);
 extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KGuiItem_plainText (JNIEnv *env, jobject);
-extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KGuiItem_iconSet__IILorg_kde_koala_KInstanceInterface_2 (JNIEnv *env, jobject, jint, jint, jobject);
+extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KGuiItem_iconSet__IILorg_kde_koala_TDEInstanceInterface_2 (JNIEnv *env, jobject, jint, jint, jobject);
 extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KGuiItem_iconSet__II (JNIEnv *env, jobject, jint, jint);
 extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KGuiItem_iconSet__I (JNIEnv *env, jobject, jint);
 extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KGuiItem_iconSet__ (JNIEnv *env, jobject);
diff --git a/kdejava/koala/kdejava/KHelpMenu.cpp b/kdejava/koala/kdejava/KHelpMenu.cpp
index 110d5cda..9c293883 100644
--- a/kdejava/koala/kdejava/KHelpMenu.cpp
+++ b/kdejava/koala/kdejava/KHelpMenu.cpp
@@ -13,9 +13,9 @@ public:
 	KHelpMenuJBridge(TQWidget* arg1,const TQString& arg2) : KHelpMenu(arg1,arg2) {};
 	KHelpMenuJBridge(TQWidget* arg1) : KHelpMenu(arg1) {};
 	KHelpMenuJBridge() : KHelpMenu() {};
-	KHelpMenuJBridge(TQWidget* arg1,const KAboutData* arg2,bool arg3,KActionCollection* arg4) : KHelpMenu(arg1,arg2,arg3,arg4) {};
-	KHelpMenuJBridge(TQWidget* arg1,const KAboutData* arg2,bool arg3) : KHelpMenu(arg1,arg2,arg3) {};
-	KHelpMenuJBridge(TQWidget* arg1,const KAboutData* arg2) : KHelpMenu(arg1,arg2) {};
+	KHelpMenuJBridge(TQWidget* arg1,const TDEAboutData* arg2,bool arg3,KActionCollection* arg4) : KHelpMenu(arg1,arg2,arg3,arg4) {};
+	KHelpMenuJBridge(TQWidget* arg1,const TDEAboutData* arg2,bool arg3) : KHelpMenu(arg1,arg2,arg3) {};
+	KHelpMenuJBridge(TQWidget* arg1,const TDEAboutData* arg2) : KHelpMenu(arg1,arg2) {};
 	~KHelpMenuJBridge() {QtSupport::qtKeyDeleted(this);}
 	void removeChild(TQObject* arg1) {
 		if (!QtSupport::eventDelegate(this,"removeChild",(void*)arg1,"org.kde.qt.TQObject")) {
@@ -172,30 +172,30 @@ static TQString* _qstring_aboutAppText = 0;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KHelpMenu_newKHelpMenu__Lorg_kde_qt_QWidget_2Lorg_kde_koala_KAboutData_2(JNIEnv* env, jobject obj, jobject parent, jobject aboutData)
+Java_org_kde_koala_KHelpMenu_newKHelpMenu__Lorg_kde_qt_QWidget_2Lorg_kde_koala_TDEAboutData_2(JNIEnv* env, jobject obj, jobject parent, jobject aboutData)
 {
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new KHelpMenuJBridge((TQWidget*) QtSupport::getQt(env, parent), (const KAboutData*) QtSupport::getQt(env, aboutData)));
+		QtSupport::setQt(env, obj, new KHelpMenuJBridge((TQWidget*) QtSupport::getQt(env, parent), (const TDEAboutData*) QtSupport::getQt(env, aboutData)));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KHelpMenu_newKHelpMenu__Lorg_kde_qt_QWidget_2Lorg_kde_koala_KAboutData_2Z(JNIEnv* env, jobject obj, jobject parent, jobject aboutData, jboolean showWhatsThis)
+Java_org_kde_koala_KHelpMenu_newKHelpMenu__Lorg_kde_qt_QWidget_2Lorg_kde_koala_TDEAboutData_2Z(JNIEnv* env, jobject obj, jobject parent, jobject aboutData, jboolean showWhatsThis)
 {
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new KHelpMenuJBridge((TQWidget*) QtSupport::getQt(env, parent), (const KAboutData*) QtSupport::getQt(env, aboutData), (bool) showWhatsThis));
+		QtSupport::setQt(env, obj, new KHelpMenuJBridge((TQWidget*) QtSupport::getQt(env, parent), (const TDEAboutData*) QtSupport::getQt(env, aboutData), (bool) showWhatsThis));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KHelpMenu_newKHelpMenu__Lorg_kde_qt_QWidget_2Lorg_kde_koala_KAboutData_2ZLorg_kde_koala_KActionCollection_2(JNIEnv* env, jobject obj, jobject parent, jobject aboutData, jboolean showWhatsThis, jobject actions)
+Java_org_kde_koala_KHelpMenu_newKHelpMenu__Lorg_kde_qt_QWidget_2Lorg_kde_koala_TDEAboutData_2ZLorg_kde_koala_KActionCollection_2(JNIEnv* env, jobject obj, jobject parent, jobject aboutData, jboolean showWhatsThis, jobject actions)
 {
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new KHelpMenuJBridge((TQWidget*) QtSupport::getQt(env, parent), (const KAboutData*) QtSupport::getQt(env, aboutData), (bool) showWhatsThis, (KActionCollection*) QtSupport::getQt(env, actions)));
+		QtSupport::setQt(env, obj, new KHelpMenuJBridge((TQWidget*) QtSupport::getQt(env, parent), (const TDEAboutData*) QtSupport::getQt(env, aboutData), (bool) showWhatsThis, (KActionCollection*) QtSupport::getQt(env, actions)));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
diff --git a/kdejava/koala/kdejava/KHelpMenu.h b/kdejava/koala/kdejava/KHelpMenu.h
index a17286ff..fd2a03d6 100644
--- a/kdejava/koala/kdejava/KHelpMenu.h
+++ b/kdejava/koala/kdejava/KHelpMenu.h
@@ -16,9 +16,9 @@ extern JNIEXPORT void JNICALL Java_org_kde_koala_KHelpMenu_newKHelpMenu__Lorg_kd
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KHelpMenu_newKHelpMenu__Lorg_kde_qt_QWidget_2Ljava_lang_String_2 (JNIEnv *env, jobject, jobject, jstring);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KHelpMenu_newKHelpMenu__Lorg_kde_qt_QWidget_2 (JNIEnv *env, jobject, jobject);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KHelpMenu_newKHelpMenu__ (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KHelpMenu_newKHelpMenu__Lorg_kde_qt_QWidget_2Lorg_kde_koala_KAboutData_2ZLorg_kde_koala_KActionCollection_2 (JNIEnv *env, jobject, jobject, jobject, jboolean, jobject);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KHelpMenu_newKHelpMenu__Lorg_kde_qt_QWidget_2Lorg_kde_koala_KAboutData_2Z (JNIEnv *env, jobject, jobject, jobject, jboolean);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KHelpMenu_newKHelpMenu__Lorg_kde_qt_QWidget_2Lorg_kde_koala_KAboutData_2 (JNIEnv *env, jobject, jobject, jobject);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_KHelpMenu_newKHelpMenu__Lorg_kde_qt_QWidget_2Lorg_kde_koala_TDEAboutData_2ZLorg_kde_koala_KActionCollection_2 (JNIEnv *env, jobject, jobject, jobject, jboolean, jobject);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_KHelpMenu_newKHelpMenu__Lorg_kde_qt_QWidget_2Lorg_kde_koala_TDEAboutData_2Z (JNIEnv *env, jobject, jobject, jobject, jboolean);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_KHelpMenu_newKHelpMenu__Lorg_kde_qt_QWidget_2Lorg_kde_koala_TDEAboutData_2 (JNIEnv *env, jobject, jobject, jobject);
 extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KHelpMenu_menu (JNIEnv *env, jobject);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KHelpMenu_appHelpActivated (JNIEnv *env, jobject);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KHelpMenu_contextHelpActivated (JNIEnv *env, jobject);
diff --git a/kdejava/koala/kdejava/KInstance.cpp b/kdejava/koala/kdejava/KInstance.cpp
index 8b074630..de8d8368 100644
--- a/kdejava/koala/kdejava/KInstance.cpp
+++ b/kdejava/koala/kdejava/KInstance.cpp
@@ -5,137 +5,137 @@
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
-#include <kdejava/KInstance.h>
+#include <kdejava/TDEInstance.h>
 
-class KInstanceJBridge : public KInstance
+class TDEInstanceJBridge : public TDEInstance
 {
 public:
-	KInstanceJBridge(const TQCString& arg1) : KInstance(arg1) {};
-	KInstanceJBridge(const KAboutData* arg1) : KInstance(arg1) {};
-	KInstanceJBridge(KInstance* arg1) : KInstance(arg1) {};
+	TDEInstanceJBridge(const TQCString& arg1) : TDEInstance(arg1) {};
+	TDEInstanceJBridge(const TDEAboutData* arg1) : TDEInstance(arg1) {};
+	TDEInstanceJBridge(TDEInstance* arg1) : TDEInstance(arg1) {};
 	void protected_setConfigName(const TQString& arg1) {
-		KInstance::setConfigName(arg1);
+		TDEInstance::setConfigName(arg1);
 		return;
 	}
-	~KInstanceJBridge() {QtSupport::qtKeyDeleted(this);}
+	~TDEInstanceJBridge() {QtSupport::qtKeyDeleted(this);}
 };
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_koala_KInstance_aboutData(JNIEnv* env, jobject obj)
+Java_org_kde_koala_TDEInstance_aboutData(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)((KInstance*) QtSupport::getQt(env, obj))->aboutData(), "org.kde.koala.KAboutData");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)((TDEInstance*) QtSupport::getQt(env, obj))->aboutData(), "org.kde.koala.TDEAboutData");
 	return xret;
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_koala_KInstance_config(JNIEnv* env, jobject obj)
+Java_org_kde_koala_TDEInstance_config(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)((KInstance*) QtSupport::getQt(env, obj))->config(), "org.kde.koala.KConfig");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)((TDEInstance*) QtSupport::getQt(env, obj))->config(), "org.kde.koala.KConfig");
 	return xret;
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_koala_KInstance_dirs(JNIEnv* env, jobject obj)
+Java_org_kde_koala_TDEInstance_dirs(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)((KInstance*) QtSupport::getQt(env, obj))->dirs(), "org.kde.koala.KStandardDirs");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)((TDEInstance*) QtSupport::getQt(env, obj))->dirs(), "org.kde.koala.KStandardDirs");
 	return xret;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KInstance_dispose(JNIEnv* env, jobject obj)
+Java_org_kde_koala_TDEInstance_dispose(JNIEnv* env, jobject obj)
 {
-	Java_org_kde_koala_KInstance_finalize(env, obj);
+	Java_org_kde_koala_TDEInstance_finalize(env, obj);
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KInstance_finalize(JNIEnv* env, jobject obj)
+Java_org_kde_koala_TDEInstance_finalize(JNIEnv* env, jobject obj)
 {
 	if (QtSupport::allocatedInJavaWorld(env, obj)) {
-		delete (KInstance*)QtSupport::getQt(env, obj);
+		delete (TDEInstance*)QtSupport::getQt(env, obj);
 		QtSupport::setQt(env, obj, 0);
 	}
 	return;
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_koala_KInstance_iconLoader(JNIEnv* env, jobject obj)
+Java_org_kde_koala_TDEInstance_iconLoader(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)((KInstance*) QtSupport::getQt(env, obj))->iconLoader(), "org.kde.koala.KIconLoader");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)((TDEInstance*) QtSupport::getQt(env, obj))->iconLoader(), "org.kde.koala.KIconLoader");
 	return xret;
 }
 
 JNIEXPORT jstring JNICALL
-Java_org_kde_koala_KInstance_instanceName(JNIEnv* env, jobject obj)
+Java_org_kde_koala_TDEInstance_instanceName(JNIEnv* env, jobject obj)
 {
 	TQCString  _qstring;
-	_qstring = ((KInstance*) QtSupport::getQt(env, obj))->instanceName();
+	_qstring = ((TDEInstance*) QtSupport::getQt(env, obj))->instanceName();
 	return QtSupport::fromTQCString(env, &_qstring);
 }
 
 JNIEXPORT jboolean JNICALL
-Java_org_kde_koala_KInstance_isDisposed(JNIEnv* env, jobject obj)
+Java_org_kde_koala_TDEInstance_isDisposed(JNIEnv* env, jobject obj)
 {
 	return (QtSupport::getQt(env, obj) == 0);
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_koala_KInstance_mimeSourceFactory(JNIEnv* env, jobject obj)
+Java_org_kde_koala_TDEInstance_mimeSourceFactory(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)((KInstance*) QtSupport::getQt(env, obj))->mimeSourceFactory(), "org.kde.koala.KMimeSourceFactory");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)((TDEInstance*) QtSupport::getQt(env, obj))->mimeSourceFactory(), "org.kde.koala.KMimeSourceFactory");
 	return xret;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KInstance_newIconLoader(JNIEnv* env, jobject obj)
+Java_org_kde_koala_TDEInstance_newIconLoader(JNIEnv* env, jobject obj)
 {
-	((KInstance*) QtSupport::getQt(env, obj))->newIconLoader();
+	((TDEInstance*) QtSupport::getQt(env, obj))->newIconLoader();
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KInstance_newKInstance__Ljava_lang_String_2(JNIEnv* env, jobject obj, jstring instanceName)
+Java_org_kde_koala_TDEInstance_newTDEInstance__Ljava_lang_String_2(JNIEnv* env, jobject obj, jstring instanceName)
 {
 static TQCString* _qcstring_instanceName = 0;
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new KInstanceJBridge((const TQCString&)*(TQCString*) QtSupport::toTQCString(env, instanceName, &_qcstring_instanceName)));
+		QtSupport::setQt(env, obj, new TDEInstanceJBridge((const TQCString&)*(TQCString*) QtSupport::toTQCString(env, instanceName, &_qcstring_instanceName)));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KInstance_newKInstance__Lorg_kde_koala_KAboutData_2(JNIEnv* env, jobject obj, jobject aboutData)
+Java_org_kde_koala_TDEInstance_newTDEInstance__Lorg_kde_koala_TDEAboutData_2(JNIEnv* env, jobject obj, jobject aboutData)
 {
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new KInstanceJBridge((const KAboutData*) QtSupport::getQt(env, aboutData)));
+		QtSupport::setQt(env, obj, new TDEInstanceJBridge((const TDEAboutData*) QtSupport::getQt(env, aboutData)));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KInstance_newKInstance__Lorg_kde_koala_KInstanceInterface_2(JNIEnv* env, jobject obj, jobject src)
+Java_org_kde_koala_TDEInstance_newTDEInstance__Lorg_kde_koala_TDEInstanceInterface_2(JNIEnv* env, jobject obj, jobject src)
 {
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new KInstanceJBridge((KInstance*) QtSupport::getQt(env, src)));
+		QtSupport::setQt(env, obj, new TDEInstanceJBridge((TDEInstance*) QtSupport::getQt(env, src)));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KInstance_setConfigName(JNIEnv* env, jobject obj, jstring name)
+Java_org_kde_koala_TDEInstance_setConfigName(JNIEnv* env, jobject obj, jstring name)
 {
 static TQString* _qstring_name = 0;
-	((KInstanceJBridge*) QtSupport::getQt(env, obj))->protected_setConfigName((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name));
+	((TDEInstanceJBridge*) QtSupport::getQt(env, obj))->protected_setConfigName((const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name));
 	return;
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_koala_KInstance_sharedConfig(JNIEnv* env, jobject obj)
+Java_org_kde_koala_TDEInstance_sharedConfig(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)((KInstance*) QtSupport::getQt(env, obj))->sharedConfig(), "org.kde.koala.KSharedConfig");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)((TDEInstance*) QtSupport::getQt(env, obj))->sharedConfig(), "org.kde.koala.KSharedConfig");
 	return xret;
 }
 
diff --git a/kdejava/koala/kdejava/KInstance.h b/kdejava/koala/kdejava/KInstance.h
index d94237e8..a75ee4c8 100644
--- a/kdejava/koala/kdejava/KInstance.h
+++ b/kdejava/koala/kdejava/KInstance.h
@@ -1,7 +1,7 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
 
-#ifndef __org_kde_koala_KInstance__
-#define __org_kde_koala_KInstance__
+#ifndef __org_kde_koala_TDEInstance__
+#define __org_kde_koala_TDEInstance__
 
 #include <jni.h>
 
@@ -10,24 +10,24 @@ extern "C"
 {
 #endif
 
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KInstance_newKInstance__Ljava_lang_String_2 (JNIEnv *env, jobject, jstring);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KInstance_newKInstance__Lorg_kde_koala_KAboutData_2 (JNIEnv *env, jobject, jobject);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KInstance_newKInstance__Lorg_kde_koala_KInstanceInterface_2 (JNIEnv *env, jobject, jobject);
-extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KInstance_dirs (JNIEnv *env, jobject);
-extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KInstance_config (JNIEnv *env, jobject);
-extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KInstance_sharedConfig (JNIEnv *env, jobject);
-extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KInstance_iconLoader (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KInstance_newIconLoader (JNIEnv *env, jobject);
-extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KInstance_aboutData (JNIEnv *env, jobject);
-extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KInstance_instanceName (JNIEnv *env, jobject);
-extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KInstance_mimeSourceFactory (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KInstance_setConfigName (JNIEnv *env, jobject, jstring);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KInstance_finalize (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KInstance_dispose (JNIEnv *env, jobject);
-extern JNIEXPORT jboolean JNICALL Java_org_kde_koala_KInstance_isDisposed (JNIEnv *env, jobject);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEInstance_newTDEInstance__Ljava_lang_String_2 (JNIEnv *env, jobject, jstring);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEInstance_newTDEInstance__Lorg_kde_koala_TDEAboutData_2 (JNIEnv *env, jobject, jobject);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEInstance_newTDEInstance__Lorg_kde_koala_TDEInstanceInterface_2 (JNIEnv *env, jobject, jobject);
+extern JNIEXPORT jobject JNICALL Java_org_kde_koala_TDEInstance_dirs (JNIEnv *env, jobject);
+extern JNIEXPORT jobject JNICALL Java_org_kde_koala_TDEInstance_config (JNIEnv *env, jobject);
+extern JNIEXPORT jobject JNICALL Java_org_kde_koala_TDEInstance_sharedConfig (JNIEnv *env, jobject);
+extern JNIEXPORT jobject JNICALL Java_org_kde_koala_TDEInstance_iconLoader (JNIEnv *env, jobject);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEInstance_newIconLoader (JNIEnv *env, jobject);
+extern JNIEXPORT jobject JNICALL Java_org_kde_koala_TDEInstance_aboutData (JNIEnv *env, jobject);
+extern JNIEXPORT jstring JNICALL Java_org_kde_koala_TDEInstance_instanceName (JNIEnv *env, jobject);
+extern JNIEXPORT jobject JNICALL Java_org_kde_koala_TDEInstance_mimeSourceFactory (JNIEnv *env, jobject);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEInstance_setConfigName (JNIEnv *env, jobject, jstring);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEInstance_finalize (JNIEnv *env, jobject);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEInstance_dispose (JNIEnv *env, jobject);
+extern JNIEXPORT jboolean JNICALL Java_org_kde_koala_TDEInstance_isDisposed (JNIEnv *env, jobject);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* __org_kde_koala_KInstance__ */
+#endif /* __org_kde_koala_TDEInstance__ */
diff --git a/kdejava/koala/kdejava/KLibLoader.cpp b/kdejava/koala/kdejava/KLibLoader.cpp
index f975146b..2930d3ab 100644
--- a/kdejava/koala/kdejava/KLibLoader.cpp
+++ b/kdejava/koala/kdejava/KLibLoader.cpp
@@ -105,12 +105,12 @@ static TQCString* _qstring_name = 0;
 }
 
 JNIEXPORT jstring JNICALL
-Java_org_kde_koala_KLibLoader_findLibrary__Ljava_lang_String_2Lorg_kde_koala_KInstanceInterface_2(JNIEnv* env, jclass cls, jstring name, jobject instance)
+Java_org_kde_koala_KLibLoader_findLibrary__Ljava_lang_String_2Lorg_kde_koala_TDEInstanceInterface_2(JNIEnv* env, jclass cls, jstring name, jobject instance)
 {
 	TQString  _qstring;
 	(void) cls;
 static TQCString* _qstring_name = 0;
-	_qstring = KLibLoaderJBridge::findLibrary((const char*) QtSupport::toCharString(env, name, &_qstring_name), (const KInstance*) QtSupport::getQt(env, instance));
+	_qstring = KLibLoaderJBridge::findLibrary((const char*) QtSupport::toCharString(env, name, &_qstring_name), (const TDEInstance*) QtSupport::getQt(env, instance));
 	return QtSupport::fromTQString(env, &_qstring);
 }
 
diff --git a/kdejava/koala/kdejava/KLibLoader.h b/kdejava/koala/kdejava/KLibLoader.h
index 3e3673b1..e4315038 100644
--- a/kdejava/koala/kdejava/KLibLoader.h
+++ b/kdejava/koala/kdejava/KLibLoader.h
@@ -17,7 +17,7 @@ extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KLibLoader_lastErrorMessage
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KLibLoader_unloadLibrary (JNIEnv *env, jobject, jstring);
 extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KLibLoader_self (JNIEnv *env, jclass);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KLibLoader_cleanUp (JNIEnv *env, jclass);
-extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KLibLoader_findLibrary__Ljava_lang_String_2Lorg_kde_koala_KInstanceInterface_2 (JNIEnv *env, jclass, jstring, jobject);
+extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KLibLoader_findLibrary__Ljava_lang_String_2Lorg_kde_koala_TDEInstanceInterface_2 (JNIEnv *env, jclass, jstring, jobject);
 extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KLibLoader_findLibrary__Ljava_lang_String_2 (JNIEnv *env, jclass, jstring);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KLibLoader_newKLibLoader__Lorg_kde_qt_QObject_2Ljava_lang_String_2 (JNIEnv *env, jobject, jobject, jstring);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KLibLoader_newKLibLoader__Lorg_kde_qt_QObject_2 (JNIEnv *env, jobject, jobject);
diff --git a/kdejava/koala/kdejava/KMainWindow.cpp b/kdejava/koala/kdejava/KMainWindow.cpp
index c350b8c9..780f634a 100644
--- a/kdejava/koala/kdejava/KMainWindow.cpp
+++ b/kdejava/koala/kdejava/KMainWindow.cpp
@@ -108,7 +108,7 @@ public:
 		return;
 	}
 	~KMainWindowJBridge() {QtSupport::qtKeyDeleted(this);}
-	void protected_setInstance(KInstance* arg1) {
+	void protected_setInstance(TDEInstance* arg1) {
 		KXMLGUIClient::setInstance(arg1);
 		return;
 	}
@@ -558,8 +558,8 @@ public:
 		}
 		return;
 	}
-	void setInstance(KInstance* arg1) {
-		if (!QtSupport::eventDelegate(this,"setInstance",(void*)arg1,"org.kde.koala.KInstanceInterface")) {
+	void setInstance(TDEInstance* arg1) {
+		if (!QtSupport::eventDelegate(this,"setInstance",(void*)arg1,"org.kde.koala.TDEInstanceInterface")) {
 			KXMLGUIClient::setInstance(arg1);
 		}
 		return;
@@ -681,7 +681,7 @@ Java_org_kde_koala_KMainWindow_builderClient(JNIEnv* env, jobject obj)
 JNIEXPORT jobject JNICALL
 Java_org_kde_koala_KMainWindow_builderInstance(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)((KXMLGUIBuilder*)(KMainWindow*) QtSupport::getQt(env, obj))->builderInstance(), "org.kde.koala.KInstanceInterface");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)((KXMLGUIBuilder*)(KMainWindow*) QtSupport::getQt(env, obj))->builderInstance(), "org.kde.koala.TDEInstanceInterface");
 	return xret;
 }
 
@@ -954,7 +954,7 @@ Java_org_kde_koala_KMainWindow_insertChildClient(JNIEnv* env, jobject obj, jobje
 JNIEXPORT jobject JNICALL
 Java_org_kde_koala_KMainWindow_instance(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)((KXMLGUIClient*)(KMainWindow*) QtSupport::getQt(env, obj))->instance(), "org.kde.koala.KInstanceInterface");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)((KXMLGUIClient*)(KMainWindow*) QtSupport::getQt(env, obj))->instance(), "org.kde.koala.TDEInstanceInterface");
 	return xret;
 }
 
@@ -1307,7 +1307,7 @@ Java_org_kde_koala_KMainWindow_setBuilderClient(JNIEnv* env, jobject obj, jobjec
 JNIEXPORT void JNICALL
 Java_org_kde_koala_KMainWindow_setBuilderInstance(JNIEnv* env, jobject obj, jobject instance)
 {
-	((KXMLGUIBuilder*)(KMainWindow*) QtSupport::getQt(env, obj))->setBuilderInstance((KInstance*) QtSupport::getQt(env, instance));
+	((KXMLGUIBuilder*)(KMainWindow*) QtSupport::getQt(env, obj))->setBuilderInstance((TDEInstance*) QtSupport::getQt(env, instance));
 	return;
 }
 
@@ -1386,7 +1386,7 @@ Java_org_kde_koala_KMainWindow_setIcon(JNIEnv* env, jobject obj, jobject arg1)
 JNIEXPORT void JNICALL
 Java_org_kde_koala_KMainWindow_setInstance(JNIEnv* env, jobject obj, jobject instance)
 {
-	((KMainWindowJBridge*) QtSupport::getQt(env, obj))->protected_setInstance((KInstance*) QtSupport::getQt(env, instance));
+	((KMainWindowJBridge*) QtSupport::getQt(env, obj))->protected_setInstance((TDEInstance*) QtSupport::getQt(env, instance));
 	return;
 }
 
diff --git a/kdejava/koala/kdejava/KNotifyClient.cpp b/kdejava/koala/kdejava/KNotifyClient.cpp
index 4dd2f7bb..da2ea81c 100644
--- a/kdejava/koala/kdejava/KNotifyClient.cpp
+++ b/kdejava/koala/kdejava/KNotifyClient.cpp
@@ -103,7 +103,7 @@ JNIEXPORT jobject JNICALL
 Java_org_kde_koala_KNotifyClient_instance(JNIEnv* env, jclass cls)
 {
 	(void) cls;
-	jobject xret = QtSupport::objectForQtKey(env, (void*)KNotifyClient::instance(), "org.kde.koala.KInstanceInterface");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)KNotifyClient::instance(), "org.kde.koala.TDEInstanceInterface");
 	return xret;
 }
 
diff --git a/kdejava/koala/kdejava/KPluginSelector.cpp b/kdejava/koala/kdejava/KPluginSelector.cpp
index 3fa55572..0527adf0 100644
--- a/kdejava/koala/kdejava/KPluginSelector.cpp
+++ b/kdejava/koala/kdejava/KPluginSelector.cpp
@@ -399,35 +399,35 @@ static TQString* _qstring_category = 0;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KPluginSelector_addPlugins__Lorg_kde_koala_KInstanceInterface_2(JNIEnv* env, jobject obj, jobject instance)
+Java_org_kde_koala_KPluginSelector_addPlugins__Lorg_kde_koala_TDEInstanceInterface_2(JNIEnv* env, jobject obj, jobject instance)
 {
-	((KPluginSelector*) QtSupport::getQt(env, obj))->addPlugins((const KInstance*) QtSupport::getQt(env, instance));
+	((KPluginSelector*) QtSupport::getQt(env, obj))->addPlugins((const TDEInstance*) QtSupport::getQt(env, instance));
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KPluginSelector_addPlugins__Lorg_kde_koala_KInstanceInterface_2Ljava_lang_String_2(JNIEnv* env, jobject obj, jobject instance, jstring catname)
+Java_org_kde_koala_KPluginSelector_addPlugins__Lorg_kde_koala_TDEInstanceInterface_2Ljava_lang_String_2(JNIEnv* env, jobject obj, jobject instance, jstring catname)
 {
 static TQString* _qstring_catname = 0;
-	((KPluginSelector*) QtSupport::getQt(env, obj))->addPlugins((const KInstance*) QtSupport::getQt(env, instance), (const TQString&)*(TQString*) QtSupport::toTQString(env, catname, &_qstring_catname));
+	((KPluginSelector*) QtSupport::getQt(env, obj))->addPlugins((const TDEInstance*) QtSupport::getQt(env, instance), (const TQString&)*(TQString*) QtSupport::toTQString(env, catname, &_qstring_catname));
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KPluginSelector_addPlugins__Lorg_kde_koala_KInstanceInterface_2Ljava_lang_String_2Ljava_lang_String_2(JNIEnv* env, jobject obj, jobject instance, jstring catname, jstring category)
+Java_org_kde_koala_KPluginSelector_addPlugins__Lorg_kde_koala_TDEInstanceInterface_2Ljava_lang_String_2Ljava_lang_String_2(JNIEnv* env, jobject obj, jobject instance, jstring catname, jstring category)
 {
 static TQString* _qstring_catname = 0;
 static TQString* _qstring_category = 0;
-	((KPluginSelector*) QtSupport::getQt(env, obj))->addPlugins((const KInstance*) QtSupport::getQt(env, instance), (const TQString&)*(TQString*) QtSupport::toTQString(env, catname, &_qstring_catname), (const TQString&)*(TQString*) QtSupport::toTQString(env, category, &_qstring_category));
+	((KPluginSelector*) QtSupport::getQt(env, obj))->addPlugins((const TDEInstance*) QtSupport::getQt(env, instance), (const TQString&)*(TQString*) QtSupport::toTQString(env, catname, &_qstring_catname), (const TQString&)*(TQString*) QtSupport::toTQString(env, category, &_qstring_category));
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KPluginSelector_addPlugins__Lorg_kde_koala_KInstanceInterface_2Ljava_lang_String_2Ljava_lang_String_2Lorg_kde_koala_KConfig_2(JNIEnv* env, jobject obj, jobject instance, jstring catname, jstring category, jobject config)
+Java_org_kde_koala_KPluginSelector_addPlugins__Lorg_kde_koala_TDEInstanceInterface_2Ljava_lang_String_2Ljava_lang_String_2Lorg_kde_koala_KConfig_2(JNIEnv* env, jobject obj, jobject instance, jstring catname, jstring category, jobject config)
 {
 static TQString* _qstring_catname = 0;
 static TQString* _qstring_category = 0;
-	((KPluginSelector*) QtSupport::getQt(env, obj))->addPlugins((const KInstance*) QtSupport::getQt(env, instance), (const TQString&)*(TQString*) QtSupport::toTQString(env, catname, &_qstring_catname), (const TQString&)*(TQString*) QtSupport::toTQString(env, category, &_qstring_category), (KConfig*) QtSupport::getQt(env, config));
+	((KPluginSelector*) QtSupport::getQt(env, obj))->addPlugins((const TDEInstance*) QtSupport::getQt(env, instance), (const TQString&)*(TQString*) QtSupport::toTQString(env, catname, &_qstring_catname), (const TQString&)*(TQString*) QtSupport::toTQString(env, category, &_qstring_category), (KConfig*) QtSupport::getQt(env, config));
 	return;
 }
 
diff --git a/kdejava/koala/kdejava/KPluginSelector.h b/kdejava/koala/kdejava/KPluginSelector.h
index fbab82ce..a3d4fd66 100644
--- a/kdejava/koala/kdejava/KPluginSelector.h
+++ b/kdejava/koala/kdejava/KPluginSelector.h
@@ -18,10 +18,10 @@ extern JNIEXPORT void JNICALL Java_org_kde_koala_KPluginSelector_addPlugins__Lja
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KPluginSelector_addPlugins__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jobject, jstring, jstring, jstring);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KPluginSelector_addPlugins__Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jobject, jstring, jstring);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KPluginSelector_addPlugins__Ljava_lang_String_2 (JNIEnv *env, jobject, jstring);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KPluginSelector_addPlugins__Lorg_kde_koala_KInstanceInterface_2Ljava_lang_String_2Ljava_lang_String_2Lorg_kde_koala_KConfig_2 (JNIEnv *env, jobject, jobject, jstring, jstring, jobject);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KPluginSelector_addPlugins__Lorg_kde_koala_KInstanceInterface_2Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jobject, jobject, jstring, jstring);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KPluginSelector_addPlugins__Lorg_kde_koala_KInstanceInterface_2Ljava_lang_String_2 (JNIEnv *env, jobject, jobject, jstring);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KPluginSelector_addPlugins__Lorg_kde_koala_KInstanceInterface_2 (JNIEnv *env, jobject, jobject);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_KPluginSelector_addPlugins__Lorg_kde_koala_TDEInstanceInterface_2Ljava_lang_String_2Ljava_lang_String_2Lorg_kde_koala_KConfig_2 (JNIEnv *env, jobject, jobject, jstring, jstring, jobject);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_KPluginSelector_addPlugins__Lorg_kde_koala_TDEInstanceInterface_2Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jobject, jobject, jstring, jstring);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_KPluginSelector_addPlugins__Lorg_kde_koala_TDEInstanceInterface_2Ljava_lang_String_2 (JNIEnv *env, jobject, jobject, jstring);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_KPluginSelector_addPlugins__Lorg_kde_koala_TDEInstanceInterface_2 (JNIEnv *env, jobject, jobject);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KPluginSelector_setShowEmptyConfigPage (JNIEnv *env, jobject, jboolean);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KPluginSelector_load (JNIEnv *env, jobject);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KPluginSelector_save (JNIEnv *env, jobject);
diff --git a/kdejava/koala/kdejava/KShortcutList.cpp b/kdejava/koala/kdejava/KShortcutList.cpp
index b8c26af9..99722fbd 100644
--- a/kdejava/koala/kdejava/KShortcutList.cpp
+++ b/kdejava/koala/kdejava/KShortcutList.cpp
@@ -40,7 +40,7 @@ Java_org_kde_koala_KShortcutList_index__Lorg_kde_koala_KKeySequence_2(JNIEnv* en
 JNIEXPORT jobject JNICALL
 Java_org_kde_koala_KShortcutList_instance(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)((KShortcutList*) QtSupport::getQt(env, obj))->instance(), "org.kde.koala.KInstanceInterface");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)((KShortcutList*) QtSupport::getQt(env, obj))->instance(), "org.kde.koala.TDEInstanceInterface");
 	return xret;
 }
 
diff --git a/kdejava/koala/kdejava/KSystemTray.cpp b/kdejava/koala/kdejava/KSystemTray.cpp
index ce85d869..7b698248 100644
--- a/kdejava/koala/kdejava/KSystemTray.cpp
+++ b/kdejava/koala/kdejava/KSystemTray.cpp
@@ -487,11 +487,11 @@ static TQString* _qstring_icon = 0;
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_koala_KSystemTray_loadIcon__Ljava_lang_String_2Lorg_kde_koala_KInstanceInterface_2(JNIEnv* env, jclass cls, jstring icon, jobject instance)
+Java_org_kde_koala_KSystemTray_loadIcon__Ljava_lang_String_2Lorg_kde_koala_TDEInstanceInterface_2(JNIEnv* env, jclass cls, jstring icon, jobject instance)
 {
 	(void) cls;
 static TQString* _qstring_icon = 0;
-	jobject xret = QtSupport::objectForQtKey(env, (void*)new TQPixmap(KSystemTrayJBridge::loadIcon((const TQString&)*(TQString*) QtSupport::toTQString(env, icon, &_qstring_icon), (KInstance*) QtSupport::getQt(env, instance))), "org.kde.qt.TQPixmap", TRUE);
+	jobject xret = QtSupport::objectForQtKey(env, (void*)new TQPixmap(KSystemTrayJBridge::loadIcon((const TQString&)*(TQString*) QtSupport::toTQString(env, icon, &_qstring_icon), (TDEInstance*) QtSupport::getQt(env, instance))), "org.kde.qt.TQPixmap", TRUE);
 	return xret;
 }
 
diff --git a/kdejava/koala/kdejava/KSystemTray.h b/kdejava/koala/kdejava/KSystemTray.h
index e1f16ebf..f29d55c4 100644
--- a/kdejava/koala/kdejava/KSystemTray.h
+++ b/kdejava/koala/kdejava/KSystemTray.h
@@ -22,7 +22,7 @@ extern JNIEXPORT void JNICALL Java_org_kde_koala_KSystemTray_setCaption (JNIEnv
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KSystemTray_toggleActive (JNIEnv *env, jobject);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KSystemTray_setActive (JNIEnv *env, jobject);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KSystemTray_setInactive (JNIEnv *env, jobject);
-extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KSystemTray_loadIcon__Ljava_lang_String_2Lorg_kde_koala_KInstanceInterface_2 (JNIEnv *env, jclass, jstring, jobject);
+extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KSystemTray_loadIcon__Ljava_lang_String_2Lorg_kde_koala_TDEInstanceInterface_2 (JNIEnv *env, jclass, jstring, jobject);
 extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KSystemTray_loadIcon__Ljava_lang_String_2 (JNIEnv *env, jclass, jstring);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KSystemTray_mousePressEvent (JNIEnv *env, jobject, jobject);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KSystemTray_mouseReleaseEvent (JNIEnv *env, jobject, jobject);
diff --git a/kdejava/koala/kdejava/KToolBar.cpp b/kdejava/koala/kdejava/KToolBar.cpp
index 0402392a..f1735507 100644
--- a/kdejava/koala/kdejava/KToolBar.cpp
+++ b/kdejava/koala/kdejava/KToolBar.cpp
@@ -754,12 +754,12 @@ static TQString* _qstring_text = 0;
 }
 
 JNIEXPORT jint JNICALL
-Java_org_kde_koala_KToolBar_insertButton__Ljava_lang_String_2ILjava_lang_String_2Lorg_kde_qt_QObject_2Ljava_lang_String_2ZLjava_lang_String_2ILorg_kde_koala_KInstanceInterface_2(JNIEnv* env, jobject obj, jstring icon, jint id, jstring signal, jobject receiver, jstring slot, jboolean enabled, jstring text, jint index, jobject _instance)
+Java_org_kde_koala_KToolBar_insertButton__Ljava_lang_String_2ILjava_lang_String_2Lorg_kde_qt_QObject_2Ljava_lang_String_2ZLjava_lang_String_2ILorg_kde_koala_TDEInstanceInterface_2(JNIEnv* env, jobject obj, jstring icon, jint id, jstring signal, jobject receiver, jstring slot, jboolean enabled, jstring text, jint index, jobject _instance)
 {
 static TQString* _qstring_icon = 0;
 static TQCString* _qstring_signal = 0;
 static TQString* _qstring_text = 0;
-	jint xret = (jint) ((KToolBar*) QtSupport::getQt(env, obj))->insertButton((const TQString&)*(TQString*) QtSupport::toTQString(env, icon, &_qstring_icon), (int) id, (const char*) QtSupport::toCharString(env, signal, &_qstring_signal), (const TQObject*) QtSupport::slotForReceiver(env, receiver, slot), "1invoke()", (bool) enabled, (const TQString&)*(TQString*) QtSupport::toTQString(env, text, &_qstring_text), (int) index, (KInstance*) QtSupport::getQt(env, _instance));
+	jint xret = (jint) ((KToolBar*) QtSupport::getQt(env, obj))->insertButton((const TQString&)*(TQString*) QtSupport::toTQString(env, icon, &_qstring_icon), (int) id, (const char*) QtSupport::toCharString(env, signal, &_qstring_signal), (const TQObject*) QtSupport::slotForReceiver(env, receiver, slot), "1invoke()", (bool) enabled, (const TQString&)*(TQString*) QtSupport::toTQString(env, text, &_qstring_text), (int) index, (TDEInstance*) QtSupport::getQt(env, _instance));
 	return xret;
 }
 
@@ -808,11 +808,11 @@ static TQString* _qstring_text = 0;
 }
 
 JNIEXPORT jint JNICALL
-Java_org_kde_koala_KToolBar_insertButton__Ljava_lang_String_2IZLjava_lang_String_2ILorg_kde_koala_KInstanceInterface_2(JNIEnv* env, jobject obj, jstring icon, jint id, jboolean enabled, jstring text, jint index, jobject _instance)
+Java_org_kde_koala_KToolBar_insertButton__Ljava_lang_String_2IZLjava_lang_String_2ILorg_kde_koala_TDEInstanceInterface_2(JNIEnv* env, jobject obj, jstring icon, jint id, jboolean enabled, jstring text, jint index, jobject _instance)
 {
 static TQString* _qstring_icon = 0;
 static TQString* _qstring_text = 0;
-	jint xret = (jint) ((KToolBar*) QtSupport::getQt(env, obj))->insertButton((const TQString&)*(TQString*) QtSupport::toTQString(env, icon, &_qstring_icon), (int) id, (bool) enabled, (const TQString&)*(TQString*) QtSupport::toTQString(env, text, &_qstring_text), (int) index, (KInstance*) QtSupport::getQt(env, _instance));
+	jint xret = (jint) ((KToolBar*) QtSupport::getQt(env, obj))->insertButton((const TQString&)*(TQString*) QtSupport::toTQString(env, icon, &_qstring_icon), (int) id, (bool) enabled, (const TQString&)*(TQString*) QtSupport::toTQString(env, text, &_qstring_text), (int) index, (TDEInstance*) QtSupport::getQt(env, _instance));
 	return xret;
 }
 
diff --git a/kdejava/koala/kdejava/KToolBar.h b/kdejava/koala/kdejava/KToolBar.h
index 810a41a7..339b1b20 100644
--- a/kdejava/koala/kdejava/KToolBar.h
+++ b/kdejava/koala/kdejava/KToolBar.h
@@ -26,12 +26,12 @@ extern JNIEXPORT void JNICALL Java_org_kde_koala_KToolBar_newKToolBar__Lorg_kde_
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KToolBar_newKToolBar__Lorg_kde_qt_QMainWindow_2Lorg_kde_qt_QWidget_2ZLjava_lang_String_2 (JNIEnv *env, jobject, jobject, jobject, jboolean, jstring);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KToolBar_newKToolBar__Lorg_kde_qt_QMainWindow_2Lorg_kde_qt_QWidget_2Z (JNIEnv *env, jobject, jobject, jobject, jboolean);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KToolBar_newKToolBar__Lorg_kde_qt_QMainWindow_2Lorg_kde_qt_QWidget_2 (JNIEnv *env, jobject, jobject, jobject);
-extern JNIEXPORT jint JNICALL Java_org_kde_koala_KToolBar_insertButton__Ljava_lang_String_2IZLjava_lang_String_2ILorg_kde_koala_KInstanceInterface_2 (JNIEnv *env, jobject, jstring, jint, jboolean, jstring, jint, jobject);
+extern JNIEXPORT jint JNICALL Java_org_kde_koala_KToolBar_insertButton__Ljava_lang_String_2IZLjava_lang_String_2ILorg_kde_koala_TDEInstanceInterface_2 (JNIEnv *env, jobject, jstring, jint, jboolean, jstring, jint, jobject);
 extern JNIEXPORT jint JNICALL Java_org_kde_koala_KToolBar_insertButton__Ljava_lang_String_2IZLjava_lang_String_2I (JNIEnv *env, jobject, jstring, jint, jboolean, jstring, jint);
 extern JNIEXPORT jint JNICALL Java_org_kde_koala_KToolBar_insertButton__Ljava_lang_String_2IZLjava_lang_String_2 (JNIEnv *env, jobject, jstring, jint, jboolean, jstring);
 extern JNIEXPORT jint JNICALL Java_org_kde_koala_KToolBar_insertButton__Ljava_lang_String_2IZ (JNIEnv *env, jobject, jstring, jint, jboolean);
 extern JNIEXPORT jint JNICALL Java_org_kde_koala_KToolBar_insertButton__Ljava_lang_String_2I (JNIEnv *env, jobject, jstring, jint);
-extern JNIEXPORT jint JNICALL Java_org_kde_koala_KToolBar_insertButton__Ljava_lang_String_2ILjava_lang_String_2Lorg_kde_qt_QObject_2Ljava_lang_String_2ZLjava_lang_String_2ILorg_kde_koala_KInstanceInterface_2 (JNIEnv *env, jobject, jstring, jint, jstring, jobject, jstring, jboolean, jstring, jint, jobject);
+extern JNIEXPORT jint JNICALL Java_org_kde_koala_KToolBar_insertButton__Ljava_lang_String_2ILjava_lang_String_2Lorg_kde_qt_QObject_2Ljava_lang_String_2ZLjava_lang_String_2ILorg_kde_koala_TDEInstanceInterface_2 (JNIEnv *env, jobject, jstring, jint, jstring, jobject, jstring, jboolean, jstring, jint, jobject);
 extern JNIEXPORT jint JNICALL Java_org_kde_koala_KToolBar_insertButton__Ljava_lang_String_2ILjava_lang_String_2Lorg_kde_qt_QObject_2Ljava_lang_String_2ZLjava_lang_String_2I (JNIEnv *env, jobject, jstring, jint, jstring, jobject, jstring, jboolean, jstring, jint);
 extern JNIEXPORT jint JNICALL Java_org_kde_koala_KToolBar_insertButton__Ljava_lang_String_2ILjava_lang_String_2Lorg_kde_qt_QObject_2Ljava_lang_String_2ZLjava_lang_String_2 (JNIEnv *env, jobject, jstring, jint, jstring, jobject, jstring, jboolean, jstring);
 extern JNIEXPORT jint JNICALL Java_org_kde_koala_KToolBar_insertButton__Ljava_lang_String_2ILjava_lang_String_2Lorg_kde_qt_QObject_2Ljava_lang_String_2Z (JNIEnv *env, jobject, jstring, jint, jstring, jobject, jstring, jboolean);
diff --git a/kdejava/koala/kdejava/KToolBarButton.cpp b/kdejava/koala/kdejava/KToolBarButton.cpp
index 88e94af4..4915749c 100644
--- a/kdejava/koala/kdejava/KToolBarButton.cpp
+++ b/kdejava/koala/kdejava/KToolBarButton.cpp
@@ -14,7 +14,7 @@
 class KToolBarButtonJBridge : public KToolBarButton
 {
 public:
-	KToolBarButtonJBridge(const TQString& arg1,int arg2,TQWidget* arg3,const char* arg4,const TQString& arg5,KInstance* arg6) : KToolBarButton(arg1,arg2,arg3,arg4,arg5,arg6) {};
+	KToolBarButtonJBridge(const TQString& arg1,int arg2,TQWidget* arg3,const char* arg4,const TQString& arg5,TDEInstance* arg6) : KToolBarButton(arg1,arg2,arg3,arg4,arg5,arg6) {};
 	KToolBarButtonJBridge(const TQString& arg1,int arg2,TQWidget* arg3,const char* arg4,const TQString& arg5) : KToolBarButton(arg1,arg2,arg3,arg4,arg5) {};
 	KToolBarButtonJBridge(const TQString& arg1,int arg2,TQWidget* arg3,const char* arg4) : KToolBarButton(arg1,arg2,arg3,arg4) {};
 	KToolBarButtonJBridge(const TQString& arg1,int arg2,TQWidget* arg3) : KToolBarButton(arg1,arg2,arg3) {};
@@ -633,13 +633,13 @@ static TQString* _qstring_txt = 0;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KToolBarButton_newKToolBarButton__Ljava_lang_String_2ILorg_kde_qt_QWidget_2Ljava_lang_String_2Ljava_lang_String_2Lorg_kde_koala_KInstanceInterface_2(JNIEnv* env, jobject obj, jstring icon, jint id, jobject parent, jstring name, jstring txt, jobject _instance)
+Java_org_kde_koala_KToolBarButton_newKToolBarButton__Ljava_lang_String_2ILorg_kde_qt_QWidget_2Ljava_lang_String_2Ljava_lang_String_2Lorg_kde_koala_TDEInstanceInterface_2(JNIEnv* env, jobject obj, jstring icon, jint id, jobject parent, jstring name, jstring txt, jobject _instance)
 {
 static TQString* _qstring_icon = 0;
 static TQCString* _qstring_name = 0;
 static TQString* _qstring_txt = 0;
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new KToolBarButtonJBridge((const TQString&)*(TQString*) QtSupport::toTQString(env, icon, &_qstring_icon), (int) id, (TQWidget*) QtSupport::getQt(env, parent), (const char*) QtSupport::toCharString(env, name, &_qstring_name), (const TQString&)*(TQString*) QtSupport::toTQString(env, txt, &_qstring_txt), (KInstance*) QtSupport::getQt(env, _instance)));
+		QtSupport::setQt(env, obj, new KToolBarButtonJBridge((const TQString&)*(TQString*) QtSupport::toTQString(env, icon, &_qstring_icon), (int) id, (TQWidget*) QtSupport::getQt(env, parent), (const char*) QtSupport::toCharString(env, name, &_qstring_name), (const TQString&)*(TQString*) QtSupport::toTQString(env, txt, &_qstring_txt), (TDEInstance*) QtSupport::getQt(env, _instance)));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
diff --git a/kdejava/koala/kdejava/KToolBarButton.h b/kdejava/koala/kdejava/KToolBarButton.h
index d849226e..e6d27a00 100644
--- a/kdejava/koala/kdejava/KToolBarButton.h
+++ b/kdejava/koala/kdejava/KToolBarButton.h
@@ -12,7 +12,7 @@ extern "C"
 
 extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KToolBarButton_metaObject (JNIEnv *env, jobject);
 extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KToolBarButton_className (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KToolBarButton_newKToolBarButton__Ljava_lang_String_2ILorg_kde_qt_QWidget_2Ljava_lang_String_2Ljava_lang_String_2Lorg_kde_koala_KInstanceInterface_2 (JNIEnv *env, jobject, jstring, jint, jobject, jstring, jstring, jobject);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_KToolBarButton_newKToolBarButton__Ljava_lang_String_2ILorg_kde_qt_QWidget_2Ljava_lang_String_2Ljava_lang_String_2Lorg_kde_koala_TDEInstanceInterface_2 (JNIEnv *env, jobject, jstring, jint, jobject, jstring, jstring, jobject);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KToolBarButton_newKToolBarButton__Ljava_lang_String_2ILorg_kde_qt_QWidget_2Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jobject, jstring, jint, jobject, jstring, jstring);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KToolBarButton_newKToolBarButton__Ljava_lang_String_2ILorg_kde_qt_QWidget_2Ljava_lang_String_2 (JNIEnv *env, jobject, jstring, jint, jobject, jstring);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_KToolBarButton_newKToolBarButton__Ljava_lang_String_2ILorg_kde_qt_QWidget_2 (JNIEnv *env, jobject, jstring, jint, jobject);
diff --git a/kdejava/koala/kdejava/KXMLGUIBuilder.cpp b/kdejava/koala/kdejava/KXMLGUIBuilder.cpp
index 11fcdb08..da56d99f 100644
--- a/kdejava/koala/kdejava/KXMLGUIBuilder.cpp
+++ b/kdejava/koala/kdejava/KXMLGUIBuilder.cpp
@@ -24,7 +24,7 @@ Java_org_kde_koala_KXMLGUIBuilder_builderClient(JNIEnv* env, jobject obj)
 JNIEXPORT jobject JNICALL
 Java_org_kde_koala_KXMLGUIBuilder_builderInstance(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)((KXMLGUIBuilder*) QtSupport::getQt(env, obj))->builderInstance(), "org.kde.koala.KInstanceInterface");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)((KXMLGUIBuilder*) QtSupport::getQt(env, obj))->builderInstance(), "org.kde.koala.TDEInstanceInterface");
 	return xret;
 }
 
@@ -124,7 +124,7 @@ Java_org_kde_koala_KXMLGUIBuilder_setBuilderClient(JNIEnv* env, jobject obj, job
 JNIEXPORT void JNICALL
 Java_org_kde_koala_KXMLGUIBuilder_setBuilderInstance(JNIEnv* env, jobject obj, jobject instance)
 {
-	((KXMLGUIBuilder*) QtSupport::getQt(env, obj))->setBuilderInstance((KInstance*) QtSupport::getQt(env, instance));
+	((KXMLGUIBuilder*) QtSupport::getQt(env, obj))->setBuilderInstance((TDEInstance*) QtSupport::getQt(env, instance));
 	return;
 }
 
diff --git a/kdejava/koala/kdejava/KXMLGUIClient.cpp b/kdejava/koala/kdejava/KXMLGUIClient.cpp
index 3c897dd0..1e1b136f 100644
--- a/kdejava/koala/kdejava/KXMLGUIClient.cpp
+++ b/kdejava/koala/kdejava/KXMLGUIClient.cpp
@@ -13,7 +13,7 @@ class KXMLGUIClientJBridge : public KXMLGUIClient
 public:
 	KXMLGUIClientJBridge() : KXMLGUIClient() {};
 	KXMLGUIClientJBridge(KXMLGUIClient* arg1) : KXMLGUIClient(arg1) {};
-	void protected_setInstance(KInstance* arg1) {
+	void protected_setInstance(TDEInstance* arg1) {
 		KXMLGUIClient::setInstance(arg1);
 		return;
 	}
@@ -185,7 +185,7 @@ Java_org_kde_koala_KXMLGUIClient_insertChildClient(JNIEnv* env, jobject obj, job
 JNIEXPORT jobject JNICALL
 Java_org_kde_koala_KXMLGUIClient_instance(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)((KXMLGUIClient*) QtSupport::getQt(env, obj))->instance(), "org.kde.koala.KInstanceInterface");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)((KXMLGUIClient*) QtSupport::getQt(env, obj))->instance(), "org.kde.koala.TDEInstanceInterface");
 	return xret;
 }
 
@@ -282,7 +282,7 @@ Java_org_kde_koala_KXMLGUIClient_setFactory(JNIEnv* env, jobject obj, jobject fa
 JNIEXPORT void JNICALL
 Java_org_kde_koala_KXMLGUIClient_setInstance(JNIEnv* env, jobject obj, jobject instance)
 {
-	((KXMLGUIClientJBridge*) QtSupport::getQt(env, obj))->protected_setInstance((KInstance*) QtSupport::getQt(env, instance));
+	((KXMLGUIClientJBridge*) QtSupport::getQt(env, obj))->protected_setInstance((TDEInstance*) QtSupport::getQt(env, instance));
 	return;
 }
 
diff --git a/kdejava/koala/kdejava/KXMLGUIFactory.cpp b/kdejava/koala/kdejava/KXMLGUIFactory.cpp
index 67bc1eb1..99b9d836 100644
--- a/kdejava/koala/kdejava/KXMLGUIFactory.cpp
+++ b/kdejava/koala/kdejava/KXMLGUIFactory.cpp
@@ -212,12 +212,12 @@ static TQString* _qstring_filename = 0;
 }
 
 JNIEXPORT jstring JNICALL
-Java_org_kde_koala_KXMLGUIFactory_readConfigFile__Ljava_lang_String_2Lorg_kde_koala_KInstanceInterface_2(JNIEnv* env, jclass cls, jstring filename, jobject instance)
+Java_org_kde_koala_KXMLGUIFactory_readConfigFile__Ljava_lang_String_2Lorg_kde_koala_TDEInstanceInterface_2(JNIEnv* env, jclass cls, jstring filename, jobject instance)
 {
 	TQString  _qstring;
 	(void) cls;
 static TQString* _qstring_filename = 0;
-	_qstring = KXMLGUIFactoryJBridge::readConfigFile((const TQString&)*(TQString*) QtSupport::toTQString(env, filename, &_qstring_filename), (const KInstance*) QtSupport::getQt(env, instance));
+	_qstring = KXMLGUIFactoryJBridge::readConfigFile((const TQString&)*(TQString*) QtSupport::toTQString(env, filename, &_qstring_filename), (const TDEInstance*) QtSupport::getQt(env, instance));
 	return QtSupport::fromTQString(env, &_qstring);
 }
 
@@ -232,12 +232,12 @@ static TQString* _qstring_filename = 0;
 }
 
 JNIEXPORT jstring JNICALL
-Java_org_kde_koala_KXMLGUIFactory_readConfigFile__Ljava_lang_String_2ZLorg_kde_koala_KInstanceInterface_2(JNIEnv* env, jclass cls, jstring filename, jboolean never_null, jobject instance)
+Java_org_kde_koala_KXMLGUIFactory_readConfigFile__Ljava_lang_String_2ZLorg_kde_koala_TDEInstanceInterface_2(JNIEnv* env, jclass cls, jstring filename, jboolean never_null, jobject instance)
 {
 	TQString  _qstring;
 	(void) cls;
 static TQString* _qstring_filename = 0;
-	_qstring = KXMLGUIFactoryJBridge::readConfigFile((const TQString&)*(TQString*) QtSupport::toTQString(env, filename, &_qstring_filename), (bool) never_null, (const KInstance*) QtSupport::getQt(env, instance));
+	_qstring = KXMLGUIFactoryJBridge::readConfigFile((const TQString&)*(TQString*) QtSupport::toTQString(env, filename, &_qstring_filename), (bool) never_null, (const TDEInstance*) QtSupport::getQt(env, instance));
 	return QtSupport::fromTQString(env, &_qstring);
 }
 
@@ -289,11 +289,11 @@ static TQString* _qstring_filename = 0;
 }
 
 JNIEXPORT jboolean JNICALL
-Java_org_kde_koala_KXMLGUIFactory_saveConfigFile__Lorg_kde_qt_QDomDocument_2Ljava_lang_String_2Lorg_kde_koala_KInstanceInterface_2(JNIEnv* env, jclass cls, jobject doc, jstring filename, jobject instance)
+Java_org_kde_koala_KXMLGUIFactory_saveConfigFile__Lorg_kde_qt_QDomDocument_2Ljava_lang_String_2Lorg_kde_koala_TDEInstanceInterface_2(JNIEnv* env, jclass cls, jobject doc, jstring filename, jobject instance)
 {
 	(void) cls;
 static TQString* _qstring_filename = 0;
-	jboolean xret = (jboolean) KXMLGUIFactoryJBridge::saveConfigFile((const TQDomDocument&)*(const TQDomDocument*) QtSupport::getQt(env, doc), (const TQString&)*(TQString*) QtSupport::toTQString(env, filename, &_qstring_filename), (const KInstance*) QtSupport::getQt(env, instance));
+	jboolean xret = (jboolean) KXMLGUIFactoryJBridge::saveConfigFile((const TQDomDocument&)*(const TQDomDocument*) QtSupport::getQt(env, doc), (const TQString&)*(TQString*) QtSupport::toTQString(env, filename, &_qstring_filename), (const TDEInstance*) QtSupport::getQt(env, instance));
 	return xret;
 }
 
diff --git a/kdejava/koala/kdejava/KXMLGUIFactory.h b/kdejava/koala/kdejava/KXMLGUIFactory.h
index ecabe0cc..221d8cf5 100644
--- a/kdejava/koala/kdejava/KXMLGUIFactory.h
+++ b/kdejava/koala/kdejava/KXMLGUIFactory.h
@@ -26,11 +26,11 @@ extern JNIEXPORT void JNICALL Java_org_kde_koala_KXMLGUIFactory_resetContainer__
 extern JNIEXPORT jint JNICALL Java_org_kde_koala_KXMLGUIFactory_configureShortcuts__ZZ (JNIEnv *env, jobject, jboolean, jboolean);
 extern JNIEXPORT jint JNICALL Java_org_kde_koala_KXMLGUIFactory_configureShortcuts__Z (JNIEnv *env, jobject, jboolean);
 extern JNIEXPORT jint JNICALL Java_org_kde_koala_KXMLGUIFactory_configureShortcuts__ (JNIEnv *env, jobject);
-extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KXMLGUIFactory_readConfigFile__Ljava_lang_String_2ZLorg_kde_koala_KInstanceInterface_2 (JNIEnv *env, jclass, jstring, jboolean, jobject);
+extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KXMLGUIFactory_readConfigFile__Ljava_lang_String_2ZLorg_kde_koala_TDEInstanceInterface_2 (JNIEnv *env, jclass, jstring, jboolean, jobject);
 extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KXMLGUIFactory_readConfigFile__Ljava_lang_String_2Z (JNIEnv *env, jclass, jstring, jboolean);
-extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KXMLGUIFactory_readConfigFile__Ljava_lang_String_2Lorg_kde_koala_KInstanceInterface_2 (JNIEnv *env, jclass, jstring, jobject);
+extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KXMLGUIFactory_readConfigFile__Ljava_lang_String_2Lorg_kde_koala_TDEInstanceInterface_2 (JNIEnv *env, jclass, jstring, jobject);
 extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KXMLGUIFactory_readConfigFile__Ljava_lang_String_2 (JNIEnv *env, jclass, jstring);
-extern JNIEXPORT jboolean JNICALL Java_org_kde_koala_KXMLGUIFactory_saveConfigFile__Lorg_kde_qt_QDomDocument_2Ljava_lang_String_2Lorg_kde_koala_KInstanceInterface_2 (JNIEnv *env, jclass, jobject, jstring, jobject);
+extern JNIEXPORT jboolean JNICALL Java_org_kde_koala_KXMLGUIFactory_saveConfigFile__Lorg_kde_qt_QDomDocument_2Ljava_lang_String_2Lorg_kde_koala_TDEInstanceInterface_2 (JNIEnv *env, jclass, jobject, jstring, jobject);
 extern JNIEXPORT jboolean JNICALL Java_org_kde_koala_KXMLGUIFactory_saveConfigFile__Lorg_kde_qt_QDomDocument_2Ljava_lang_String_2 (JNIEnv *env, jclass, jobject, jstring);
 extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KXMLGUIFactory_documentToXML (JNIEnv *env, jclass, jobject);
 extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KXMLGUIFactory_elementToXML (JNIEnv *env, jclass, jobject);
diff --git a/kdejava/koala/kdejava/MainWindow.cpp b/kdejava/koala/kdejava/MainWindow.cpp
index 3deb4fcc..5e6c7f3c 100644
--- a/kdejava/koala/kdejava/MainWindow.cpp
+++ b/kdejava/koala/kdejava/MainWindow.cpp
@@ -40,15 +40,15 @@ public:
 		KParts::MainWindow::saveNewToolbarConfig();
 		return;
 	}
-	void protected_setInstance(KInstance* arg1) {
+	void protected_setInstance(TDEInstance* arg1) {
 		KParts::PartBase::setInstance(arg1);
 		return;
 	}
-	void protected_setInstance(KInstance* arg1,bool arg2) {
+	void protected_setInstance(TDEInstance* arg1,bool arg2) {
 		KParts::PartBase::setInstance(arg1,arg2);
 		return;
 	}
-	void protected_loadPlugins(TQObject* arg1,KXMLGUIClient* arg2,KInstance* arg3) {
+	void protected_loadPlugins(TQObject* arg1,KXMLGUIClient* arg2,TDEInstance* arg3) {
 		KParts::PartBase::loadPlugins(arg1,arg2,arg3);
 		return;
 	}
@@ -494,7 +494,7 @@ Java_org_kde_koala_MainWindow_createShellGUI__Z(JNIEnv* env, jobject obj, jboole
 JNIEXPORT void JNICALL
 Java_org_kde_koala_MainWindow_loadPlugins(JNIEnv* env, jobject obj, jobject parent, jobject parentGUIClient, jobject instance)
 {
-	((MainWindowJBridge*) QtSupport::getQt(env, obj))->protected_loadPlugins((TQObject*) QtSupport::getQt(env, parent), (KXMLGUIClient*) QtSupport::getQt(env, parentGUIClient), (KInstance*) QtSupport::getQt(env, instance));
+	((MainWindowJBridge*) QtSupport::getQt(env, obj))->protected_loadPlugins((TQObject*) QtSupport::getQt(env, parent), (KXMLGUIClient*) QtSupport::getQt(env, parentGUIClient), (TDEInstance*) QtSupport::getQt(env, instance));
 	return;
 }
 
@@ -616,16 +616,16 @@ Java_org_kde_koala_MainWindow_saveNewToolbarConfig(JNIEnv* env, jobject obj)
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_MainWindow_setInstance__Lorg_kde_koala_KInstanceInterface_2(JNIEnv* env, jobject obj, jobject instance)
+Java_org_kde_koala_MainWindow_setInstance__Lorg_kde_koala_TDEInstanceInterface_2(JNIEnv* env, jobject obj, jobject instance)
 {
-	((MainWindowJBridge*) QtSupport::getQt(env, obj))->protected_setInstance((KInstance*) QtSupport::getQt(env, instance));
+	((MainWindowJBridge*) QtSupport::getQt(env, obj))->protected_setInstance((TDEInstance*) QtSupport::getQt(env, instance));
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_MainWindow_setInstance__Lorg_kde_koala_KInstanceInterface_2Z(JNIEnv* env, jobject obj, jobject instance, jboolean loadPlugins)
+Java_org_kde_koala_MainWindow_setInstance__Lorg_kde_koala_TDEInstanceInterface_2Z(JNIEnv* env, jobject obj, jobject instance, jboolean loadPlugins)
 {
-	((MainWindowJBridge*) QtSupport::getQt(env, obj))->protected_setInstance((KInstance*) QtSupport::getQt(env, instance), (bool) loadPlugins);
+	((MainWindowJBridge*) QtSupport::getQt(env, obj))->protected_setInstance((TDEInstance*) QtSupport::getQt(env, instance), (bool) loadPlugins);
 	return;
 }
 
diff --git a/kdejava/koala/kdejava/MainWindow.h b/kdejava/koala/kdejava/MainWindow.h
index 17cc0003..81c9ac81 100644
--- a/kdejava/koala/kdejava/MainWindow.h
+++ b/kdejava/koala/kdejava/MainWindow.h
@@ -28,8 +28,8 @@ extern JNIEXPORT void JNICALL Java_org_kde_koala_MainWindow_slotSetStatusBarText
 extern JNIEXPORT void JNICALL Java_org_kde_koala_MainWindow_saveNewToolbarConfig (JNIEnv *env, jobject);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_MainWindow_setPartObject (JNIEnv *env, jobject, jobject);
 extern JNIEXPORT jobject JNICALL Java_org_kde_koala_MainWindow_partObject (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_MainWindow_setInstance__Lorg_kde_koala_KInstanceInterface_2 (JNIEnv *env, jobject, jobject);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_MainWindow_setInstance__Lorg_kde_koala_KInstanceInterface_2Z (JNIEnv *env, jobject, jobject, jboolean);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_MainWindow_setInstance__Lorg_kde_koala_TDEInstanceInterface_2 (JNIEnv *env, jobject, jobject);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_MainWindow_setInstance__Lorg_kde_koala_TDEInstanceInterface_2Z (JNIEnv *env, jobject, jobject, jboolean);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_MainWindow_loadPlugins (JNIEnv *env, jobject, jobject, jobject, jobject);
 
 #ifdef __cplusplus
diff --git a/kdejava/koala/kdejava/Makefile.am b/kdejava/koala/kdejava/Makefile.am
index 88324704..a18fcac1 100644
--- a/kdejava/koala/kdejava/Makefile.am
+++ b/kdejava/koala/kdejava/Makefile.am
@@ -8,10 +8,10 @@ jnilocdir = $(libdir)/jni
 
 AM_LDFLAGS = 
 
-libkdejava_la_SOURCES = StoredTransferJob.cpp BrowserRun.cpp BrowserHostExtension.cpp WindowArgs.cpp URLArgs.cpp PartManager.cpp KNamedCommand.cpp KSSLCertBox.cpp TextEvent.cpp StatusBarExtension.cpp SkipDlg.cpp SessionData.cpp RangeException.cpp Plugin.cpp PasswordDialog.cpp PartBase.cpp Notation.cpp MutationEvent.cpp MultiGetJob.cpp LiveConnectExtension.cpp LinkStyle.cpp KZipFileEntry.cpp KZip.cpp KXMLGUI.cpp KWindowInfo.cpp KWidgetAction.cpp KURLBarItemDialog.cpp KTempDir.cpp KSyntaxHighlighter.cpp KSSLSigners.cpp KSSLPKCS7.cpp KSSLKeyGen.cpp KSSLCertificateFactory.cpp KSSLCertificateCache.cpp KSSLCertDlg.cpp KSpellingHighlighter.cpp KSMIMECrypto.cpp KSimpleFileFilter.cpp KShell.cpp KServiceSeparator.cpp KRegExpEditorInterface.cpp KPluginSelector.cpp KPassivePopup.cpp KPanelAppMenu.cpp KOCRDialog.cpp KMountPoint.cpp KMimeTypeValidator.cpp KMimeTypeResolverHelper.cpp KMimeTypeResolverBase.cpp KMD5.cpp KKeyNative.cpp KIDNA.cpp KFontRequester.cpp KFileShare.cpp KFilePlugin.cpp KDockArea.cpp KDiskFreeSp.cpp KDCOPServiceStarter.cpp KCustomMenuEditor.cpp KCPUInfo.cpp KConfigGroup.cpp KCMultiDialog.cpp KCModuleLoader.cpp KCModuleInfo.cpp KCalendarSystemFactory.cpp KAr.cpp KActiveLabel.cpp KActionShortcutList.cpp KAccelShortcutList.cpp HTMLFormCollection.cpp HistoryProvider.cpp Factory.cpp EventException.cpp Entity.cpp DOMImplementation.cpp DOMException.cpp CSSValueList.cpp CSSUnknownRule.cpp CSSStyleRule.cpp CSSPageRule.cpp CSSMediaRule.cpp CSSImportRule.cpp CSSFontFaceRule.cpp CSSCharsetRule.cpp KInputDialog.cpp KAsyncIO.cpp Observer.cpp RenameDlg.cpp KDirLister.cpp KBufferedIO.cpp AuthInfo.cpp SlaveInterface.cpp SlaveBase.cpp KShellProcess.cpp KMimeMagicResult.cpp KMimeMagic.cpp KFloatValidator.cpp KEdit.cpp DefaultProgress.cpp KURLComboRequester.cpp KToggleToolBarAction.cpp KTimeWidget.cpp KTextEdit.cpp KTabWidget.cpp KTabBar.cpp KStringListValidator.cpp KPasteTextAction.cpp KMdiToolViewAccessor.cpp KMdiWin32IconButton.cpp KMdiViewCloseEvent.cpp KMdiTaskBar.cpp KMdiTaskBarButton.cpp KMdiMainFrm.cpp KMdi.cpp KMdiChildView.cpp KMdiChildFrmResizeEndEvent.cpp KMdiChildFrmResizeBeginEvent.cpp KMdiChildFrmMoveEvent.cpp KMdiChildFrmDragEndEvent.cpp KMdiChildFrmDragBeginEvent.cpp KMdiChildFrm.cpp KMdiChildFrmCaption.cpp KMdiChildArea.cpp KKeyButton.cpp KDoubleValidator.cpp KCatalogue.cpp UIEvent.cpp PreviewJob.cpp Node.cpp MetaInfoJob.cpp KURLBarListBox.cpp KURLBarItem.cpp KURLBar.cpp KToggleFullScreenAction.cpp KSSLX509V3.cpp KSSLSession.cpp KSSLCertChain.cpp KShortcutList.cpp KSharedConfig.cpp KMimeSourceFactory.cpp KFileMetaInfoGroup.cpp KCalendarSystem.cpp EventListener.cpp DomShared.cpp Document.cpp DavJob.cpp CustomNodeFilter.cpp CSSRuleList.cpp CSSRule.cpp AbstractView.cpp KReplaceDialog.cpp KReplace.cpp KProgressDialog.cpp KPrintAction.cpp KMultiTabBarTab.cpp KMultiTabBar.cpp KMultiTabBarButton.cpp KFindDialog.cpp KFind.cpp KDateTimeWidget.cpp KArrowButton.cpp KRecentFilesAction.cpp KListAction.cpp KSSLCertDlgRet.cpp KDE.cpp KValueSelector.cpp KPaletteTable.cpp KHSSelector.cpp KColorPatch.cpp KColorDialog.cpp KColorCells.cpp KColor.cpp KURLPixmapProvider.cpp KDockWidget.cpp KDockTabGroup.cpp KDockManager.cpp KDockMainWindow.cpp KKeySequence.cpp ProgressBase.cpp StatusbarProgress.cpp Scheduler.cpp KIO.cpp KKey.cpp KShortcut.cpp KWordWrap.cpp KMultipleDrag.cpp KFileTreeViewToolTip.cpp KFileTreeViewItem.cpp KFileTreeView.cpp KFileTreeBranch.cpp KFileFilterCombo.cpp KEMailSettings.cpp KDirSelectDialog.cpp KDateWidget.cpp KDataToolInfo.cpp KDataToolAction.cpp KDataTool.cpp KStdGuiItem.cpp KIconViewItem.cpp KGuiItem.cpp KFileMetaInfoItem.cpp KFileMetaInfo.cpp KDialogBase.cpp KArchiveFile.cpp KArchiveEntry.cpp KSSLPKCS12.cpp KArchiveDirectory.cpp KTar.cpp KArchive.cpp KListViewItem.cpp KTipDialog.cpp KTipDatabase.cpp KDEJavaSlot.cpp KToolBarPopupAction.cpp KSqueezedTextLabel.cpp KScanDialog.cpp KPushButton.cpp KPreviewWidgetBase.cpp KPixmapSplitter.cpp KPanelExtension.cpp KMacroCommand.cpp KFontCombo.cpp KFilterDev.cpp KFilterBase.cpp KEditListBox.cpp KDialogQueue.cpp KCompletionBox.cpp KCommandHistory.cpp KCommand.cpp KCodecs.cpp KAboutTranslator.cpp KAboutContributor.cpp Slave.cpp Connection.cpp TransferJob.cpp StatJob.cpp SimpleJob.cpp MimetypeJob.cpp ListJob.cpp KDirSize.cpp KDirNotify.cpp Job.cpp FileCopyJob.cpp DeleteJob.cpp CopyJob.cpp CharacterData.cpp TreeWalker.cpp Text.cpp Range.cpp ProcessingInstruction.cpp NodeIterator.cpp NodeFilter.cpp EntityReference.cpp Comment.cpp CDATASection.cpp MainWindow.cpp DockMainWindow.cpp Attr.cpp HTMLUListElement.cpp HTMLTitleElement.cpp HTMLTextAreaElement.cpp HTMLTableSectionElement.cpp HTMLTableRowElement.cpp HTMLTableElement.cpp HTMLTableColElement.cpp HTMLTableCellElement.cpp HTMLTableCaptionElement.cpp HTMLStyleElement.cpp HTMLSelectElement.cpp HTMLScriptElement.cpp HTMLQuoteElement.cpp HTMLPreElement.cpp HTMLParamElement.cpp HTMLParagraphElement.cpp HTMLOptionElement.cpp HTMLOptGroupElement.cpp HTMLObjectElement.cpp HTMLOListElement.cpp HTMLModElement.cpp HTMLMetaElement.cpp HTMLMenuElement.cpp HTMLMapElement.cpp HTMLLinkElement.cpp HTMLLegendElement.cpp HTMLLabelElement.cpp HTMLLIElement.cpp HTMLIsIndexElement.cpp HTMLInputElement.cpp HTMLImageElement.cpp HTMLIFrameElement.cpp HTMLHtmlElement.cpp HTMLHeadingElement.cpp HTMLHeadElement.cpp HTMLHRElement.cpp HTMLFrameSetElement.cpp HTMLFrameElement.cpp HTMLFormElement.cpp HTMLFontElement.cpp HTMLFieldSetElement.cpp HTMLElement.cpp HTMLDivElement.cpp HTMLDirectoryElement.cpp HTMLDListElement.cpp HTMLCollection.cpp HTMLButtonElement.cpp HTMLBodyElement.cpp HTMLBlockquoteElement.cpp HTMLBaseFontElement.cpp HTMLBaseElement.cpp HTMLBRElement.cpp HTMLAreaElement.cpp HTMLAppletElement.cpp HTMLAnchorElement.cpp Element.cpp Rect.cpp RGBColor.cpp Counter.cpp CSSValue.cpp CSSStyleDeclaration.cpp CSSPrimitiveValue.cpp CSSException.cpp StyleSheet.cpp CSSStyleSheet.cpp NamedNodeMap.cpp HTMLDocument.cpp DocumentType.cpp DocumentStyle.cpp DocumentFragment.cpp ReadWritePart.cpp PartSelectEvent.cpp PartActivateEvent.cpp OpenURLEvent.cpp MouseEvent.cpp GUIActivateEvent.cpp Event.cpp KDESupport.cpp NetAccess.cpp ReadOnlyPart.cpp Part.cpp KXYSelector.cpp KXMLGUIFactory.cpp KXMLGUIClient.cpp KXMLGUIBuilder.cpp KWritePermsIcon.cpp KWizard.cpp KUniqueApplication.cpp KURLRequesterDlg.cpp KURLRequester.cpp KURLLabel.cpp KURLDrag.cpp KURLCompletion.cpp KURLComboBox.cpp KURL.cpp KURIFilterPlugin.cpp KURIFilterData.cpp KURIFilter.cpp KTrader.cpp KToolBarSeparator.cpp KToolBarRadioGroup.cpp KToolBarButton.cpp KToolBar.cpp KToggleAction.cpp KTextBrowser.cpp KTempFile.cpp KTabCtl.cpp KSystemTray.cpp KSycocaEntry.cpp KSycoca.cpp KStringHandler.cpp KStdAction.cpp KStdAccel.cpp KStatusBarLabel.cpp KStatusBar.cpp KStaticDeleterBase.cpp KStandardDirs.cpp KSpellDlg.cpp KSpellConfig.cpp KSpell.cpp KSimpleConfig.cpp KShred.cpp KShellCompletion.cpp KShared.cpp KSessionManaged.cpp KServiceTypeProfile.cpp KServiceType.cpp KServiceOffer.cpp KServiceGroup.cpp KService.cpp KSeparator.cpp KSelector.cpp KSelectAction.cpp KSaveFile.cpp KSSLX509Map.cpp KSSLSettings.cpp KSSLPeerInfo.cpp KSSLInfoDlg.cpp KSSLConnectionInfo.cpp KSSLCertificateHome.cpp KSSLCertificate.cpp KSSL.cpp KRun.cpp KRuler.cpp KRootProp.cpp KRootPixmap.cpp KRootPermsIcon.cpp KRestrictedLine.cpp KRecentDocument.cpp KRandomSequence.cpp KRadioAction.cpp KRFCDate.cpp KProtocolManager.cpp KProtocolInfo.cpp KProgress.cpp KProcessRunner.cpp KProcessController.cpp KProcess.cpp KProcIO.cpp KPopupTitle.cpp KPopupMenu.cpp KPopupFrame.cpp KPixmapProvider.cpp KPixmapIO.cpp KPixmapEffect.cpp KPixmap.cpp KPasswordEdit.cpp KPasswordDialog.cpp KPanelMenu.cpp KPanelApplet.cpp KPalette.cpp KOpenWithDlg.cpp KNumInput.cpp KNotifyClient.cpp KMimeType.cpp KMessageBox.cpp KMenuBar.cpp KMainWindow.cpp KLocale.cpp KListView.cpp KListBox.cpp KLineEdit.cpp KLibLoader.cpp KLibFactory.cpp KLed.cpp KKeyDialog.cpp KKeyChooser.cpp KJanusWidget.cpp KIntValidator.cpp KIntSpinBox.cpp KIntNumInput.cpp KInstance.cpp KImageIO.cpp KImageEffect.cpp KIconView.cpp KIconLoader.cpp KIconEffect.cpp KIconDialog.cpp KIconCanvas.cpp KIconButton.cpp KIPC.cpp KHistoryCombo.cpp KHelpMenu.cpp KHTMLView.cpp KHTMLSettings.cpp KHTMLPart.cpp KGradientSelector.cpp KGlobal.cpp  KGlobalSettings.cpp KGlobalAccel.cpp KFontSizeAction.cpp KFontDialog.cpp KFontChooser.cpp KFontAction.cpp KFolderType.cpp KFileViewSignaler.cpp KFileView.cpp KFilePreview.cpp KFileListViewItem.cpp KFileItem.cpp KFileIconViewItem.cpp KFileIconView.cpp KFileFilter.cpp KFileDialog.cpp KFileDetailView.cpp KFile.cpp KExecMimeType.cpp KEntryKey.cpp KEntry.cpp KEditToolbarWidget.cpp KEditToolbar.cpp KEdReplace.cpp KEdGotoLine.cpp KEdFind.cpp KDualColorButton.cpp KDoubleNumInput.cpp KDockWidgetHeaderDrag.cpp KDockWidgetHeader.cpp KDockWidgetAbstractHeaderDrag.cpp KDockWidgetAbstractHeader.cpp KDirWatch.cpp KDirOperator.cpp KDialog.cpp KDesktopFile.cpp KDateValidator.cpp KDateTable.cpp KDatePicker.cpp KDEDesktopMimeType.cpp KDCOPPropertyProxy.cpp KDCOPActionProxy.cpp KCursor.cpp KContextMenuManager.cpp KConfigINIBackEnd.cpp KConfigGroupSaver.cpp KConfigBase.cpp KConfigBackEnd.cpp KConfig.cpp KCompletionBase.cpp KCompletion.cpp KComboBox.cpp KCombiView.cpp KColorDrag.cpp KColorCombo.cpp KColorButton.cpp TDECmdLineArgs.cpp KCharsets.cpp KCharSelectTable.cpp KCharSelect.cpp KCModule.cpp KButtonBox.cpp KBugReport.cpp KAuthIcon.cpp KAudioPlayer.cpp TDEApplication.cpp KAnimWidget.cpp KActionSeparator.cpp KActionMenu.cpp KActionCollection.cpp KAction.cpp KAccel.cpp KAboutWidget.cpp KAboutPerson.cpp KAboutKDE.cpp KAboutDialog.cpp KAboutData.cpp KAboutContainer.cpp KAboutApplication.cpp DCOPObjectProxy.cpp DCOPObject.cpp DCOPClient.cpp BrowserExtension.cpp 
+libkdejava_la_SOURCES = StoredTransferJob.cpp BrowserRun.cpp BrowserHostExtension.cpp WindowArgs.cpp URLArgs.cpp PartManager.cpp KNamedCommand.cpp KSSLCertBox.cpp TextEvent.cpp StatusBarExtension.cpp SkipDlg.cpp SessionData.cpp RangeException.cpp Plugin.cpp PasswordDialog.cpp PartBase.cpp Notation.cpp MutationEvent.cpp MultiGetJob.cpp LiveConnectExtension.cpp LinkStyle.cpp KZipFileEntry.cpp KZip.cpp KXMLGUI.cpp KWindowInfo.cpp KWidgetAction.cpp KURLBarItemDialog.cpp KTempDir.cpp KSyntaxHighlighter.cpp KSSLSigners.cpp KSSLPKCS7.cpp KSSLKeyGen.cpp KSSLCertificateFactory.cpp KSSLCertificateCache.cpp KSSLCertDlg.cpp KSpellingHighlighter.cpp KSMIMECrypto.cpp KSimpleFileFilter.cpp KShell.cpp KServiceSeparator.cpp KRegExpEditorInterface.cpp KPluginSelector.cpp KPassivePopup.cpp KPanelAppMenu.cpp KOCRDialog.cpp KMountPoint.cpp KMimeTypeValidator.cpp KMimeTypeResolverHelper.cpp KMimeTypeResolverBase.cpp KMD5.cpp KKeyNative.cpp KIDNA.cpp KFontRequester.cpp KFileShare.cpp KFilePlugin.cpp KDockArea.cpp KDiskFreeSp.cpp KDCOPServiceStarter.cpp KCustomMenuEditor.cpp KCPUInfo.cpp KConfigGroup.cpp KCMultiDialog.cpp KCModuleLoader.cpp KCModuleInfo.cpp KCalendarSystemFactory.cpp KAr.cpp KActiveLabel.cpp KActionShortcutList.cpp KAccelShortcutList.cpp HTMLFormCollection.cpp HistoryProvider.cpp Factory.cpp EventException.cpp Entity.cpp DOMImplementation.cpp DOMException.cpp CSSValueList.cpp CSSUnknownRule.cpp CSSStyleRule.cpp CSSPageRule.cpp CSSMediaRule.cpp CSSImportRule.cpp CSSFontFaceRule.cpp CSSCharsetRule.cpp KInputDialog.cpp KAsyncIO.cpp Observer.cpp RenameDlg.cpp KDirLister.cpp KBufferedIO.cpp AuthInfo.cpp SlaveInterface.cpp SlaveBase.cpp KShellProcess.cpp KMimeMagicResult.cpp KMimeMagic.cpp KFloatValidator.cpp KEdit.cpp DefaultProgress.cpp KURLComboRequester.cpp KToggleToolBarAction.cpp KTimeWidget.cpp KTextEdit.cpp KTabWidget.cpp KTabBar.cpp KStringListValidator.cpp KPasteTextAction.cpp KMdiToolViewAccessor.cpp KMdiWin32IconButton.cpp KMdiViewCloseEvent.cpp KMdiTaskBar.cpp KMdiTaskBarButton.cpp KMdiMainFrm.cpp KMdi.cpp KMdiChildView.cpp KMdiChildFrmResizeEndEvent.cpp KMdiChildFrmResizeBeginEvent.cpp KMdiChildFrmMoveEvent.cpp KMdiChildFrmDragEndEvent.cpp KMdiChildFrmDragBeginEvent.cpp KMdiChildFrm.cpp KMdiChildFrmCaption.cpp KMdiChildArea.cpp KKeyButton.cpp KDoubleValidator.cpp KCatalogue.cpp UIEvent.cpp PreviewJob.cpp Node.cpp MetaInfoJob.cpp KURLBarListBox.cpp KURLBarItem.cpp KURLBar.cpp KToggleFullScreenAction.cpp KSSLX509V3.cpp KSSLSession.cpp KSSLCertChain.cpp KShortcutList.cpp KSharedConfig.cpp KMimeSourceFactory.cpp KFileMetaInfoGroup.cpp KCalendarSystem.cpp EventListener.cpp DomShared.cpp Document.cpp DavJob.cpp CustomNodeFilter.cpp CSSRuleList.cpp CSSRule.cpp AbstractView.cpp KReplaceDialog.cpp KReplace.cpp KProgressDialog.cpp KPrintAction.cpp KMultiTabBarTab.cpp KMultiTabBar.cpp KMultiTabBarButton.cpp KFindDialog.cpp KFind.cpp KDateTimeWidget.cpp KArrowButton.cpp KRecentFilesAction.cpp KListAction.cpp KSSLCertDlgRet.cpp KDE.cpp KValueSelector.cpp KPaletteTable.cpp KHSSelector.cpp KColorPatch.cpp KColorDialog.cpp KColorCells.cpp KColor.cpp KURLPixmapProvider.cpp KDockWidget.cpp KDockTabGroup.cpp KDockManager.cpp KDockMainWindow.cpp KKeySequence.cpp ProgressBase.cpp StatusbarProgress.cpp Scheduler.cpp KIO.cpp KKey.cpp KShortcut.cpp KWordWrap.cpp KMultipleDrag.cpp KFileTreeViewToolTip.cpp KFileTreeViewItem.cpp KFileTreeView.cpp KFileTreeBranch.cpp KFileFilterCombo.cpp KEMailSettings.cpp KDirSelectDialog.cpp KDateWidget.cpp KDataToolInfo.cpp KDataToolAction.cpp KDataTool.cpp KStdGuiItem.cpp KIconViewItem.cpp KGuiItem.cpp KFileMetaInfoItem.cpp KFileMetaInfo.cpp KDialogBase.cpp KArchiveFile.cpp KArchiveEntry.cpp KSSLPKCS12.cpp KArchiveDirectory.cpp KTar.cpp KArchive.cpp KListViewItem.cpp KTipDialog.cpp KTipDatabase.cpp KDEJavaSlot.cpp KToolBarPopupAction.cpp KSqueezedTextLabel.cpp KScanDialog.cpp KPushButton.cpp KPreviewWidgetBase.cpp KPixmapSplitter.cpp KPanelExtension.cpp KMacroCommand.cpp KFontCombo.cpp KFilterDev.cpp KFilterBase.cpp KEditListBox.cpp KDialogQueue.cpp KCompletionBox.cpp KCommandHistory.cpp KCommand.cpp KCodecs.cpp KAboutTranslator.cpp KAboutContributor.cpp Slave.cpp Connection.cpp TransferJob.cpp StatJob.cpp SimpleJob.cpp MimetypeJob.cpp ListJob.cpp KDirSize.cpp KDirNotify.cpp Job.cpp FileCopyJob.cpp DeleteJob.cpp CopyJob.cpp CharacterData.cpp TreeWalker.cpp Text.cpp Range.cpp ProcessingInstruction.cpp NodeIterator.cpp NodeFilter.cpp EntityReference.cpp Comment.cpp CDATASection.cpp MainWindow.cpp DockMainWindow.cpp Attr.cpp HTMLUListElement.cpp HTMLTitleElement.cpp HTMLTextAreaElement.cpp HTMLTableSectionElement.cpp HTMLTableRowElement.cpp HTMLTableElement.cpp HTMLTableColElement.cpp HTMLTableCellElement.cpp HTMLTableCaptionElement.cpp HTMLStyleElement.cpp HTMLSelectElement.cpp HTMLScriptElement.cpp HTMLQuoteElement.cpp HTMLPreElement.cpp HTMLParamElement.cpp HTMLParagraphElement.cpp HTMLOptionElement.cpp HTMLOptGroupElement.cpp HTMLObjectElement.cpp HTMLOListElement.cpp HTMLModElement.cpp HTMLMetaElement.cpp HTMLMenuElement.cpp HTMLMapElement.cpp HTMLLinkElement.cpp HTMLLegendElement.cpp HTMLLabelElement.cpp HTMLLIElement.cpp HTMLIsIndexElement.cpp HTMLInputElement.cpp HTMLImageElement.cpp HTMLIFrameElement.cpp HTMLHtmlElement.cpp HTMLHeadingElement.cpp HTMLHeadElement.cpp HTMLHRElement.cpp HTMLFrameSetElement.cpp HTMLFrameElement.cpp HTMLFormElement.cpp HTMLFontElement.cpp HTMLFieldSetElement.cpp HTMLElement.cpp HTMLDivElement.cpp HTMLDirectoryElement.cpp HTMLDListElement.cpp HTMLCollection.cpp HTMLButtonElement.cpp HTMLBodyElement.cpp HTMLBlockquoteElement.cpp HTMLBaseFontElement.cpp HTMLBaseElement.cpp HTMLBRElement.cpp HTMLAreaElement.cpp HTMLAppletElement.cpp HTMLAnchorElement.cpp Element.cpp Rect.cpp RGBColor.cpp Counter.cpp CSSValue.cpp CSSStyleDeclaration.cpp CSSPrimitiveValue.cpp CSSException.cpp StyleSheet.cpp CSSStyleSheet.cpp NamedNodeMap.cpp HTMLDocument.cpp DocumentType.cpp DocumentStyle.cpp DocumentFragment.cpp ReadWritePart.cpp PartSelectEvent.cpp PartActivateEvent.cpp OpenURLEvent.cpp MouseEvent.cpp GUIActivateEvent.cpp Event.cpp KDESupport.cpp NetAccess.cpp ReadOnlyPart.cpp Part.cpp KXYSelector.cpp KXMLGUIFactory.cpp KXMLGUIClient.cpp KXMLGUIBuilder.cpp KWritePermsIcon.cpp KWizard.cpp KUniqueApplication.cpp KURLRequesterDlg.cpp KURLRequester.cpp KURLLabel.cpp KURLDrag.cpp KURLCompletion.cpp KURLComboBox.cpp KURL.cpp KURIFilterPlugin.cpp KURIFilterData.cpp KURIFilter.cpp KTrader.cpp KToolBarSeparator.cpp KToolBarRadioGroup.cpp KToolBarButton.cpp KToolBar.cpp KToggleAction.cpp KTextBrowser.cpp KTempFile.cpp KTabCtl.cpp KSystemTray.cpp KSycocaEntry.cpp KSycoca.cpp KStringHandler.cpp KStdAction.cpp KStdAccel.cpp KStatusBarLabel.cpp KStatusBar.cpp KStaticDeleterBase.cpp KStandardDirs.cpp KSpellDlg.cpp KSpellConfig.cpp KSpell.cpp KSimpleConfig.cpp KShred.cpp KShellCompletion.cpp KShared.cpp KSessionManaged.cpp KServiceTypeProfile.cpp KServiceType.cpp KServiceOffer.cpp KServiceGroup.cpp KService.cpp KSeparator.cpp KSelector.cpp KSelectAction.cpp KSaveFile.cpp KSSLX509Map.cpp KSSLSettings.cpp KSSLPeerInfo.cpp KSSLInfoDlg.cpp KSSLConnectionInfo.cpp KSSLCertificateHome.cpp KSSLCertificate.cpp KSSL.cpp KRun.cpp KRuler.cpp KRootProp.cpp KRootPixmap.cpp KRootPermsIcon.cpp KRestrictedLine.cpp KRecentDocument.cpp KRandomSequence.cpp KRadioAction.cpp KRFCDate.cpp KProtocolManager.cpp KProtocolInfo.cpp KProgress.cpp KProcessRunner.cpp KProcessController.cpp KProcess.cpp KProcIO.cpp KPopupTitle.cpp KPopupMenu.cpp KPopupFrame.cpp KPixmapProvider.cpp KPixmapIO.cpp KPixmapEffect.cpp KPixmap.cpp KPasswordEdit.cpp KPasswordDialog.cpp KPanelMenu.cpp KPanelApplet.cpp KPalette.cpp KOpenWithDlg.cpp KNumInput.cpp KNotifyClient.cpp KMimeType.cpp KMessageBox.cpp KMenuBar.cpp KMainWindow.cpp KLocale.cpp KListView.cpp KListBox.cpp KLineEdit.cpp KLibLoader.cpp KLibFactory.cpp KLed.cpp KKeyDialog.cpp KKeyChooser.cpp KJanusWidget.cpp KIntValidator.cpp KIntSpinBox.cpp KIntNumInput.cpp TDEInstance.cpp KImageIO.cpp KImageEffect.cpp KIconView.cpp KIconLoader.cpp KIconEffect.cpp KIconDialog.cpp KIconCanvas.cpp KIconButton.cpp KIPC.cpp KHistoryCombo.cpp KHelpMenu.cpp KHTMLView.cpp KHTMLSettings.cpp KHTMLPart.cpp KGradientSelector.cpp KGlobal.cpp  KGlobalSettings.cpp KGlobalAccel.cpp KFontSizeAction.cpp KFontDialog.cpp KFontChooser.cpp KFontAction.cpp KFolderType.cpp KFileViewSignaler.cpp KFileView.cpp KFilePreview.cpp KFileListViewItem.cpp KFileItem.cpp KFileIconViewItem.cpp KFileIconView.cpp KFileFilter.cpp KFileDialog.cpp KFileDetailView.cpp KFile.cpp KExecMimeType.cpp KEntryKey.cpp KEntry.cpp KEditToolbarWidget.cpp KEditToolbar.cpp KEdReplace.cpp KEdGotoLine.cpp KEdFind.cpp KDualColorButton.cpp KDoubleNumInput.cpp KDockWidgetHeaderDrag.cpp KDockWidgetHeader.cpp KDockWidgetAbstractHeaderDrag.cpp KDockWidgetAbstractHeader.cpp KDirWatch.cpp KDirOperator.cpp KDialog.cpp KDesktopFile.cpp KDateValidator.cpp KDateTable.cpp KDatePicker.cpp KDEDesktopMimeType.cpp KDCOPPropertyProxy.cpp KDCOPActionProxy.cpp KCursor.cpp KContextMenuManager.cpp KConfigINIBackEnd.cpp KConfigGroupSaver.cpp KConfigBase.cpp KConfigBackEnd.cpp KConfig.cpp KCompletionBase.cpp KCompletion.cpp KComboBox.cpp KCombiView.cpp KColorDrag.cpp KColorCombo.cpp KColorButton.cpp TDECmdLineArgs.cpp KCharsets.cpp KCharSelectTable.cpp KCharSelect.cpp KCModule.cpp KButtonBox.cpp KBugReport.cpp KAuthIcon.cpp KAudioPlayer.cpp TDEApplication.cpp KAnimWidget.cpp KActionSeparator.cpp KActionMenu.cpp KActionCollection.cpp KAction.cpp KAccel.cpp KAboutWidget.cpp KAboutPerson.cpp KAboutKDE.cpp KAboutDialog.cpp TDEAboutData.cpp KAboutContainer.cpp KAboutApplication.cpp DCOPObjectProxy.cpp DCOPObject.cpp DCOPClient.cpp BrowserExtension.cpp 
 
 
-EXTRA_DIST = BrowserExtension.h DCOPClient.h DCOPObject.h DCOPObjectInterface.h DCOPObjectProxy.h KAboutApplication.h KAboutContainer.h KAboutData.h KAboutDialog.h KAboutKDE.h KAboutPerson.h KAboutWidget.h KAccel.h KAction.h KActionCollection.h KActionMenu.h KActionSeparator.h KAnimWidget.h TDEApplication.h KAudioPlayer.h KAuthIcon.h KBugReport.h KButtonBox.h KCModule.h KCharSelect.h KCharSelectTable.h KCharsets.h TDECmdLineArgs.h KColorButton.h KColorCombo.h KColorDrag.h KCombiView.h KComboBox.h KCompletion.h KCompletionBase.h KCompletionBaseInterface.h KConfig.h KConfigBackEnd.h KConfigBase.h KConfigGroupSaver.h KConfigINIBackEnd.h KContextMenuManager.h KCursor.h KDCOPActionProxy.h KDCOPPropertyProxy.h KDEDesktopMimeType.h KDateInternalMonthPicker.h KDateInternalYearSelector.h KDatePicker.h KDateTable.h KDateValidator.h KDesktopFile.h KDialog.h KDialogBase.h KDirOperator.h KDirWatch.h KDockWidgetAbstractHeader.h KDockWidgetAbstractHeaderDrag.h KDockWidgetHeader.h KDockWidgetHeaderDrag.h KDoubleNumInput.h KDualColorButton.h KEdFind.h KEdGotoLine.h KEdReplace.h KEditToolbar.h KEditToolbarWidget.h KEntry.h KEntryKey.h KExecMimeType.h KFile.h KFileDetailView.h KFileDialog.h KFileFilter.h KFileIconView.h KFileIconViewItem.h KFileItem.h KFileListViewItem.h KFilePreview.h KFileView.h KFileViewInterface.h KFileViewSignaler.h KFolderType.h KFontAction.h KFontChooser.h KFontDialog.h KFontSizeAction.h KGlobal.h KGlobalAccel.h KGlobalSettings.h KGradientSelector.h KHTMLPart.h KHTMLSettings.h KHTMLView.h KHelpMenu.h KHistoryCombo.h KIPC.h KIconButton.h KIconCanvas.h KIconDialog.h KIconEffect.h KIconLoader.h KIconView.h KImageEffect.h KImageIO.h KInstance.h KInstanceInterface.h KIntNumInput.h KIntSpinBox.h KIntValidator.h KJanusWidget.h KKeyChooser.h KKeyDialog.h KLed.h KLibFactory.h KLibLoader.h KLineEdit.h KListBox.h KListView.h KLocale.h KMainWindow.h KMenuBar.h KMessageBox.h KMimeType.h KNotifyClient.h KNumInput.h KOpenWithDlg.h KPalette.h KPanelApplet.h KPanelMenu.h KPasswordDialog.h KPasswordEdit.h KPixmap.h KPixmapEffect.h KPixmapIO.h KPixmapProvider.h KPopupFrame.h KPopupMenu.h KPopupTitle.h KProcIO.h KProcess.h KProcessController.h KProcessRunner.h KProgress.h KProtocolInfo.h KProtocolManager.h KRFCDate.h KRadioAction.h KRandomSequence.h KRecentDocument.h KRestrictedLine.h KRootPermsIcon.h KRootPixmap.h KRootProp.h KRuler.h KRun.h KSSL.h KSSLCertificate.h KSSLCertificateHome.h KSSLConnectionInfo.h KSSLInfoDlg.h KSSLPeerInfo.h KSSLSettings.h KSSLX509Map.h KSaveFile.h KSelectAction.h KSelector.h KSeparator.h KService.h KServiceGroup.h KServiceOffer.h KServiceType.h KServiceTypeProfile.h KSessionManaged.h KShared.h KShellCompletion.h KShred.h KSimpleConfig.h KSpell.h KSpellConfig.h KSpellDlg.h KStandardDirs.h KStaticDeleterBase.h KStatusBar.h KStatusBarLabel.h KStdAccel.h KStdAction.h KStringHandler.h KSycoca.h KSycocaEntry.h KSystemTray.h KTabCtl.h KTempFile.h KTextBrowser.h KToggleAction.h KToolBar.h KToolBarButton.h KToolBarRadioGroup.h KToolBarSeparator.h KTrader.h KURIFilter.h KURIFilterData.h KURIFilterPlugin.h KURL.h KURLComboBox.h KURLCompletion.h KURLDrag.h KURLLabel.h KURLRequester.h KURLRequesterDlg.h KUniqueApplication.h KWizard.h KWritePermsIcon.h KXMLGUIBuilder.h KXMLGUIBuilderInterface.h KXMLGUIClient.h KXMLGUIClientInterface.h KXMLGUIFactory.h KXYSelector.h Part.h PartBaseInterface.h ReadOnlyPart.h BrowserExtension.cpp DCOPClient.cpp DCOPObject.cpp DCOPObjectProxy.cpp KAboutApplication.cpp KAboutContainer.cpp KAboutData.cpp KAboutDialog.cpp KAboutKDE.cpp KAboutPerson.cpp KAboutWidget.cpp KAccel.cpp KAction.cpp KActionCollection.cpp KActionMenu.cpp KActionSeparator.cpp KAnimWidget.cpp TDEApplication.cpp KAudioPlayer.cpp KAuthIcon.cpp KBugReport.cpp KButtonBox.cpp KCModule.cpp KCharSelect.cpp KCharSelectTable.cpp KCharsets.cpp TDECmdLineArgs.cpp KColorButton.cpp KColorCombo.cpp KColorDrag.cpp KCombiView.cpp KComboBox.cpp KCompletion.cpp KCompletionBase.cpp KConfig.cpp KConfigBackEnd.cpp KConfigBase.cpp KConfigGroupSaver.cpp KConfigINIBackEnd.cpp KContextMenuManager.cpp KCursor.cpp KDCOPActionProxy.cpp KDCOPPropertyProxy.cpp KDEDesktopMimeType.cpp KDatePicker.cpp KDateTable.cpp KDateValidator.cpp KDesktopFile.cpp KDialog.cpp KDirOperator.cpp KDirWatch.cpp KDockWidgetAbstractHeader.cpp KDockWidgetAbstractHeaderDrag.cpp KDockWidgetHeader.cpp KDockWidgetHeaderDrag.cpp KDoubleNumInput.cpp KDualColorButton.cpp KEdFind.cpp KEdGotoLine.cpp KEdReplace.cpp KEditToolbar.cpp KEditToolbarWidget.cpp KEntry.cpp KEntryKey.cpp KExecMimeType.cpp KFile.cpp KFileDetailView.cpp KFileDialog.cpp KFileFilter.cpp KFileIconView.cpp KFileIconViewItem.cpp KFileItem.cpp KFileListViewItem.cpp KFilePreview.cpp KFileView.cpp KFileViewSignaler.cpp KFolderType.cpp KFontAction.cpp KFontChooser.cpp KFontDialog.cpp KFontSizeAction.cpp KGlobal.cpp KGlobalAccel.cpp KGlobalSettings.cpp KGradientSelector.cpp KHTMLPart.cpp KHTMLSettings.cpp KHTMLView.cpp KHelpMenu.cpp KHistoryCombo.cpp KIPC.cpp KIconButton.cpp KIconCanvas.cpp KIconDialog.cpp KIconEffect.cpp KIconLoader.cpp KIconView.cpp KImageEffect.cpp KImageIO.cpp KInstance.cpp KIntNumInput.cpp KIntSpinBox.cpp KIntValidator.cpp KJanusWidget.cpp KKeyChooser.cpp KKeyDialog.cpp KLed.cpp KLibFactory.cpp KLibLoader.cpp KLineEdit.cpp KListBox.cpp KListView.cpp KLocale.cpp KMainWindow.cpp KMenuBar.cpp KMessageBox.cpp KMimeType.cpp KNotifyClient.cpp KNumInput.cpp KOpenWithDlg.cpp KPalette.cpp KPanelApplet.cpp KPanelMenu.cpp KPasswordDialog.cpp KPasswordEdit.cpp KPixmap.cpp KPixmapEffect.cpp KPixmapIO.cpp KPixmapProvider.cpp KPopupFrame.cpp KPopupMenu.cpp KPopupTitle.cpp KProcIO.cpp KProcess.cpp KProcessController.cpp KProcessRunner.cpp KProgress.cpp KProtocolInfo.cpp KProtocolManager.cpp KRFCDate.cpp KRadioAction.cpp KRandomSequence.cpp KRecentDocument.cpp KRestrictedLine.cpp KRootPermsIcon.cpp KRootPixmap.cpp KRootProp.cpp KRuler.cpp KRun.cpp KSSL.cpp KSSLCertificate.cpp KSSLCertificateHome.cpp KSSLConnectionInfo.cpp KSSLInfoDlg.cpp KSSLPeerInfo.cpp KSSLSettings.cpp KSSLX509Map.cpp KSaveFile.cpp KSelectAction.cpp KSelector.cpp KSeparator.cpp KService.cpp KServiceGroup.cpp KServiceOffer.cpp KServiceType.cpp KServiceTypeProfile.cpp KSessionManaged.cpp KShared.cpp KShellCompletion.cpp KShred.cpp KSimpleConfig.cpp KSpell.cpp KSpellConfig.cpp KSpellDlg.cpp KStandardDirs.cpp KStaticDeleterBase.cpp KStatusBar.cpp KStatusBarLabel.cpp KStdAccel.cpp KStdAction.cpp KStringHandler.cpp KSycoca.cpp KSycocaEntry.cpp KSystemTray.cpp KTabCtl.cpp KTempFile.cpp KTextBrowser.cpp KToggleAction.cpp KToolBar.cpp KToolBarButton.cpp KToolBarRadioGroup.cpp KToolBarSeparator.cpp KTrader.cpp KURIFilter.cpp KURIFilterData.cpp KURIFilterPlugin.cpp KURL.cpp KURLComboBox.cpp KURLCompletion.cpp KURLDrag.cpp KURLLabel.cpp KURLRequester.cpp KURLRequesterDlg.cpp KUniqueApplication.cpp KWizard.cpp KWritePermsIcon.cpp KXMLGUIBuilder.cpp KXMLGUIClient.cpp KXMLGUIFactory.cpp KXYSelector.cpp Part.cpp ReadOnlyPart.cpp NetAccess.cpp NetAccess.h KDESupport.cpp Event.cpp GUIActivateEvent.cpp MouseEvent.cpp OpenURLEvent.cpp PartActivateEvent.cpp PartSelectEvent.cpp ReadWritePart.cpp DocumentFragment.cpp DocumentStyle.cpp DocumentType.cpp HTMLDocument.cpp NamedNodeMap.cpp CSSStyleSheet.cpp StyleSheet.cpp CSSException.cpp CSSPrimitiveValue.cpp CSSStyleDeclaration.cpp CSSValue.cpp Counter.cpp RGBColor.cpp Rect.cpp Element.cpp HTMLAnchorElement.cpp HTMLAppletElement.cpp HTMLAreaElement.cpp HTMLBRElement.cpp HTMLBaseElement.cpp HTMLBaseFontElement.cpp HTMLBlockquoteElement.cpp HTMLBodyElement.cpp HTMLButtonElement.cpp HTMLCollection.cpp HTMLDListElement.cpp HTMLDirectoryElement.cpp HTMLDivElement.cpp HTMLElement.cpp HTMLFieldSetElement.cpp HTMLFontElement.cpp HTMLFormElement.cpp HTMLFrameElement.cpp HTMLFrameSetElement.cpp HTMLHRElement.cpp HTMLHeadElement.cpp HTMLHeadingElement.cpp HTMLHtmlElement.cpp HTMLIFrameElement.cpp HTMLImageElement.cpp HTMLInputElement.cpp HTMLIsIndexElement.cpp HTMLLIElement.cpp HTMLLabelElement.cpp HTMLLegendElement.cpp HTMLLinkElement.cpp HTMLMapElement.cpp HTMLMenuElement.cpp HTMLMetaElement.cpp HTMLModElement.cpp HTMLOListElement.cpp HTMLObjectElement.cpp HTMLOptGroupElement.cpp HTMLOptionElement.cpp HTMLParagraphElement.cpp HTMLParamElement.cpp HTMLPreElement.cpp HTMLQuoteElement.cpp HTMLScriptElement.cpp HTMLSelectElement.cpp HTMLStyleElement.cpp HTMLTableCaptionElement.cpp HTMLTableCellElement.cpp HTMLTableColElement.cpp HTMLTableElement.cpp HTMLTableRowElement.cpp HTMLTableSectionElement.cpp HTMLTextAreaElement.cpp HTMLTitleElement.cpp HTMLUListElement.cpp Attr.cpp Attr.h CSSException.h CSSPrimitiveValue.h CSSStyleDeclaration.h CSSStyleSheet.h CSSValue.h Counter.h DocumentFragment.h DocumentStyle.h DocumentType.h Element.h Event.h GUIActivateEvent.h HTMLAnchorElement.h HTMLAppletElement.h HTMLAreaElement.h HTMLBRElement.h HTMLBaseElement.h HTMLBaseFontElement.h HTMLBlockquoteElement.h HTMLBodyElement.h HTMLButtonElement.h HTMLCollection.h HTMLDListElement.h HTMLDirectoryElement.h HTMLDivElement.h HTMLDocument.h HTMLElement.h HTMLFieldSetElement.h HTMLFontElement.h HTMLFormElement.h HTMLFrameElement.h HTMLFrameSetElement.h HTMLHRElement.h HTMLHeadElement.h HTMLHeadingElement.h HTMLHtmlElement.h HTMLIFrameElement.h HTMLImageElement.h HTMLInputElement.h HTMLIsIndexElement.h HTMLLIElement.h HTMLLabelElement.h HTMLLegendElement.h HTMLLinkElement.h HTMLMapElement.h HTMLMenuElement.h HTMLMetaElement.h HTMLModElement.h HTMLOListElement.h HTMLObjectElement.h HTMLOptGroupElement.h HTMLOptionElement.h HTMLParagraphElement.h HTMLParamElement.h HTMLPreElement.h HTMLQuoteElement.h HTMLScriptElement.h HTMLSelectElement.h HTMLStyleElement.h HTMLTableCaptionElement.h HTMLTableCellElement.h HTMLTableColElement.h HTMLTableElement.h HTMLTableRowElement.h HTMLTableSectionElement.h HTMLTextAreaElement.h HTMLTitleElement.h HTMLUListElement.h MouseEvent.h NamedNodeMap.h OpenURLEvent.h PartActivateEvent.h PartSelectEvent.h RGBColor.h ReadWritePart.h Rect.h StyleSheet.h DockMainWindow.cpp MainWindow.cpp DockMainWindow.h MainWindow.h CDATASection.cpp Comment.cpp EntityReference.cpp NodeFilter.cpp NodeIterator.cpp ProcessingInstruction.cpp Range.cpp Text.cpp TreeWalker.cpp CharacterData.cpp CDATASection.h CharacterData.h Comment.h EntityReference.h NodeFilter.h NodeIterator.h ProcessingInstruction.h Range.h Text.h TreeWalker.h CopyJob.cpp DeleteJob.cpp FileCopyJob.cpp Job.cpp KDirNotify.cpp KDirSize.cpp ListJob.cpp MimetypeJob.cpp SimpleJob.cpp StatJob.cpp TransferJob.cpp Connection.cpp Slave.cpp Connection.h CopyJob.h DeleteJob.h FileCopyJob.h Job.h KDirNotify.h KDirSize.h ListJob.h MimetypeJob.h SimpleJob.h Slave.h StatJob.h TransferJob.h KAboutContributor.cpp KAboutContributor.h KAboutTranslator.cpp KAboutTranslator.h KCodecs.cpp KCodecs.h KCommand.cpp KCommand.h KCommandHistory.cpp KCommandHistory.h KCompletionBox.cpp KCompletionBox.h KDialogQueue.cpp KDialogQueue.h KEditListBox.cpp KEditListBox.h KFilterBase.cpp KFilterBase.h KFilterDev.cpp KFilterDev.h KFontCombo.cpp KFontCombo.h KMacroCommand.cpp KMacroCommand.h KPanelExtension.cpp KPanelExtension.h KPixmapSplitter.cpp KPixmapSplitter.h KPreviewWidgetBase.cpp KPreviewWidgetBase.h KPushButton.cpp KPushButton.h KScanDialog.cpp KScanDialog.h KSqueezedTextLabel.cpp KSqueezedTextLabel.h KToolBarPopupAction.cpp KToolBarPopupAction.h KDEJavaSlot.cpp KDEJavaSlot.h KTipDatabase.cpp KTipDialog.cpp KTipDatabase.h KTipDialog.h ASConsumer.java KListViewItem.cpp KListViewItem.h KArchive.cpp KArchive.h KTar.cpp KTar.h KArchiveDirectory.cpp KSSLPKCS12.cpp KArchiveDirectory.h KSSLPKCS12.h KArchiveEntry.cpp KArchiveFile.cpp KArchiveEntry.h KArchiveFile.h KDialogBase.cpp KFileMetaInfo.cpp KFileMetaInfo.h KFileMetaInfoItem.cpp KFileMetaInfoItem.h KGuiItem.cpp KGuiItem.h KIconViewItem.cpp KIconViewItem.h KStdGuiItem.cpp KStdGuiItem.h KDataTool.cpp KDataToolAction.cpp KDataToolInfo.cpp KDateWidget.cpp KDirSelectDialog.cpp KEMailSettings.cpp KFileFilterCombo.cpp KFileTreeBranch.cpp KFileTreeView.cpp KFileTreeViewItem.cpp KFileTreeViewToolTip.cpp KMultipleDrag.cpp KWordWrap.cpp KDataTool.h KDataToolAction.h KDataToolInfo.h KDateWidget.h KDirSelectDialog.h KFileTreeBranch.h KFileTreeView.h KFileTreeViewItem.h KFileTreeViewToolTip.h KEMailSettings.h KFileFilterCombo.h KMultipleDrag.h KWordWrap.h KShortcut.cpp KKey.cpp KKey.h KShortcut.h KIO.cpp KIO.h Scheduler.cpp Scheduler.h StatusbarProgress.cpp StatusbarProgress.h ProgressBase.cpp ProgressBase.h KKeySequence.cpp KKeySequence.h KDockMainWindow.cpp KDockMainWindow.h KDockManager.cpp KDockManager.h KDockTabGroup.cpp KDockTabGroup.h KDockWidget.cpp KDockWidget.h KURLPixmapProvider.cpp KURLPixmapProvider.h KColor.cpp KColor.h KColorCells.cpp KColorCells.h KColorDialog.cpp KColorDialog.h KColorPatch.cpp KColorPatch.h KHSSelector.cpp KHSSelector.h KPaletteTable.cpp KPaletteTable.h KValueSelector.cpp KValueSelector.h KDE.cpp KDE.h KSSLCertDlgRet.cpp KSSLCertDlgRet.h KListAction.cpp KListAction.h KRecentFilesAction.cpp KRecentFilesAction.h KArrowButton.cpp KArrowButton.h KDateTimeWidget.cpp KDateTimeWidget.h KFind.cpp KFindDialog.cpp KFindDialog.h KFind.h KMultiTabBarButton.cpp KMultiTabBarButton.h KMultiTabBar.cpp KMultiTabBar.h KMultiTabBarTab.cpp KMultiTabBarTab.h KPrintAction.cpp KPrintAction.h KProgressDialog.cpp KProgressDialog.h KReplace.cpp KReplaceDialog.cpp KReplaceDialog.h KReplace.h AbstractView.cpp AbstractView.h CSSRule.cpp CSSRule.h CSSRuleList.cpp CSSRuleList.h CustomNodeFilter.cpp CustomNodeFilter.h DavJob.cpp DavJob.h Document.cpp Document.h DomShared.cpp DomShared.h EventListener.cpp EventListener.h KCalendarSystem.cpp KCalendarSystem.h KFileMetaInfoGroup.cpp KFileMetaInfoGroup.h KMimeSourceFactory.cpp KMimeSourceFactory.h KSharedConfig.cpp KSharedConfig.h KShortcutList.cpp KShortcutList.h KSSLCertBox.h KSSLCertBox.java KSSLCertChain.cpp KSSLCertChain.h KSSLSession.cpp KSSLSession.h KSSLX509V3.cpp KSSLX509V3.h KToggleFullScreenAction.cpp KToggleFullScreenAction.h KURLBar.cpp KURLBar.h KURLBarItem.cpp KURLBarItem.h KURLBarListBox.cpp KURLBarListBox.h MetaInfoJob.cpp MetaInfoJob.h Node.cpp Node.h PreviewJob.cpp PreviewJob.h UIEvent.cpp UIEvent.h KCatalogue.cpp KCatalogue.h KDoubleValidator.cpp KDoubleValidator.h KKeyButton.cpp KKeyButton.h KMdiToolViewAccessor.cpp KMdiToolViewAccessor.h KMdiChildArea.cpp KMdiChildArea.h KMdiChildFrmCaption.cpp KMdiChildFrmCaption.h KMdiChildFrm.cpp KMdiChildFrmDragBeginEvent.cpp KMdiChildFrmDragBeginEvent.h KMdiChildFrmDragEndEvent.cpp KMdiChildFrmDragEndEvent.h KMdiChildFrm.h KMdiChildFrmMoveEvent.cpp KMdiChildFrmMoveEvent.h KMdiChildFrmResizeBeginEvent.cpp KMdiChildFrmResizeBeginEvent.h KMdiChildFrmResizeEndEvent.cpp KMdiChildFrmResizeEndEvent.h KMdiChildView.cpp KMdiChildView.h KMdi.cpp KMdi.h KMdiMainFrm.cpp KMdiMainFrm.h KMdiTaskBarButton.cpp KMdiTaskBarButton.h KMdiTaskBar.cpp KMdiTaskBar.h KMdiViewCloseEvent.cpp KMdiViewCloseEvent.h KMdiWin32IconButton.cpp KMdiWin32IconButton.h KPasteTextAction.cpp KPasteTextAction.h KStringListValidator.cpp KStringListValidator.h KTabBar.cpp KTabBar.h KTabWidget.cpp KTabWidget.h KTextEdit.cpp KTextEdit.h KTimeWidget.cpp KTimeWidget.h KToggleToolBarAction.cpp KToggleToolBarAction.h KURLComboRequester.cpp KURLComboRequester.h DefaultProgress.h SlaveBase.h DefaultProgress.cpp KEdit.cpp KEdit.h KFloatValidator.cpp KFloatValidator.h KMimeMagic.cpp KMimeMagic.h KMimeMagicResult.cpp KMimeMagicResult.h KShellProcess.cpp KShellProcess.h SlaveBase.cpp SlaveInterface.cpp SlaveInterface.h AuthInfo.cpp KBufferedIO.cpp KDirLister.cpp RenameDlg.cpp Observer.cpp KAsyncIO.cpp AuthInfo.h KAsyncIO.h KBufferedIO.h KDirLister.h Observer.h RenameDlg.h KInputDialog.cpp KInputDialog.h CSSCharsetRule.cpp CSSCharsetRule.h CSSFontFaceRule.cpp CSSFontFaceRule.h CSSImportRule.cpp CSSImportRule.h CSSMediaRule.cpp CSSMediaRule.h CSSPageRule.cpp CSSPageRule.h CSSStyleRule.cpp CSSStyleRule.h CSSUnknownRule.cpp CSSUnknownRule.h CSSValueList.cpp CSSValueList.h DOMException.cpp DOMException.h DOMImplementation.cpp DOMImplementation.h Entity.cpp Entity.h EventException.cpp EventException.h Factory.cpp Factory.h HistoryProvider.cpp HistoryProvider.h HTMLFormCollection.cpp HTMLFormCollection.h KAccelShortcutList.cpp KAccelShortcutList.h KActionShortcutList.cpp KActionShortcutList.h KActiveLabel.cpp KActiveLabel.h KAr.cpp KAr.h KCalendarSystemFactory.cpp KCalendarSystemFactory.h KCModuleInfo.cpp KCModuleInfo.h KCModuleLoader.cpp KCModuleLoader.h KCMultiDialog.cpp KCMultiDialog.h KConfigGroup.cpp KConfigGroup.h KCPUInfo.cpp KCPUInfo.h KCustomMenuEditor.cpp KCustomMenuEditor.h KDCOPServiceStarter.cpp KDCOPServiceStarter.h KDiskFreeSp.cpp KDiskFreeSp.h KDockArea.cpp KDockArea.h KFilePlugin.cpp KFilePlugin.h KFileShare.cpp KFileShare.h KFontRequester.cpp KFontRequester.h KIDNA.cpp KIDNA.h KKeyNative.cpp KKeyNative.h KMD5.cpp KMD5.h KMimeTypeResolverBase.cpp KMimeTypeResolverBase.h KMimeTypeResolverHelper.cpp KMimeTypeResolverHelper.h KMimeTypeValidator.cpp KMimeTypeValidator.h KMountPoint.cpp KMountPoint.h KOCRDialog.cpp KOCRDialog.h KPanelAppMenu.cpp KPanelAppMenu.h KPassivePopup.cpp KPassivePopup.h KPluginSelector.cpp KPluginSelector.h KRegExpEditorInterface.cpp KRegExpEditorInterface.h KServiceSeparator.cpp KServiceSeparator.h KShell.cpp KShell.h KSimpleFileFilter.cpp KSimpleFileFilter.h KSMIMECrypto.cpp KSMIMECrypto.h KSpellingHighlighter.cpp KSpellingHighlighter.h KSSLCertDlg.cpp KSSLCertDlg.h KSSLCertificateCache.cpp KSSLCertificateCache.h KSSLCertificateFactory.cpp KSSLCertificateFactory.h KSSLKeyGen.cpp KSSLKeyGen.h KSSLPKCS7.cpp KSSLPKCS7.h KSSLSigners.cpp KSSLSigners.h KSyntaxHighlighter.cpp KSyntaxHighlighter.h KTempDir.cpp KTempDir.h KURLBarItemDialog.cpp KURLBarItemDialog.h KWidgetAction.cpp KWidgetAction.h KWindowInfo.cpp KWindowInfo.h KXMLGUI.cpp KXMLGUI.h KZip.cpp KZipFileEntry.cpp KZipFileEntry.h KZip.h LinkStyle.cpp LinkStyle.h LiveConnectExtension.cpp LiveConnectExtension.h MultiGetJob.cpp MultiGetJob.h MutationEvent.cpp MutationEvent.h Notation.cpp Notation.h PartBase.cpp PartBase.h PasswordDialog.cpp PasswordDialog.h Plugin.cpp Plugin.h RangeException.cpp RangeException.h SessionData.cpp SessionData.h SkipDlg.cpp SkipDlg.h StatusBarExtension.cpp StatusBarExtension.h TextEvent.cpp TextEvent.h KSSLCertBox.cpp KNamedCommand.cpp KNamedCommand.h PartManager.cpp PartManager.h URLArgs.cpp UrlArgs.h WindowArgs.cpp WindowArgs.h BrowserHostExtension.cpp BrowserHostExtension.h BrowserRun.cpp BrowserRun.h StoredTransferJob.cpp StoredTransferJob.h 
+EXTRA_DIST = BrowserExtension.h DCOPClient.h DCOPObject.h DCOPObjectInterface.h DCOPObjectProxy.h KAboutApplication.h KAboutContainer.h TDEAboutData.h KAboutDialog.h KAboutKDE.h KAboutPerson.h KAboutWidget.h KAccel.h KAction.h KActionCollection.h KActionMenu.h KActionSeparator.h KAnimWidget.h TDEApplication.h KAudioPlayer.h KAuthIcon.h KBugReport.h KButtonBox.h KCModule.h KCharSelect.h KCharSelectTable.h KCharsets.h TDECmdLineArgs.h KColorButton.h KColorCombo.h KColorDrag.h KCombiView.h KComboBox.h KCompletion.h KCompletionBase.h KCompletionBaseInterface.h KConfig.h KConfigBackEnd.h KConfigBase.h KConfigGroupSaver.h KConfigINIBackEnd.h KContextMenuManager.h KCursor.h KDCOPActionProxy.h KDCOPPropertyProxy.h KDEDesktopMimeType.h KDateInternalMonthPicker.h KDateInternalYearSelector.h KDatePicker.h KDateTable.h KDateValidator.h KDesktopFile.h KDialog.h KDialogBase.h KDirOperator.h KDirWatch.h KDockWidgetAbstractHeader.h KDockWidgetAbstractHeaderDrag.h KDockWidgetHeader.h KDockWidgetHeaderDrag.h KDoubleNumInput.h KDualColorButton.h KEdFind.h KEdGotoLine.h KEdReplace.h KEditToolbar.h KEditToolbarWidget.h KEntry.h KEntryKey.h KExecMimeType.h KFile.h KFileDetailView.h KFileDialog.h KFileFilter.h KFileIconView.h KFileIconViewItem.h KFileItem.h KFileListViewItem.h KFilePreview.h KFileView.h KFileViewInterface.h KFileViewSignaler.h KFolderType.h KFontAction.h KFontChooser.h KFontDialog.h KFontSizeAction.h KGlobal.h KGlobalAccel.h KGlobalSettings.h KGradientSelector.h KHTMLPart.h KHTMLSettings.h KHTMLView.h KHelpMenu.h KHistoryCombo.h KIPC.h KIconButton.h KIconCanvas.h KIconDialog.h KIconEffect.h KIconLoader.h KIconView.h KImageEffect.h KImageIO.h TDEInstance.h TDEInstanceInterface.h KIntNumInput.h KIntSpinBox.h KIntValidator.h KJanusWidget.h KKeyChooser.h KKeyDialog.h KLed.h KLibFactory.h KLibLoader.h KLineEdit.h KListBox.h KListView.h KLocale.h KMainWindow.h KMenuBar.h KMessageBox.h KMimeType.h KNotifyClient.h KNumInput.h KOpenWithDlg.h KPalette.h KPanelApplet.h KPanelMenu.h KPasswordDialog.h KPasswordEdit.h KPixmap.h KPixmapEffect.h KPixmapIO.h KPixmapProvider.h KPopupFrame.h KPopupMenu.h KPopupTitle.h KProcIO.h KProcess.h KProcessController.h KProcessRunner.h KProgress.h KProtocolInfo.h KProtocolManager.h KRFCDate.h KRadioAction.h KRandomSequence.h KRecentDocument.h KRestrictedLine.h KRootPermsIcon.h KRootPixmap.h KRootProp.h KRuler.h KRun.h KSSL.h KSSLCertificate.h KSSLCertificateHome.h KSSLConnectionInfo.h KSSLInfoDlg.h KSSLPeerInfo.h KSSLSettings.h KSSLX509Map.h KSaveFile.h KSelectAction.h KSelector.h KSeparator.h KService.h KServiceGroup.h KServiceOffer.h KServiceType.h KServiceTypeProfile.h KSessionManaged.h KShared.h KShellCompletion.h KShred.h KSimpleConfig.h KSpell.h KSpellConfig.h KSpellDlg.h KStandardDirs.h KStaticDeleterBase.h KStatusBar.h KStatusBarLabel.h KStdAccel.h KStdAction.h KStringHandler.h KSycoca.h KSycocaEntry.h KSystemTray.h KTabCtl.h KTempFile.h KTextBrowser.h KToggleAction.h KToolBar.h KToolBarButton.h KToolBarRadioGroup.h KToolBarSeparator.h KTrader.h KURIFilter.h KURIFilterData.h KURIFilterPlugin.h KURL.h KURLComboBox.h KURLCompletion.h KURLDrag.h KURLLabel.h KURLRequester.h KURLRequesterDlg.h KUniqueApplication.h KWizard.h KWritePermsIcon.h KXMLGUIBuilder.h KXMLGUIBuilderInterface.h KXMLGUIClient.h KXMLGUIClientInterface.h KXMLGUIFactory.h KXYSelector.h Part.h PartBaseInterface.h ReadOnlyPart.h BrowserExtension.cpp DCOPClient.cpp DCOPObject.cpp DCOPObjectProxy.cpp KAboutApplication.cpp KAboutContainer.cpp TDEAboutData.cpp KAboutDialog.cpp KAboutKDE.cpp KAboutPerson.cpp KAboutWidget.cpp KAccel.cpp KAction.cpp KActionCollection.cpp KActionMenu.cpp KActionSeparator.cpp KAnimWidget.cpp TDEApplication.cpp KAudioPlayer.cpp KAuthIcon.cpp KBugReport.cpp KButtonBox.cpp KCModule.cpp KCharSelect.cpp KCharSelectTable.cpp KCharsets.cpp TDECmdLineArgs.cpp KColorButton.cpp KColorCombo.cpp KColorDrag.cpp KCombiView.cpp KComboBox.cpp KCompletion.cpp KCompletionBase.cpp KConfig.cpp KConfigBackEnd.cpp KConfigBase.cpp KConfigGroupSaver.cpp KConfigINIBackEnd.cpp KContextMenuManager.cpp KCursor.cpp KDCOPActionProxy.cpp KDCOPPropertyProxy.cpp KDEDesktopMimeType.cpp KDatePicker.cpp KDateTable.cpp KDateValidator.cpp KDesktopFile.cpp KDialog.cpp KDirOperator.cpp KDirWatch.cpp KDockWidgetAbstractHeader.cpp KDockWidgetAbstractHeaderDrag.cpp KDockWidgetHeader.cpp KDockWidgetHeaderDrag.cpp KDoubleNumInput.cpp KDualColorButton.cpp KEdFind.cpp KEdGotoLine.cpp KEdReplace.cpp KEditToolbar.cpp KEditToolbarWidget.cpp KEntry.cpp KEntryKey.cpp KExecMimeType.cpp KFile.cpp KFileDetailView.cpp KFileDialog.cpp KFileFilter.cpp KFileIconView.cpp KFileIconViewItem.cpp KFileItem.cpp KFileListViewItem.cpp KFilePreview.cpp KFileView.cpp KFileViewSignaler.cpp KFolderType.cpp KFontAction.cpp KFontChooser.cpp KFontDialog.cpp KFontSizeAction.cpp KGlobal.cpp KGlobalAccel.cpp KGlobalSettings.cpp KGradientSelector.cpp KHTMLPart.cpp KHTMLSettings.cpp KHTMLView.cpp KHelpMenu.cpp KHistoryCombo.cpp KIPC.cpp KIconButton.cpp KIconCanvas.cpp KIconDialog.cpp KIconEffect.cpp KIconLoader.cpp KIconView.cpp KImageEffect.cpp KImageIO.cpp TDEInstance.cpp KIntNumInput.cpp KIntSpinBox.cpp KIntValidator.cpp KJanusWidget.cpp KKeyChooser.cpp KKeyDialog.cpp KLed.cpp KLibFactory.cpp KLibLoader.cpp KLineEdit.cpp KListBox.cpp KListView.cpp KLocale.cpp KMainWindow.cpp KMenuBar.cpp KMessageBox.cpp KMimeType.cpp KNotifyClient.cpp KNumInput.cpp KOpenWithDlg.cpp KPalette.cpp KPanelApplet.cpp KPanelMenu.cpp KPasswordDialog.cpp KPasswordEdit.cpp KPixmap.cpp KPixmapEffect.cpp KPixmapIO.cpp KPixmapProvider.cpp KPopupFrame.cpp KPopupMenu.cpp KPopupTitle.cpp KProcIO.cpp KProcess.cpp KProcessController.cpp KProcessRunner.cpp KProgress.cpp KProtocolInfo.cpp KProtocolManager.cpp KRFCDate.cpp KRadioAction.cpp KRandomSequence.cpp KRecentDocument.cpp KRestrictedLine.cpp KRootPermsIcon.cpp KRootPixmap.cpp KRootProp.cpp KRuler.cpp KRun.cpp KSSL.cpp KSSLCertificate.cpp KSSLCertificateHome.cpp KSSLConnectionInfo.cpp KSSLInfoDlg.cpp KSSLPeerInfo.cpp KSSLSettings.cpp KSSLX509Map.cpp KSaveFile.cpp KSelectAction.cpp KSelector.cpp KSeparator.cpp KService.cpp KServiceGroup.cpp KServiceOffer.cpp KServiceType.cpp KServiceTypeProfile.cpp KSessionManaged.cpp KShared.cpp KShellCompletion.cpp KShred.cpp KSimpleConfig.cpp KSpell.cpp KSpellConfig.cpp KSpellDlg.cpp KStandardDirs.cpp KStaticDeleterBase.cpp KStatusBar.cpp KStatusBarLabel.cpp KStdAccel.cpp KStdAction.cpp KStringHandler.cpp KSycoca.cpp KSycocaEntry.cpp KSystemTray.cpp KTabCtl.cpp KTempFile.cpp KTextBrowser.cpp KToggleAction.cpp KToolBar.cpp KToolBarButton.cpp KToolBarRadioGroup.cpp KToolBarSeparator.cpp KTrader.cpp KURIFilter.cpp KURIFilterData.cpp KURIFilterPlugin.cpp KURL.cpp KURLComboBox.cpp KURLCompletion.cpp KURLDrag.cpp KURLLabel.cpp KURLRequester.cpp KURLRequesterDlg.cpp KUniqueApplication.cpp KWizard.cpp KWritePermsIcon.cpp KXMLGUIBuilder.cpp KXMLGUIClient.cpp KXMLGUIFactory.cpp KXYSelector.cpp Part.cpp ReadOnlyPart.cpp NetAccess.cpp NetAccess.h KDESupport.cpp Event.cpp GUIActivateEvent.cpp MouseEvent.cpp OpenURLEvent.cpp PartActivateEvent.cpp PartSelectEvent.cpp ReadWritePart.cpp DocumentFragment.cpp DocumentStyle.cpp DocumentType.cpp HTMLDocument.cpp NamedNodeMap.cpp CSSStyleSheet.cpp StyleSheet.cpp CSSException.cpp CSSPrimitiveValue.cpp CSSStyleDeclaration.cpp CSSValue.cpp Counter.cpp RGBColor.cpp Rect.cpp Element.cpp HTMLAnchorElement.cpp HTMLAppletElement.cpp HTMLAreaElement.cpp HTMLBRElement.cpp HTMLBaseElement.cpp HTMLBaseFontElement.cpp HTMLBlockquoteElement.cpp HTMLBodyElement.cpp HTMLButtonElement.cpp HTMLCollection.cpp HTMLDListElement.cpp HTMLDirectoryElement.cpp HTMLDivElement.cpp HTMLElement.cpp HTMLFieldSetElement.cpp HTMLFontElement.cpp HTMLFormElement.cpp HTMLFrameElement.cpp HTMLFrameSetElement.cpp HTMLHRElement.cpp HTMLHeadElement.cpp HTMLHeadingElement.cpp HTMLHtmlElement.cpp HTMLIFrameElement.cpp HTMLImageElement.cpp HTMLInputElement.cpp HTMLIsIndexElement.cpp HTMLLIElement.cpp HTMLLabelElement.cpp HTMLLegendElement.cpp HTMLLinkElement.cpp HTMLMapElement.cpp HTMLMenuElement.cpp HTMLMetaElement.cpp HTMLModElement.cpp HTMLOListElement.cpp HTMLObjectElement.cpp HTMLOptGroupElement.cpp HTMLOptionElement.cpp HTMLParagraphElement.cpp HTMLParamElement.cpp HTMLPreElement.cpp HTMLQuoteElement.cpp HTMLScriptElement.cpp HTMLSelectElement.cpp HTMLStyleElement.cpp HTMLTableCaptionElement.cpp HTMLTableCellElement.cpp HTMLTableColElement.cpp HTMLTableElement.cpp HTMLTableRowElement.cpp HTMLTableSectionElement.cpp HTMLTextAreaElement.cpp HTMLTitleElement.cpp HTMLUListElement.cpp Attr.cpp Attr.h CSSException.h CSSPrimitiveValue.h CSSStyleDeclaration.h CSSStyleSheet.h CSSValue.h Counter.h DocumentFragment.h DocumentStyle.h DocumentType.h Element.h Event.h GUIActivateEvent.h HTMLAnchorElement.h HTMLAppletElement.h HTMLAreaElement.h HTMLBRElement.h HTMLBaseElement.h HTMLBaseFontElement.h HTMLBlockquoteElement.h HTMLBodyElement.h HTMLButtonElement.h HTMLCollection.h HTMLDListElement.h HTMLDirectoryElement.h HTMLDivElement.h HTMLDocument.h HTMLElement.h HTMLFieldSetElement.h HTMLFontElement.h HTMLFormElement.h HTMLFrameElement.h HTMLFrameSetElement.h HTMLHRElement.h HTMLHeadElement.h HTMLHeadingElement.h HTMLHtmlElement.h HTMLIFrameElement.h HTMLImageElement.h HTMLInputElement.h HTMLIsIndexElement.h HTMLLIElement.h HTMLLabelElement.h HTMLLegendElement.h HTMLLinkElement.h HTMLMapElement.h HTMLMenuElement.h HTMLMetaElement.h HTMLModElement.h HTMLOListElement.h HTMLObjectElement.h HTMLOptGroupElement.h HTMLOptionElement.h HTMLParagraphElement.h HTMLParamElement.h HTMLPreElement.h HTMLQuoteElement.h HTMLScriptElement.h HTMLSelectElement.h HTMLStyleElement.h HTMLTableCaptionElement.h HTMLTableCellElement.h HTMLTableColElement.h HTMLTableElement.h HTMLTableRowElement.h HTMLTableSectionElement.h HTMLTextAreaElement.h HTMLTitleElement.h HTMLUListElement.h MouseEvent.h NamedNodeMap.h OpenURLEvent.h PartActivateEvent.h PartSelectEvent.h RGBColor.h ReadWritePart.h Rect.h StyleSheet.h DockMainWindow.cpp MainWindow.cpp DockMainWindow.h MainWindow.h CDATASection.cpp Comment.cpp EntityReference.cpp NodeFilter.cpp NodeIterator.cpp ProcessingInstruction.cpp Range.cpp Text.cpp TreeWalker.cpp CharacterData.cpp CDATASection.h CharacterData.h Comment.h EntityReference.h NodeFilter.h NodeIterator.h ProcessingInstruction.h Range.h Text.h TreeWalker.h CopyJob.cpp DeleteJob.cpp FileCopyJob.cpp Job.cpp KDirNotify.cpp KDirSize.cpp ListJob.cpp MimetypeJob.cpp SimpleJob.cpp StatJob.cpp TransferJob.cpp Connection.cpp Slave.cpp Connection.h CopyJob.h DeleteJob.h FileCopyJob.h Job.h KDirNotify.h KDirSize.h ListJob.h MimetypeJob.h SimpleJob.h Slave.h StatJob.h TransferJob.h KAboutContributor.cpp KAboutContributor.h KAboutTranslator.cpp KAboutTranslator.h KCodecs.cpp KCodecs.h KCommand.cpp KCommand.h KCommandHistory.cpp KCommandHistory.h KCompletionBox.cpp KCompletionBox.h KDialogQueue.cpp KDialogQueue.h KEditListBox.cpp KEditListBox.h KFilterBase.cpp KFilterBase.h KFilterDev.cpp KFilterDev.h KFontCombo.cpp KFontCombo.h KMacroCommand.cpp KMacroCommand.h KPanelExtension.cpp KPanelExtension.h KPixmapSplitter.cpp KPixmapSplitter.h KPreviewWidgetBase.cpp KPreviewWidgetBase.h KPushButton.cpp KPushButton.h KScanDialog.cpp KScanDialog.h KSqueezedTextLabel.cpp KSqueezedTextLabel.h KToolBarPopupAction.cpp KToolBarPopupAction.h KDEJavaSlot.cpp KDEJavaSlot.h KTipDatabase.cpp KTipDialog.cpp KTipDatabase.h KTipDialog.h ASConsumer.java KListViewItem.cpp KListViewItem.h KArchive.cpp KArchive.h KTar.cpp KTar.h KArchiveDirectory.cpp KSSLPKCS12.cpp KArchiveDirectory.h KSSLPKCS12.h KArchiveEntry.cpp KArchiveFile.cpp KArchiveEntry.h KArchiveFile.h KDialogBase.cpp KFileMetaInfo.cpp KFileMetaInfo.h KFileMetaInfoItem.cpp KFileMetaInfoItem.h KGuiItem.cpp KGuiItem.h KIconViewItem.cpp KIconViewItem.h KStdGuiItem.cpp KStdGuiItem.h KDataTool.cpp KDataToolAction.cpp KDataToolInfo.cpp KDateWidget.cpp KDirSelectDialog.cpp KEMailSettings.cpp KFileFilterCombo.cpp KFileTreeBranch.cpp KFileTreeView.cpp KFileTreeViewItem.cpp KFileTreeViewToolTip.cpp KMultipleDrag.cpp KWordWrap.cpp KDataTool.h KDataToolAction.h KDataToolInfo.h KDateWidget.h KDirSelectDialog.h KFileTreeBranch.h KFileTreeView.h KFileTreeViewItem.h KFileTreeViewToolTip.h KEMailSettings.h KFileFilterCombo.h KMultipleDrag.h KWordWrap.h KShortcut.cpp KKey.cpp KKey.h KShortcut.h KIO.cpp KIO.h Scheduler.cpp Scheduler.h StatusbarProgress.cpp StatusbarProgress.h ProgressBase.cpp ProgressBase.h KKeySequence.cpp KKeySequence.h KDockMainWindow.cpp KDockMainWindow.h KDockManager.cpp KDockManager.h KDockTabGroup.cpp KDockTabGroup.h KDockWidget.cpp KDockWidget.h KURLPixmapProvider.cpp KURLPixmapProvider.h KColor.cpp KColor.h KColorCells.cpp KColorCells.h KColorDialog.cpp KColorDialog.h KColorPatch.cpp KColorPatch.h KHSSelector.cpp KHSSelector.h KPaletteTable.cpp KPaletteTable.h KValueSelector.cpp KValueSelector.h KDE.cpp KDE.h KSSLCertDlgRet.cpp KSSLCertDlgRet.h KListAction.cpp KListAction.h KRecentFilesAction.cpp KRecentFilesAction.h KArrowButton.cpp KArrowButton.h KDateTimeWidget.cpp KDateTimeWidget.h KFind.cpp KFindDialog.cpp KFindDialog.h KFind.h KMultiTabBarButton.cpp KMultiTabBarButton.h KMultiTabBar.cpp KMultiTabBar.h KMultiTabBarTab.cpp KMultiTabBarTab.h KPrintAction.cpp KPrintAction.h KProgressDialog.cpp KProgressDialog.h KReplace.cpp KReplaceDialog.cpp KReplaceDialog.h KReplace.h AbstractView.cpp AbstractView.h CSSRule.cpp CSSRule.h CSSRuleList.cpp CSSRuleList.h CustomNodeFilter.cpp CustomNodeFilter.h DavJob.cpp DavJob.h Document.cpp Document.h DomShared.cpp DomShared.h EventListener.cpp EventListener.h KCalendarSystem.cpp KCalendarSystem.h KFileMetaInfoGroup.cpp KFileMetaInfoGroup.h KMimeSourceFactory.cpp KMimeSourceFactory.h KSharedConfig.cpp KSharedConfig.h KShortcutList.cpp KShortcutList.h KSSLCertBox.h KSSLCertBox.java KSSLCertChain.cpp KSSLCertChain.h KSSLSession.cpp KSSLSession.h KSSLX509V3.cpp KSSLX509V3.h KToggleFullScreenAction.cpp KToggleFullScreenAction.h KURLBar.cpp KURLBar.h KURLBarItem.cpp KURLBarItem.h KURLBarListBox.cpp KURLBarListBox.h MetaInfoJob.cpp MetaInfoJob.h Node.cpp Node.h PreviewJob.cpp PreviewJob.h UIEvent.cpp UIEvent.h KCatalogue.cpp KCatalogue.h KDoubleValidator.cpp KDoubleValidator.h KKeyButton.cpp KKeyButton.h KMdiToolViewAccessor.cpp KMdiToolViewAccessor.h KMdiChildArea.cpp KMdiChildArea.h KMdiChildFrmCaption.cpp KMdiChildFrmCaption.h KMdiChildFrm.cpp KMdiChildFrmDragBeginEvent.cpp KMdiChildFrmDragBeginEvent.h KMdiChildFrmDragEndEvent.cpp KMdiChildFrmDragEndEvent.h KMdiChildFrm.h KMdiChildFrmMoveEvent.cpp KMdiChildFrmMoveEvent.h KMdiChildFrmResizeBeginEvent.cpp KMdiChildFrmResizeBeginEvent.h KMdiChildFrmResizeEndEvent.cpp KMdiChildFrmResizeEndEvent.h KMdiChildView.cpp KMdiChildView.h KMdi.cpp KMdi.h KMdiMainFrm.cpp KMdiMainFrm.h KMdiTaskBarButton.cpp KMdiTaskBarButton.h KMdiTaskBar.cpp KMdiTaskBar.h KMdiViewCloseEvent.cpp KMdiViewCloseEvent.h KMdiWin32IconButton.cpp KMdiWin32IconButton.h KPasteTextAction.cpp KPasteTextAction.h KStringListValidator.cpp KStringListValidator.h KTabBar.cpp KTabBar.h KTabWidget.cpp KTabWidget.h KTextEdit.cpp KTextEdit.h KTimeWidget.cpp KTimeWidget.h KToggleToolBarAction.cpp KToggleToolBarAction.h KURLComboRequester.cpp KURLComboRequester.h DefaultProgress.h SlaveBase.h DefaultProgress.cpp KEdit.cpp KEdit.h KFloatValidator.cpp KFloatValidator.h KMimeMagic.cpp KMimeMagic.h KMimeMagicResult.cpp KMimeMagicResult.h KShellProcess.cpp KShellProcess.h SlaveBase.cpp SlaveInterface.cpp SlaveInterface.h AuthInfo.cpp KBufferedIO.cpp KDirLister.cpp RenameDlg.cpp Observer.cpp KAsyncIO.cpp AuthInfo.h KAsyncIO.h KBufferedIO.h KDirLister.h Observer.h RenameDlg.h KInputDialog.cpp KInputDialog.h CSSCharsetRule.cpp CSSCharsetRule.h CSSFontFaceRule.cpp CSSFontFaceRule.h CSSImportRule.cpp CSSImportRule.h CSSMediaRule.cpp CSSMediaRule.h CSSPageRule.cpp CSSPageRule.h CSSStyleRule.cpp CSSStyleRule.h CSSUnknownRule.cpp CSSUnknownRule.h CSSValueList.cpp CSSValueList.h DOMException.cpp DOMException.h DOMImplementation.cpp DOMImplementation.h Entity.cpp Entity.h EventException.cpp EventException.h Factory.cpp Factory.h HistoryProvider.cpp HistoryProvider.h HTMLFormCollection.cpp HTMLFormCollection.h KAccelShortcutList.cpp KAccelShortcutList.h KActionShortcutList.cpp KActionShortcutList.h KActiveLabel.cpp KActiveLabel.h KAr.cpp KAr.h KCalendarSystemFactory.cpp KCalendarSystemFactory.h KCModuleInfo.cpp KCModuleInfo.h KCModuleLoader.cpp KCModuleLoader.h KCMultiDialog.cpp KCMultiDialog.h KConfigGroup.cpp KConfigGroup.h KCPUInfo.cpp KCPUInfo.h KCustomMenuEditor.cpp KCustomMenuEditor.h KDCOPServiceStarter.cpp KDCOPServiceStarter.h KDiskFreeSp.cpp KDiskFreeSp.h KDockArea.cpp KDockArea.h KFilePlugin.cpp KFilePlugin.h KFileShare.cpp KFileShare.h KFontRequester.cpp KFontRequester.h KIDNA.cpp KIDNA.h KKeyNative.cpp KKeyNative.h KMD5.cpp KMD5.h KMimeTypeResolverBase.cpp KMimeTypeResolverBase.h KMimeTypeResolverHelper.cpp KMimeTypeResolverHelper.h KMimeTypeValidator.cpp KMimeTypeValidator.h KMountPoint.cpp KMountPoint.h KOCRDialog.cpp KOCRDialog.h KPanelAppMenu.cpp KPanelAppMenu.h KPassivePopup.cpp KPassivePopup.h KPluginSelector.cpp KPluginSelector.h KRegExpEditorInterface.cpp KRegExpEditorInterface.h KServiceSeparator.cpp KServiceSeparator.h KShell.cpp KShell.h KSimpleFileFilter.cpp KSimpleFileFilter.h KSMIMECrypto.cpp KSMIMECrypto.h KSpellingHighlighter.cpp KSpellingHighlighter.h KSSLCertDlg.cpp KSSLCertDlg.h KSSLCertificateCache.cpp KSSLCertificateCache.h KSSLCertificateFactory.cpp KSSLCertificateFactory.h KSSLKeyGen.cpp KSSLKeyGen.h KSSLPKCS7.cpp KSSLPKCS7.h KSSLSigners.cpp KSSLSigners.h KSyntaxHighlighter.cpp KSyntaxHighlighter.h KTempDir.cpp KTempDir.h KURLBarItemDialog.cpp KURLBarItemDialog.h KWidgetAction.cpp KWidgetAction.h KWindowInfo.cpp KWindowInfo.h KXMLGUI.cpp KXMLGUI.h KZip.cpp KZipFileEntry.cpp KZipFileEntry.h KZip.h LinkStyle.cpp LinkStyle.h LiveConnectExtension.cpp LiveConnectExtension.h MultiGetJob.cpp MultiGetJob.h MutationEvent.cpp MutationEvent.h Notation.cpp Notation.h PartBase.cpp PartBase.h PasswordDialog.cpp PasswordDialog.h Plugin.cpp Plugin.h RangeException.cpp RangeException.h SessionData.cpp SessionData.h SkipDlg.cpp SkipDlg.h StatusBarExtension.cpp StatusBarExtension.h TextEvent.cpp TextEvent.h KSSLCertBox.cpp KNamedCommand.cpp KNamedCommand.h PartManager.cpp PartManager.h URLArgs.cpp UrlArgs.h WindowArgs.cpp WindowArgs.h BrowserHostExtension.cpp BrowserHostExtension.h BrowserRun.cpp BrowserRun.h StoredTransferJob.cpp StoredTransferJob.h 
 
 ####### tdevelop will overwrite this part!!! (end)############
 
diff --git a/kdejava/koala/kdejava/Part.cpp b/kdejava/koala/kdejava/Part.cpp
index 0bcc488c..c1a75faa 100644
--- a/kdejava/koala/kdejava/Part.cpp
+++ b/kdejava/koala/kdejava/Part.cpp
@@ -36,15 +36,15 @@ public:
 	TQWidget* protected_hostContainer(const TQString& arg1) {
 		return (TQWidget*) KParts::Part::hostContainer(arg1);
 	}
-	void protected_setInstance(KInstance* arg1) {
+	void protected_setInstance(TDEInstance* arg1) {
 		KParts::PartBase::setInstance(arg1);
 		return;
 	}
-	void protected_setInstance(KInstance* arg1,bool arg2) {
+	void protected_setInstance(TDEInstance* arg1,bool arg2) {
 		KParts::PartBase::setInstance(arg1,arg2);
 		return;
 	}
-	void protected_loadPlugins(TQObject* arg1,KXMLGUIClient* arg2,KInstance* arg3) {
+	void protected_loadPlugins(TQObject* arg1,KXMLGUIClient* arg2,TDEInstance* arg3) {
 		KParts::PartBase::loadPlugins(arg1,arg2,arg3);
 		return;
 	}
@@ -183,7 +183,7 @@ Java_org_kde_koala_Part_isSelectable(JNIEnv* env, jobject obj)
 JNIEXPORT void JNICALL
 Java_org_kde_koala_Part_loadPlugins(JNIEnv* env, jobject obj, jobject parent, jobject parentGUIClient, jobject instance)
 {
-	((PartJBridge*) QtSupport::getQt(env, obj))->protected_loadPlugins((TQObject*) QtSupport::getQt(env, parent), (KXMLGUIClient*) QtSupport::getQt(env, parentGUIClient), (KInstance*) QtSupport::getQt(env, instance));
+	((PartJBridge*) QtSupport::getQt(env, obj))->protected_loadPlugins((TQObject*) QtSupport::getQt(env, parent), (KXMLGUIClient*) QtSupport::getQt(env, parentGUIClient), (TDEInstance*) QtSupport::getQt(env, instance));
 	return;
 }
 
@@ -254,16 +254,16 @@ Java_org_kde_koala_Part_partSelectEvent(JNIEnv* env, jobject obj, jobject event)
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_Part_setInstance__Lorg_kde_koala_KInstanceInterface_2(JNIEnv* env, jobject obj, jobject instance)
+Java_org_kde_koala_Part_setInstance__Lorg_kde_koala_TDEInstanceInterface_2(JNIEnv* env, jobject obj, jobject instance)
 {
-	((PartJBridge*) QtSupport::getQt(env, obj))->protected_setInstance((KInstance*) QtSupport::getQt(env, instance));
+	((PartJBridge*) QtSupport::getQt(env, obj))->protected_setInstance((TDEInstance*) QtSupport::getQt(env, instance));
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_Part_setInstance__Lorg_kde_koala_KInstanceInterface_2Z(JNIEnv* env, jobject obj, jobject instance, jboolean loadPlugins)
+Java_org_kde_koala_Part_setInstance__Lorg_kde_koala_TDEInstanceInterface_2Z(JNIEnv* env, jobject obj, jobject instance, jboolean loadPlugins)
 {
-	((PartJBridge*) QtSupport::getQt(env, obj))->protected_setInstance((KInstance*) QtSupport::getQt(env, instance), (bool) loadPlugins);
+	((PartJBridge*) QtSupport::getQt(env, obj))->protected_setInstance((TDEInstance*) QtSupport::getQt(env, instance), (bool) loadPlugins);
 	return;
 }
 
diff --git a/kdejava/koala/kdejava/Part.h b/kdejava/koala/kdejava/Part.h
index b312fcf5..ec1a2e4a 100644
--- a/kdejava/koala/kdejava/Part.h
+++ b/kdejava/koala/kdejava/Part.h
@@ -30,8 +30,8 @@ extern JNIEXPORT void JNICALL Java_org_kde_koala_Part_guiActivateEvent (JNIEnv *
 extern JNIEXPORT jobject JNICALL Java_org_kde_koala_Part_hostContainer (JNIEnv *env, jobject, jstring);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_Part_setPartObject (JNIEnv *env, jobject, jobject);
 extern JNIEXPORT jobject JNICALL Java_org_kde_koala_Part_partObject (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_Part_setInstance__Lorg_kde_koala_KInstanceInterface_2 (JNIEnv *env, jobject, jobject);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_Part_setInstance__Lorg_kde_koala_KInstanceInterface_2Z (JNIEnv *env, jobject, jobject, jboolean);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_Part_setInstance__Lorg_kde_koala_TDEInstanceInterface_2 (JNIEnv *env, jobject, jobject);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_Part_setInstance__Lorg_kde_koala_TDEInstanceInterface_2Z (JNIEnv *env, jobject, jobject, jboolean);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_Part_loadPlugins (JNIEnv *env, jobject, jobject, jobject, jobject);
 
 #ifdef __cplusplus
diff --git a/kdejava/koala/kdejava/PartBase.cpp b/kdejava/koala/kdejava/PartBase.cpp
index 2f19b437..be497590 100644
--- a/kdejava/koala/kdejava/PartBase.cpp
+++ b/kdejava/koala/kdejava/PartBase.cpp
@@ -9,15 +9,15 @@ class PartBaseJBridge : public KParts::PartBase
 {
 public:
 	PartBaseJBridge() : KParts::PartBase() {};
-	void protected_setInstance(KInstance* arg1) {
+	void protected_setInstance(TDEInstance* arg1) {
 		KParts::PartBase::setInstance(arg1);
 		return;
 	}
-	void protected_setInstance(KInstance* arg1,bool arg2) {
+	void protected_setInstance(TDEInstance* arg1,bool arg2) {
 		KParts::PartBase::setInstance(arg1,arg2);
 		return;
 	}
-	void protected_loadPlugins(TQObject* arg1,KXMLGUIClient* arg2,KInstance* arg3) {
+	void protected_loadPlugins(TQObject* arg1,KXMLGUIClient* arg2,TDEInstance* arg3) {
 		KParts::PartBase::loadPlugins(arg1,arg2,arg3);
 		return;
 	}
@@ -26,7 +26,7 @@ public:
 JNIEXPORT void JNICALL
 Java_org_kde_koala_PartBase_loadPlugins(JNIEnv* env, jobject obj, jobject parent, jobject parentGUIClient, jobject instance)
 {
-	((PartBaseJBridge*) QtSupport::getQt(env, obj))->protected_loadPlugins((TQObject*) QtSupport::getQt(env, parent), (KXMLGUIClient*) QtSupport::getQt(env, parentGUIClient), (KInstance*) QtSupport::getQt(env, instance));
+	((PartBaseJBridge*) QtSupport::getQt(env, obj))->protected_loadPlugins((TQObject*) QtSupport::getQt(env, parent), (KXMLGUIClient*) QtSupport::getQt(env, parentGUIClient), (TDEInstance*) QtSupport::getQt(env, instance));
 	return;
 }
 
@@ -48,16 +48,16 @@ Java_org_kde_koala_PartBase_partObject(JNIEnv* env, jobject obj)
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_PartBase_setInstance__Lorg_kde_koala_KInstanceInterface_2(JNIEnv* env, jobject obj, jobject instance)
+Java_org_kde_koala_PartBase_setInstance__Lorg_kde_koala_TDEInstanceInterface_2(JNIEnv* env, jobject obj, jobject instance)
 {
-	((PartBaseJBridge*) QtSupport::getQt(env, obj))->protected_setInstance((KInstance*) QtSupport::getQt(env, instance));
+	((PartBaseJBridge*) QtSupport::getQt(env, obj))->protected_setInstance((TDEInstance*) QtSupport::getQt(env, instance));
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_PartBase_setInstance__Lorg_kde_koala_KInstanceInterface_2Z(JNIEnv* env, jobject obj, jobject instance, jboolean loadPlugins)
+Java_org_kde_koala_PartBase_setInstance__Lorg_kde_koala_TDEInstanceInterface_2Z(JNIEnv* env, jobject obj, jobject instance, jboolean loadPlugins)
 {
-	((PartBaseJBridge*) QtSupport::getQt(env, obj))->protected_setInstance((KInstance*) QtSupport::getQt(env, instance), (bool) loadPlugins);
+	((PartBaseJBridge*) QtSupport::getQt(env, obj))->protected_setInstance((TDEInstance*) QtSupport::getQt(env, instance), (bool) loadPlugins);
 	return;
 }
 
diff --git a/kdejava/koala/kdejava/PartBase.h b/kdejava/koala/kdejava/PartBase.h
index 974c08d4..48b042af 100644
--- a/kdejava/koala/kdejava/PartBase.h
+++ b/kdejava/koala/kdejava/PartBase.h
@@ -13,8 +13,8 @@ extern "C"
 extern JNIEXPORT void JNICALL Java_org_kde_koala_PartBase_newPartBase (JNIEnv *env, jobject);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_PartBase_setPartObject (JNIEnv *env, jobject, jobject);
 extern JNIEXPORT jobject JNICALL Java_org_kde_koala_PartBase_partObject (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_PartBase_setInstance__Lorg_kde_koala_KInstanceInterface_2 (JNIEnv *env, jobject, jobject);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_PartBase_setInstance__Lorg_kde_koala_KInstanceInterface_2Z (JNIEnv *env, jobject, jobject, jboolean);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_PartBase_setInstance__Lorg_kde_koala_TDEInstanceInterface_2 (JNIEnv *env, jobject, jobject);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_PartBase_setInstance__Lorg_kde_koala_TDEInstanceInterface_2Z (JNIEnv *env, jobject, jobject, jboolean);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_PartBase_loadPlugins (JNIEnv *env, jobject, jobject, jobject, jobject);
 
 #ifdef __cplusplus
diff --git a/kdejava/koala/kdejava/PartManager.cpp b/kdejava/koala/kdejava/PartManager.cpp
index 4d1d9cf0..01d6dab5 100644
--- a/kdejava/koala/kdejava/PartManager.cpp
+++ b/kdejava/koala/kdejava/PartManager.cpp
@@ -12,7 +12,7 @@ public:
 	PartManagerJBridge(TQWidget* arg1) : KParts::PartManager(arg1) {};
 	PartManagerJBridge(TQWidget* arg1,TQObject* arg2,const char* arg3) : KParts::PartManager(arg1,arg2,arg3) {};
 	PartManagerJBridge(TQWidget* arg1,TQObject* arg2) : KParts::PartManager(arg1,arg2) {};
-	void protected_setActiveInstance(KInstance* arg1) {
+	void protected_setActiveInstance(TDEInstance* arg1) {
 		KParts::PartManager::setActiveInstance(arg1);
 		return;
 	}
@@ -52,8 +52,8 @@ public:
 		}
 		return;
 	}
-	void setActiveInstance(KInstance* arg1) {
-		if (!QtSupport::eventDelegate(this,"setActiveInstance",(void*)arg1,"org.kde.koala.KInstanceInterface")) {
+	void setActiveInstance(TDEInstance* arg1) {
+		if (!QtSupport::eventDelegate(this,"setActiveInstance",(void*)arg1,"org.kde.koala.TDEInstanceInterface")) {
 			PartManager::setActiveInstance(arg1);
 		}
 		return;
@@ -258,7 +258,7 @@ Java_org_kde_koala_PartManager_setActivationButtonMask(JNIEnv* env, jobject obj,
 JNIEXPORT void JNICALL
 Java_org_kde_koala_PartManager_setActiveInstance(JNIEnv* env, jobject obj, jobject instance)
 {
-	((PartManagerJBridge*) QtSupport::getQt(env, obj))->protected_setActiveInstance((KInstance*) QtSupport::getQt(env, instance));
+	((PartManagerJBridge*) QtSupport::getQt(env, obj))->protected_setActiveInstance((TDEInstance*) QtSupport::getQt(env, instance));
 	return;
 }
 
diff --git a/kdejava/koala/kdejava/Plugin.cpp b/kdejava/koala/kdejava/Plugin.cpp
index b8d42a1c..e516137a 100644
--- a/kdejava/koala/kdejava/Plugin.cpp
+++ b/kdejava/koala/kdejava/Plugin.cpp
@@ -15,7 +15,7 @@ public:
 	PluginJBridge(TQObject* arg1,const char* arg2) : KParts::Plugin(arg1,arg2) {};
 	PluginJBridge(TQObject* arg1) : KParts::Plugin(arg1) {};
 	PluginJBridge() : KParts::Plugin() {};
-	void protected_setInstance(KInstance* arg1) {
+	void protected_setInstance(TDEInstance* arg1) {
 		KParts::Plugin::setInstance(arg1);
 		return;
 	}
@@ -109,8 +109,8 @@ public:
 			return TRUE;
 		}
 	}
-	void setInstance(KInstance* arg1) {
-		if (!QtSupport::eventDelegate(this,"setInstance",(void*)arg1,"org.kde.koala.KInstanceInterface")) {
+	void setInstance(TDEInstance* arg1) {
+		if (!QtSupport::eventDelegate(this,"setInstance",(void*)arg1,"org.kde.koala.TDEInstanceInterface")) {
 			Plugin::setInstance(arg1);
 		}
 		return;
@@ -229,7 +229,7 @@ Java_org_kde_koala_Plugin_insertChildClient(JNIEnv* env, jobject obj, jobject ch
 JNIEXPORT jobject JNICALL
 Java_org_kde_koala_Plugin_instance(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)((KXMLGUIClient*)(KParts::Plugin*) QtSupport::getQt(env, obj))->instance(), "org.kde.koala.KInstanceInterface");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)((KXMLGUIClient*)(KParts::Plugin*) QtSupport::getQt(env, obj))->instance(), "org.kde.koala.TDEInstanceInterface");
 	return xret;
 }
 
@@ -243,26 +243,26 @@ static TQCString* _qstring_libname = 0;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_Plugin_loadPlugins__Lorg_kde_qt_QObject_2Lorg_kde_koala_KInstanceInterface_2(JNIEnv* env, jclass cls, jobject parent, jobject instance)
+Java_org_kde_koala_Plugin_loadPlugins__Lorg_kde_qt_QObject_2Lorg_kde_koala_TDEInstanceInterface_2(JNIEnv* env, jclass cls, jobject parent, jobject instance)
 {
 	(void) cls;
-	PluginJBridge::loadPlugins((TQObject*) QtSupport::getQt(env, parent), (const KInstance*) QtSupport::getQt(env, instance));
+	PluginJBridge::loadPlugins((TQObject*) QtSupport::getQt(env, parent), (const TDEInstance*) QtSupport::getQt(env, instance));
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_Plugin_loadPlugins__Lorg_kde_qt_QObject_2Lorg_kde_koala_KXMLGUIClientInterface_2Lorg_kde_koala_KInstanceInterface_2(JNIEnv* env, jclass cls, jobject parent, jobject parentGUIClient, jobject instance)
+Java_org_kde_koala_Plugin_loadPlugins__Lorg_kde_qt_QObject_2Lorg_kde_koala_KXMLGUIClientInterface_2Lorg_kde_koala_TDEInstanceInterface_2(JNIEnv* env, jclass cls, jobject parent, jobject parentGUIClient, jobject instance)
 {
 	(void) cls;
-	PluginJBridge::loadPlugins((TQObject*) QtSupport::getQt(env, parent), (KXMLGUIClient*) QtSupport::getQt(env, parentGUIClient), (KInstance*) QtSupport::getQt(env, instance));
+	PluginJBridge::loadPlugins((TQObject*) QtSupport::getQt(env, parent), (KXMLGUIClient*) QtSupport::getQt(env, parentGUIClient), (TDEInstance*) QtSupport::getQt(env, instance));
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_Plugin_loadPlugins__Lorg_kde_qt_QObject_2Lorg_kde_koala_KXMLGUIClientInterface_2Lorg_kde_koala_KInstanceInterface_2Z(JNIEnv* env, jclass cls, jobject parent, jobject parentGUIClient, jobject instance, jboolean enableNewPluginsByDefault)
+Java_org_kde_koala_Plugin_loadPlugins__Lorg_kde_qt_QObject_2Lorg_kde_koala_KXMLGUIClientInterface_2Lorg_kde_koala_TDEInstanceInterface_2Z(JNIEnv* env, jclass cls, jobject parent, jobject parentGUIClient, jobject instance, jboolean enableNewPluginsByDefault)
 {
 	(void) cls;
-	PluginJBridge::loadPlugins((TQObject*) QtSupport::getQt(env, parent), (KXMLGUIClient*) QtSupport::getQt(env, parentGUIClient), (KInstance*) QtSupport::getQt(env, instance), (bool) enableNewPluginsByDefault);
+	PluginJBridge::loadPlugins((TQObject*) QtSupport::getQt(env, parent), (KXMLGUIClient*) QtSupport::getQt(env, parentGUIClient), (TDEInstance*) QtSupport::getQt(env, instance), (bool) enableNewPluginsByDefault);
 	return;
 }
 
@@ -371,7 +371,7 @@ Java_org_kde_koala_Plugin_setFactory(JNIEnv* env, jobject obj, jobject factory)
 JNIEXPORT void JNICALL
 Java_org_kde_koala_Plugin_setInstance(JNIEnv* env, jobject obj, jobject instance)
 {
-	((PluginJBridge*) QtSupport::getQt(env, obj))->protected_setInstance((KInstance*) QtSupport::getQt(env, instance));
+	((PluginJBridge*) QtSupport::getQt(env, obj))->protected_setInstance((TDEInstance*) QtSupport::getQt(env, instance));
 	return;
 }
 
diff --git a/kdejava/koala/kdejava/Plugin.h b/kdejava/koala/kdejava/Plugin.h
index 8e9f63ee..7b05ee91 100644
--- a/kdejava/koala/kdejava/Plugin.h
+++ b/kdejava/koala/kdejava/Plugin.h
@@ -17,9 +17,9 @@ extern JNIEXPORT void JNICALL Java_org_kde_koala_Plugin_newPlugin__Lorg_kde_qt_Q
 extern JNIEXPORT void JNICALL Java_org_kde_koala_Plugin_newPlugin__ (JNIEnv *env, jobject);
 extern JNIEXPORT jstring JNICALL Java_org_kde_koala_Plugin_xmlFile (JNIEnv *env, jobject);
 extern JNIEXPORT jstring JNICALL Java_org_kde_koala_Plugin_localXMLFile (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_Plugin_loadPlugins__Lorg_kde_qt_QObject_2Lorg_kde_koala_KInstanceInterface_2 (JNIEnv *env, jclass, jobject, jobject);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_Plugin_loadPlugins__Lorg_kde_qt_QObject_2Lorg_kde_koala_KXMLGUIClientInterface_2Lorg_kde_koala_KInstanceInterface_2Z (JNIEnv *env, jclass, jobject, jobject, jobject, jboolean);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_Plugin_loadPlugins__Lorg_kde_qt_QObject_2Lorg_kde_koala_KXMLGUIClientInterface_2Lorg_kde_koala_KInstanceInterface_2 (JNIEnv *env, jclass, jobject, jobject, jobject);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_Plugin_loadPlugins__Lorg_kde_qt_QObject_2Lorg_kde_koala_TDEInstanceInterface_2 (JNIEnv *env, jclass, jobject, jobject);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_Plugin_loadPlugins__Lorg_kde_qt_QObject_2Lorg_kde_koala_KXMLGUIClientInterface_2Lorg_kde_koala_TDEInstanceInterface_2Z (JNIEnv *env, jclass, jobject, jobject, jobject, jboolean);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_Plugin_loadPlugins__Lorg_kde_qt_QObject_2Lorg_kde_koala_KXMLGUIClientInterface_2Lorg_kde_koala_TDEInstanceInterface_2 (JNIEnv *env, jclass, jobject, jobject, jobject);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_Plugin_setInstance (JNIEnv *env, jobject, jobject);
 extern JNIEXPORT jobject JNICALL Java_org_kde_koala_Plugin_loadPlugin (JNIEnv *env, jclass, jobject, jstring);
 extern JNIEXPORT jobject JNICALL Java_org_kde_koala_Plugin_action__Ljava_lang_String_2 (JNIEnv *env, jobject, jstring);
diff --git a/kdejava/koala/kdejava/TDEApplication.cpp b/kdejava/koala/kdejava/TDEApplication.cpp
index 64483ce6..6bcc587b 100644
--- a/kdejava/koala/kdejava/TDEApplication.cpp
+++ b/kdejava/koala/kdejava/TDEApplication.cpp
@@ -21,14 +21,14 @@ public:
 	TDEApplicationJBridge(bool arg1,bool arg2) : TDEApplication(arg1,arg2) {};
 	TDEApplicationJBridge(bool arg1) : TDEApplication(arg1) {};
 	TDEApplicationJBridge() : TDEApplication() {};
-	TDEApplicationJBridge(bool arg1,bool arg2,KInstance* arg3) : TDEApplication(arg1,arg2,arg3) {};
+	TDEApplicationJBridge(bool arg1,bool arg2,TDEInstance* arg3) : TDEApplication(arg1,arg2,arg3) {};
 	void protected_invokeEditSlot(const char* arg1) {
 		TDEApplication::invokeEditSlot(arg1);
 		return;
 	}
 	~TDEApplicationJBridge() {QtSupport::qtKeyDeleted(this);}
 	void protected_setConfigName(const TQString& arg1) {
-		KInstance::setConfigName(arg1);
+		TDEInstance::setConfigName(arg1);
 		return;
 	}
 	void processOneEvent() {
@@ -91,7 +91,7 @@ public:
 JNIEXPORT jobject JNICALL
 Java_org_kde_koala_TDEApplication_aboutData(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)((KInstance*)(TDEApplication*) QtSupport::getQt(env, obj))->aboutData(), "org.kde.koala.KAboutData");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)((TDEInstance*)(TDEApplication*) QtSupport::getQt(env, obj))->aboutData(), "org.kde.koala.TDEAboutData");
 	return xret;
 }
 
@@ -202,7 +202,7 @@ Java_org_kde_koala_TDEApplication_commitData(JNIEnv* env, jobject obj, jobject s
 JNIEXPORT jobject JNICALL
 Java_org_kde_koala_TDEApplication_config(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)((KInstance*)(TDEApplication*) QtSupport::getQt(env, obj))->config(), "org.kde.koala.KConfig");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)((TDEInstance*)(TDEApplication*) QtSupport::getQt(env, obj))->config(), "org.kde.koala.KConfig");
 	return xret;
 }
 
@@ -254,7 +254,7 @@ Java_org_kde_koala_TDEApplication_deref(JNIEnv* env, jobject obj)
 JNIEXPORT jobject JNICALL
 Java_org_kde_koala_TDEApplication_dirs(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)((KInstance*)(TDEApplication*) QtSupport::getQt(env, obj))->dirs(), "org.kde.koala.KStandardDirs");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)((TDEInstance*)(TDEApplication*) QtSupport::getQt(env, obj))->dirs(), "org.kde.koala.KStandardDirs");
 	return xret;
 }
 
@@ -332,7 +332,7 @@ Java_org_kde_koala_TDEApplication_guiEnabled(JNIEnv* env, jclass cls)
 JNIEXPORT jobject JNICALL
 Java_org_kde_koala_TDEApplication_iconLoader(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)((KInstance*)(TDEApplication*) QtSupport::getQt(env, obj))->iconLoader(), "org.kde.koala.KIconLoader");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)((TDEInstance*)(TDEApplication*) QtSupport::getQt(env, obj))->iconLoader(), "org.kde.koala.KIconLoader");
 	return xret;
 }
 
@@ -378,7 +378,7 @@ JNIEXPORT jstring JNICALL
 Java_org_kde_koala_TDEApplication_instanceName(JNIEnv* env, jobject obj)
 {
 	TQCString  _qstring;
-	_qstring = ((KInstance*)(TDEApplication*) QtSupport::getQt(env, obj))->instanceName();
+	_qstring = ((TDEInstance*)(TDEApplication*) QtSupport::getQt(env, obj))->instanceName();
 	return QtSupport::fromTQCString(env, &_qstring);
 }
 
@@ -733,7 +733,7 @@ Java_org_kde_koala_TDEApplication_metaObject(JNIEnv* env, jobject obj)
 JNIEXPORT jobject JNICALL
 Java_org_kde_koala_TDEApplication_mimeSourceFactory(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)((KInstance*)(TDEApplication*) QtSupport::getQt(env, obj))->mimeSourceFactory(), "org.kde.koala.KMimeSourceFactory");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)((TDEInstance*)(TDEApplication*) QtSupport::getQt(env, obj))->mimeSourceFactory(), "org.kde.koala.KMimeSourceFactory");
 	return xret;
 }
 
@@ -755,7 +755,7 @@ Java_org_kde_koala_TDEApplication_miniIcon(JNIEnv* env, jobject obj)
 JNIEXPORT void JNICALL
 Java_org_kde_koala_TDEApplication_newIconLoader(JNIEnv* env, jobject obj)
 {
-	((KInstance*)(TDEApplication*) QtSupport::getQt(env, obj))->newIconLoader();
+	((TDEInstance*)(TDEApplication*) QtSupport::getQt(env, obj))->newIconLoader();
 	return;
 }
 
@@ -790,10 +790,10 @@ Java_org_kde_koala_TDEApplication_newTDEApplication__ZZ(JNIEnv* env, jobject obj
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_TDEApplication_newTDEApplication__ZZLorg_kde_koala_KInstanceInterface_2(JNIEnv* env, jobject obj, jboolean allowStyles, jboolean GUIenabled, jobject _instance)
+Java_org_kde_koala_TDEApplication_newTDEApplication__ZZLorg_kde_koala_TDEInstanceInterface_2(JNIEnv* env, jobject obj, jboolean allowStyles, jboolean GUIenabled, jobject _instance)
 {
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new TDEApplicationJBridge((bool) allowStyles, (bool) GUIenabled, (KInstance*) QtSupport::getQt(env, _instance)));
+		QtSupport::setQt(env, obj, new TDEApplicationJBridge((bool) allowStyles, (bool) GUIenabled, (TDEInstance*) QtSupport::getQt(env, _instance)));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
@@ -941,7 +941,7 @@ Java_org_kde_koala_TDEApplication_setTopWidget(JNIEnv* env, jobject obj, jobject
 JNIEXPORT jobject JNICALL
 Java_org_kde_koala_TDEApplication_sharedConfig(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)((KInstance*)(TDEApplication*) QtSupport::getQt(env, obj))->sharedConfig(), "org.kde.koala.KSharedConfig");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)((TDEInstance*)(TDEApplication*) QtSupport::getQt(env, obj))->sharedConfig(), "org.kde.koala.KSharedConfig");
 	return xret;
 }
 
diff --git a/kdejava/koala/kdejava/TDEApplication.h b/kdejava/koala/kdejava/TDEApplication.h
index 34b7056c..5c64eaeb 100644
--- a/kdejava/koala/kdejava/TDEApplication.h
+++ b/kdejava/koala/kdejava/TDEApplication.h
@@ -144,7 +144,7 @@ extern JNIEXPORT jobject JNICALL Java_org_kde_koala_TDEApplication_createApplica
 extern JNIEXPORT jobject JNICALL Java_org_kde_koala_TDEApplication_createApplicationPalette__Lorg_kde_koala_KConfig_2I (JNIEnv *env, jclass, jobject, jint);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEApplication_installSigpipeHandler (JNIEnv *env, jclass);
 extern JNIEXPORT jboolean JNICALL Java_org_kde_koala_TDEApplication_guiEnabled (JNIEnv *env, jclass);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEApplication_newTDEApplication__ZZLorg_kde_koala_KInstanceInterface_2 (JNIEnv *env, jobject, jboolean, jboolean, jobject);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEApplication_newTDEApplication__ZZLorg_kde_koala_TDEInstanceInterface_2 (JNIEnv *env, jobject, jboolean, jboolean, jobject);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEApplication_invokeEditSlot (JNIEnv *env, jobject, jstring);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEApplication_finalize (JNIEnv *env, jobject);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEApplication_dispose (JNIEnv *env, jobject);
diff --git a/kdejava/koala/kdejava/TDECmdLineArgs.cpp b/kdejava/koala/kdejava/TDECmdLineArgs.cpp
index 95b3f0ad..0cb06177 100644
--- a/kdejava/koala/kdejava/TDECmdLineArgs.cpp
+++ b/kdejava/koala/kdejava/TDECmdLineArgs.cpp
@@ -131,10 +131,10 @@ static TQCString* _qstring_option = 0;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_TDECmdLineArgs_init__Lorg_kde_koala_KAboutData_2(JNIEnv* env, jclass cls, jobject about)
+Java_org_kde_koala_TDECmdLineArgs_init__Lorg_kde_koala_TDEAboutData_2(JNIEnv* env, jclass cls, jobject about)
 {
 	(void) cls;
-	TDECmdLineArgsJBridge::init((const KAboutData*) QtSupport::getQt(env, about));
+	TDECmdLineArgsJBridge::init((const TDEAboutData*) QtSupport::getQt(env, about));
 	return;
 }
 
@@ -271,20 +271,20 @@ static TQCString* _qstring__version = 0;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_TDECmdLineArgs_init___3Ljava_lang_String_2Lorg_kde_koala_KAboutData_2(JNIEnv* env, jclass cls, jobjectArray args, jobject about)
+Java_org_kde_koala_TDECmdLineArgs_init___3Ljava_lang_String_2Lorg_kde_koala_TDEAboutData_2(JNIEnv* env, jclass cls, jobjectArray args, jobject about)
 {
 	(void) cls;
 	int argc = (int) env->GetArrayLength(args);
-	TDECmdLineArgsJBridge::init(argc+1, (char**) QtSupport::toArgv(env, args), (const KAboutData*) QtSupport::getQt(env, about));
+	TDECmdLineArgsJBridge::init(argc+1, (char**) QtSupport::toArgv(env, args), (const TDEAboutData*) QtSupport::getQt(env, about));
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_TDECmdLineArgs_init___3Ljava_lang_String_2Lorg_kde_koala_KAboutData_2Z(JNIEnv* env, jclass cls, jobjectArray args, jobject about, jboolean noKApp)
+Java_org_kde_koala_TDECmdLineArgs_init___3Ljava_lang_String_2Lorg_kde_koala_TDEAboutData_2Z(JNIEnv* env, jclass cls, jobjectArray args, jobject about, jboolean noKApp)
 {
 	(void) cls;
 	int argc = (int) env->GetArrayLength(args);
-	TDECmdLineArgsJBridge::init(argc+1, (char**) QtSupport::toArgv(env, args), (const KAboutData*) QtSupport::getQt(env, about), (bool) noKApp);
+	TDECmdLineArgsJBridge::init(argc+1, (char**) QtSupport::toArgv(env, args), (const TDEAboutData*) QtSupport::getQt(env, about), (bool) noKApp);
 	return;
 }
 
diff --git a/kdejava/koala/kdejava/TDECmdLineArgs.h b/kdejava/koala/kdejava/TDECmdLineArgs.h
index bfd27e62..d47496cf 100644
--- a/kdejava/koala/kdejava/TDECmdLineArgs.h
+++ b/kdejava/koala/kdejava/TDECmdLineArgs.h
@@ -19,9 +19,9 @@ extern JNIEXPORT jobject JNICALL Java_org_kde_koala_TDECmdLineArgs_url (JNIEnv *
 extern JNIEXPORT void JNICALL Java_org_kde_koala_TDECmdLineArgs_clear (JNIEnv *env, jobject);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_TDECmdLineArgs_init___3Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Z (JNIEnv *env, jclass, jobjectArray, jstring, jstring, jstring, jstring, jboolean);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_TDECmdLineArgs_init___3Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jclass, jobjectArray, jstring, jstring, jstring, jstring);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_TDECmdLineArgs_init___3Ljava_lang_String_2Lorg_kde_koala_KAboutData_2Z (JNIEnv *env, jclass, jobjectArray, jobject, jboolean);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_TDECmdLineArgs_init___3Ljava_lang_String_2Lorg_kde_koala_KAboutData_2 (JNIEnv *env, jclass, jobjectArray, jobject);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_TDECmdLineArgs_init__Lorg_kde_koala_KAboutData_2 (JNIEnv *env, jclass, jobject);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDECmdLineArgs_init___3Ljava_lang_String_2Lorg_kde_koala_TDEAboutData_2Z (JNIEnv *env, jclass, jobjectArray, jobject, jboolean);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDECmdLineArgs_init___3Ljava_lang_String_2Lorg_kde_koala_TDEAboutData_2 (JNIEnv *env, jclass, jobjectArray, jobject);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDECmdLineArgs_init__Lorg_kde_koala_TDEAboutData_2 (JNIEnv *env, jclass, jobject);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_TDECmdLineArgs_addCmdLineOptions___3_3Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jclass, jobjectArray, jstring, jstring, jstring);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_TDECmdLineArgs_addCmdLineOptions___3_3Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jclass, jobjectArray, jstring, jstring);
 extern JNIEXPORT void JNICALL Java_org_kde_koala_TDECmdLineArgs_addCmdLineOptions___3_3Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jclass, jobjectArray, jstring);
diff --git a/kdejava/koala/org/kde/koala/DockMainWindow.java b/kdejava/koala/org/kde/koala/DockMainWindow.java
index 14c3c4b7..f0fd54c0 100644
--- a/kdejava/koala/org/kde/koala/DockMainWindow.java
+++ b/kdejava/koala/org/kde/koala/DockMainWindow.java
@@ -70,19 +70,19 @@ public class DockMainWindow extends KDockMainWindow implements PartBaseInterface
 	public native void setPartObject(TQObject object);
 	public native TQObject partObject();
 	/**	
-		 Set the instance ( KInstance) for this part.
+		 Set the instance ( TDEInstance) for this part.
 			 Call this first in the inherited class constructor,
 		 because it loads the i18n catalogues.
-		   		@short    Set the instance ( KInstance) for this part.
+		   		@short    Set the instance ( TDEInstance) for this part.
 	*/
-	protected native void setInstance(KInstanceInterface instance);
+	protected native void setInstance(TDEInstanceInterface instance);
 	/**	
-		 Set the instance ( KInstance) for this part.
+		 Set the instance ( TDEInstance) for this part.
 			 Call this first in the inherited class constructor,
 		 because it loads the i18n catalogues.
-		   		@short    Set the instance ( KInstance) for this part.
+		   		@short    Set the instance ( TDEInstance) for this part.
 	*/
-	protected native void setInstance(KInstanceInterface instance, boolean loadPlugins);
+	protected native void setInstance(TDEInstanceInterface instance, boolean loadPlugins);
 	/**	
 		 Load the Plugins honoring the PluginLoadingMode.
 			 If you call this method in an already constructed GUI (like when the user
@@ -103,7 +103,7 @@ public class DockMainWindow extends KDockMainWindow implements PartBaseInterface
 		 </pre>
 		   		@short    Load the Plugins honoring the PluginLoadingMode.
 	*/
-	protected native void loadPlugins(TQObject parent, KXMLGUIClientInterface parentGUIClient, KInstanceInterface instance);
+	protected native void loadPlugins(TQObject parent, KXMLGUIClientInterface parentGUIClient, TDEInstanceInterface instance);
 	/**	
 		 For a KParts.Part: call this before setInstance().
 		 For a KParts.MainWindow: call this before createGUI().
diff --git a/kdejava/koala/org/kde/koala/Factory.java b/kdejava/koala/org/kde/koala/Factory.java
index 6059e9a4..80be6662 100644
--- a/kdejava/koala/org/kde/koala/Factory.java
+++ b/kdejava/koala/org/kde/koala/Factory.java
@@ -55,18 +55,18 @@ public class Factory extends KLibFactory  {
 	public native Part createPart();
 	/**	
 		 If you have a part contained in a shared library you might want to query
-		 for meta-information like the about-data, or the KInstance in general.
+		 for meta-information like the about-data, or the TDEInstance in general.
 		 If the part is exported using KParts.GenericFactory then this method will
 		 return the instance that belongs to the part without the need to instantiate
 		 the part component.
-		      		@short    If you have a part contained in a shared library you might want to query  for meta-information like the about-data, or the KInstance in general.
+		      		@short    If you have a part contained in a shared library you might want to query  for meta-information like the about-data, or the TDEInstance in general.
 	*/
-	public native KInstanceInterface partInstance();
+	public native TDEInstanceInterface partInstance();
 	/**	
 		 A convenience method for partInstance() that takes care of retrieving
 		 the factory for a given library name and calling partInstance() on it.
 			@param libraryName name of the library to query the instance from
 		      		@short    A convenience method for partInstance() that takes care of retrieving  the factory for a given library name and calling partInstance() on it.
 	*/
-	public static native KInstanceInterface partInstanceFromLibrary(String libraryName);
+	public static native TDEInstanceInterface partInstanceFromLibrary(String libraryName);
 }
diff --git a/kdejava/koala/org/kde/koala/KAboutApplication.java b/kdejava/koala/org/kde/koala/KAboutApplication.java
index 91f121f5..e65e1a24 100644
--- a/kdejava/koala/org/kde/koala/KAboutApplication.java
+++ b/kdejava/koala/org/kde/koala/KAboutApplication.java
@@ -9,7 +9,7 @@ import org.kde.qt.TQWidget;
 
  This class provides the standard "About Application" dialog box
  that is used by KHelpMenu. It uses the information of the global
- KAboutData that is specified at the start of your program in
+ TDEAboutData that is specified at the start of your program in
  main(). Normally you should not use this class directly but rather
  the KHelpMenu class or even better just subclass your toplevel
  window from KMainWindow. If you do the latter, the help menu and
@@ -57,11 +57,11 @@ public class KAboutApplication extends KAboutDialog  {
 	private native void newKAboutApplication();
 	/**	
 		 Constructor. Mostly does the same stuff as the previous constructor, except
-		 that it can take a custom KAboutData object instead of the one specified
+		 that it can take a custom TDEAboutData object instead of the one specified
 		 in your main() function. This is especially useful for applications
 		 which are implemented as (dynamically loaded) libraries, e.g. panel
 		 applets.
-			@param aboutData A pointer to a KAboutData object which data
+			@param aboutData A pointer to a TDEAboutData object which data
 		        will be used for filling the dialog.
 			@param parent The parent of the dialog box. You should use the
 		        toplevel window so that the dialog becomes centered.
@@ -72,27 +72,27 @@ public class KAboutApplication extends KAboutDialog  {
 		        modal and must be made visible using TQWidget.exec().
 		     		@short    Constructor.
 	*/
-	public KAboutApplication(KAboutData aboutData, TQWidget parent, String name, boolean modal) {
+	public KAboutApplication(TDEAboutData aboutData, TQWidget parent, String name, boolean modal) {
 		super((Class) null);
 		newKAboutApplication(aboutData,parent,name,modal);
 	}
-	private native void newKAboutApplication(KAboutData aboutData, TQWidget parent, String name, boolean modal);
-	public KAboutApplication(KAboutData aboutData, TQWidget parent, String name) {
+	private native void newKAboutApplication(TDEAboutData aboutData, TQWidget parent, String name, boolean modal);
+	public KAboutApplication(TDEAboutData aboutData, TQWidget parent, String name) {
 		super((Class) null);
 		newKAboutApplication(aboutData,parent,name);
 	}
-	private native void newKAboutApplication(KAboutData aboutData, TQWidget parent, String name);
-	public KAboutApplication(KAboutData aboutData, TQWidget parent) {
+	private native void newKAboutApplication(TDEAboutData aboutData, TQWidget parent, String name);
+	public KAboutApplication(TDEAboutData aboutData, TQWidget parent) {
 		super((Class) null);
 		newKAboutApplication(aboutData,parent);
 	}
-	private native void newKAboutApplication(KAboutData aboutData, TQWidget parent);
-	public KAboutApplication(KAboutData aboutData) {
+	private native void newKAboutApplication(TDEAboutData aboutData, TQWidget parent);
+	public KAboutApplication(TDEAboutData aboutData) {
 		super((Class) null);
 		newKAboutApplication(aboutData);
 	}
-	private native void newKAboutApplication(KAboutData aboutData);
-	protected native void buildDialog(KAboutData aboutData);
+	private native void newKAboutApplication(TDEAboutData aboutData);
+	protected native void buildDialog(TDEAboutData aboutData);
 	/** Deletes the wrapped C++ instance */
 	protected native void finalize() throws InternalError;
 	/** Delete the wrapped C++ instance ahead of finalize() */
diff --git a/kdejava/koala/org/kde/koala/KAboutData.java b/kdejava/koala/org/kde/koala/KAboutData.java
index 27deb1ff..3e270d32 100644
--- a/kdejava/koala/org/kde/koala/KAboutData.java
+++ b/kdejava/koala/org/kde/koala/KAboutData.java
@@ -19,10 +19,10 @@ import org.kde.qt.TQImage;
 		@short Holds information needed by the "About" box and other  classes.
 
 */
-public class KAboutData implements QtSupport {
+public class TDEAboutData implements QtSupport {
 	private long _qt;
 	private boolean _allocatedInJavaWorld = true;
-	protected KAboutData(Class dummy){}
+	protected TDEAboutData(Class dummy){}
 
 	/**	
 		 Descibes the license of the software.
@@ -65,34 +65,34 @@ public class KAboutData implements QtSupport {
 		        This defaults to the kde.org bug system.
 			     		@short    Constructor.
 	*/
-	public KAboutData(String appName, String programName, String version, String shortDescription, int licenseType, String copyrightStatement, String text, String homePageAddress, String bugsEmailAddress) {
-		newKAboutData(appName,programName,version,shortDescription,licenseType,copyrightStatement,text,homePageAddress,bugsEmailAddress);
+	public TDEAboutData(String appName, String programName, String version, String shortDescription, int licenseType, String copyrightStatement, String text, String homePageAddress, String bugsEmailAddress) {
+		newTDEAboutData(appName,programName,version,shortDescription,licenseType,copyrightStatement,text,homePageAddress,bugsEmailAddress);
 	}
-	private native void newKAboutData(String appName, String programName, String version, String shortDescription, int licenseType, String copyrightStatement, String text, String homePageAddress, String bugsEmailAddress);
-	public KAboutData(String appName, String programName, String version, String shortDescription, int licenseType, String copyrightStatement, String text, String homePageAddress) {
-		newKAboutData(appName,programName,version,shortDescription,licenseType,copyrightStatement,text,homePageAddress);
+	private native void newTDEAboutData(String appName, String programName, String version, String shortDescription, int licenseType, String copyrightStatement, String text, String homePageAddress, String bugsEmailAddress);
+	public TDEAboutData(String appName, String programName, String version, String shortDescription, int licenseType, String copyrightStatement, String text, String homePageAddress) {
+		newTDEAboutData(appName,programName,version,shortDescription,licenseType,copyrightStatement,text,homePageAddress);
 	}
-	private native void newKAboutData(String appName, String programName, String version, String shortDescription, int licenseType, String copyrightStatement, String text, String homePageAddress);
-	public KAboutData(String appName, String programName, String version, String shortDescription, int licenseType, String copyrightStatement, String text) {
-		newKAboutData(appName,programName,version,shortDescription,licenseType,copyrightStatement,text);
+	private native void newTDEAboutData(String appName, String programName, String version, String shortDescription, int licenseType, String copyrightStatement, String text, String homePageAddress);
+	public TDEAboutData(String appName, String programName, String version, String shortDescription, int licenseType, String copyrightStatement, String text) {
+		newTDEAboutData(appName,programName,version,shortDescription,licenseType,copyrightStatement,text);
 	}
-	private native void newKAboutData(String appName, String programName, String version, String shortDescription, int licenseType, String copyrightStatement, String text);
-	public KAboutData(String appName, String programName, String version, String shortDescription, int licenseType, String copyrightStatement) {
-		newKAboutData(appName,programName,version,shortDescription,licenseType,copyrightStatement);
+	private native void newTDEAboutData(String appName, String programName, String version, String shortDescription, int licenseType, String copyrightStatement, String text);
+	public TDEAboutData(String appName, String programName, String version, String shortDescription, int licenseType, String copyrightStatement) {
+		newTDEAboutData(appName,programName,version,shortDescription,licenseType,copyrightStatement);
 	}
-	private native void newKAboutData(String appName, String programName, String version, String shortDescription, int licenseType, String copyrightStatement);
-	public KAboutData(String appName, String programName, String version, String shortDescription, int licenseType) {
-		newKAboutData(appName,programName,version,shortDescription,licenseType);
+	private native void newTDEAboutData(String appName, String programName, String version, String shortDescription, int licenseType, String copyrightStatement);
+	public TDEAboutData(String appName, String programName, String version, String shortDescription, int licenseType) {
+		newTDEAboutData(appName,programName,version,shortDescription,licenseType);
 	}
-	private native void newKAboutData(String appName, String programName, String version, String shortDescription, int licenseType);
-	public KAboutData(String appName, String programName, String version, String shortDescription) {
-		newKAboutData(appName,programName,version,shortDescription);
+	private native void newTDEAboutData(String appName, String programName, String version, String shortDescription, int licenseType);
+	public TDEAboutData(String appName, String programName, String version, String shortDescription) {
+		newTDEAboutData(appName,programName,version,shortDescription);
 	}
-	private native void newKAboutData(String appName, String programName, String version, String shortDescription);
-	public KAboutData(String appName, String programName, String version) {
-		newKAboutData(appName,programName,version);
+	private native void newTDEAboutData(String appName, String programName, String version, String shortDescription);
+	public TDEAboutData(String appName, String programName, String version) {
+		newTDEAboutData(appName,programName,version);
 	}
-	private native void newKAboutData(String appName, String programName, String version);
+	private native void newTDEAboutData(String appName, String programName, String version);
 	/**	
 		 Defines an author. You can call this function as many times you
 		 need. Each entry is appended to a list. The person in the first entry
diff --git a/kdejava/koala/org/kde/koala/KAboutPerson.java b/kdejava/koala/org/kde/koala/KAboutPerson.java
index a08fcc7b..3cf69a79 100644
--- a/kdejava/koala/org/kde/koala/KAboutPerson.java
+++ b/kdejava/koala/org/kde/koala/KAboutPerson.java
@@ -9,13 +9,13 @@ import org.kde.qt.QtSupport;
  This structure is used to store information about a person or developer.
  It can store the person's name, a task, an email address and a
  link to a home page. This class is intended for use in the
- KAboutData class, but it can be used elsewhere as well.
+ TDEAboutData class, but it can be used elsewhere as well.
  Normally you should at least define the person's name.
  Example Usage within a main():
  <pre>
-   KAboutData about("khello", I18N_NOOP("KHello"), "0.1",
+   TDEAboutData about("khello", I18N_NOOP("KHello"), "0.1",
                    I18N_NOOP("A TDE version of Hello, world!"),
-                   KAboutData.License_LGPL,
+                   TDEAboutData.License_LGPL,
                    I18N_NOOP("Copyright (c) 2003 Developer"));
    about.addAuthor("Joe Developer", I18N_NOOP("developer"), "joe@host.com", 0);
    about.addCredit("Joe User", I18N_NOOP("A lot of bug reports"),
diff --git a/kdejava/koala/org/kde/koala/KAboutTranslator.java b/kdejava/koala/org/kde/koala/KAboutTranslator.java
index e0d07940..2a52d0dd 100644
--- a/kdejava/koala/org/kde/koala/KAboutTranslator.java
+++ b/kdejava/koala/org/kde/koala/KAboutTranslator.java
@@ -8,7 +8,7 @@ import org.kde.qt.QtSupport;
 
  This structure is used to store information about a translator.
  It can store the translator's name and an email address.
- This class is intended for use in the KAboutData class,
+ This class is intended for use in the TDEAboutData class,
  but it can be used elsewhere as well.
  Normally you should at least define the translator's name.
  It's not possible to use KAboutPerson for this, because
diff --git a/kdejava/koala/org/kde/koala/KActionCollection.java b/kdejava/koala/org/kde/koala/KActionCollection.java
index 746d6114..afb3f302 100644
--- a/kdejava/koala/org/kde/koala/KActionCollection.java
+++ b/kdejava/koala/org/kde/koala/KActionCollection.java
@@ -32,11 +32,11 @@ public class KActionCollection extends TQObject  {
 	protected KActionCollection(Class dummy){super((Class) null);}
 	public native TQMetaObject metaObject();
 	public native String className();
-	public KActionCollection(TQWidget parent, String name, KInstanceInterface instance) {
+	public KActionCollection(TQWidget parent, String name, TDEInstanceInterface instance) {
 		super((Class) null);
 		newKActionCollection(parent,name,instance);
 	}
-	private native void newKActionCollection(TQWidget parent, String name, KInstanceInterface instance);
+	private native void newKActionCollection(TQWidget parent, String name, TDEInstanceInterface instance);
 	public KActionCollection(TQWidget parent, String name) {
 		super((Class) null);
 		newKActionCollection(parent,name);
@@ -53,11 +53,11 @@ public class KActionCollection extends TQObject  {
 		 you don't require shortcuts, you can pass a null to the <code>watch</code> parameter.
 		   		@short    Use this constructor if you want the collection's actions to restrict  their accelerator keys to <code>watch</code> rather than the <code>parent.</code>
 	*/
-	public KActionCollection(TQWidget watch, TQObject parent, String name, KInstanceInterface instance) {
+	public KActionCollection(TQWidget watch, TQObject parent, String name, TDEInstanceInterface instance) {
 		super((Class) null);
 		newKActionCollection(watch,parent,name,instance);
 	}
-	private native void newKActionCollection(TQWidget watch, TQObject parent, String name, KInstanceInterface instance);
+	private native void newKActionCollection(TQWidget watch, TQObject parent, String name, TDEInstanceInterface instance);
 	public KActionCollection(TQWidget watch, TQObject parent, String name) {
 		super((Class) null);
 		newKActionCollection(watch,parent,name);
@@ -158,10 +158,10 @@ public class KActionCollection extends TQObject  {
 	public native boolean writeShortcutSettings(String sConfigGroup, KConfigBase pConfig);
 	public native boolean writeShortcutSettings(String sConfigGroup);
 	public native boolean writeShortcutSettings();
-	public native void setInstance(KInstanceInterface instance);
+	public native void setInstance(TDEInstanceInterface instance);
 	/**	 The instance with which this class is associated. 		@short   The instance with which this class is associated.
 	*/
-	public native KInstanceInterface instance();
+	public native TDEInstanceInterface instance();
 	/**	
 		 Enable highlighting notification for specific KActions.
 		 This is false by default, so, by default, the highlighting
@@ -217,11 +217,11 @@ public class KActionCollection extends TQObject  {
 		   		@short    The parent KXMLGUIClient, return 0L if not available.
 	*/
 	public native KXMLGUIClientInterface parentGUIClient();
-	public KActionCollection(TQObject parent, String name, KInstanceInterface instance) {
+	public KActionCollection(TQObject parent, String name, TDEInstanceInterface instance) {
 		super((Class) null);
 		newKActionCollection(parent,name,instance);
 	}
-	private native void newKActionCollection(TQObject parent, String name, KInstanceInterface instance);
+	private native void newKActionCollection(TQObject parent, String name, TDEInstanceInterface instance);
 	public KActionCollection(TQObject parent, String name) {
 		super((Class) null);
 		newKActionCollection(parent,name);
diff --git a/kdejava/koala/org/kde/koala/KActionShortcutList.java b/kdejava/koala/org/kde/koala/KActionShortcutList.java
index 0770839c..15b41151 100644
--- a/kdejava/koala/org/kde/koala/KActionShortcutList.java
+++ b/kdejava/koala/org/kde/koala/KActionShortcutList.java
@@ -22,7 +22,7 @@ public class KActionShortcutList extends KShortcutList  {
 	public native KShortcut shortcutDefault(int arg1);
 	public native boolean isConfigurable(int arg1);
 	public native boolean setShortcut(int arg1, KShortcut arg2);
-	public native KInstanceInterface instance();
+	public native TDEInstanceInterface instance();
 	public native TQVariant getOther(int arg1, int index);
 	public native boolean setOther(int arg1, int index, TQVariant arg3);
 	public native boolean save();
diff --git a/kdejava/koala/org/kde/koala/KBugReport.java b/kdejava/koala/org/kde/koala/KBugReport.java
index 05c7edae..42384963 100644
--- a/kdejava/koala/org/kde/koala/KBugReport.java
+++ b/kdejava/koala/org/kde/koala/KBugReport.java
@@ -10,8 +10,8 @@ import org.kde.qt.TQWidget;
 
  All the information needed by the dialog box
  (program name, version, bug-report address, etc.)
- comes from the KAboutData class.
- Make sure you create an instance of KAboutData and pass it
+ comes from the TDEAboutData class.
+ Make sure you create an instance of TDEAboutData and pass it
  to TDECmdLineArgs.
 		@author David Faure <faure@kde.org>
  
@@ -29,11 +29,11 @@ public class KBugReport extends KDialogBase  {
 		 for "Report Bug..." and of creating a KBugReport dialog.
 		   		@short    Creates a bug-report dialog.
 	*/
-	public KBugReport(TQWidget parent, boolean modal, KAboutData aboutData) {
+	public KBugReport(TQWidget parent, boolean modal, TDEAboutData aboutData) {
 		super((Class) null);
 		newKBugReport(parent,modal,aboutData);
 	}
-	private native void newKBugReport(TQWidget parent, boolean modal, KAboutData aboutData);
+	private native void newKBugReport(TQWidget parent, boolean modal, TDEAboutData aboutData);
 	public KBugReport(TQWidget parent, boolean modal) {
 		super((Class) null);
 		newKBugReport(parent,modal);
diff --git a/kdejava/koala/org/kde/koala/KCModule.java b/kdejava/koala/org/kde/koala/KCModule.java
index f1798402..80ceb4cb 100644
--- a/kdejava/koala/org/kde/koala/KCModule.java
+++ b/kdejava/koala/org/kde/koala/KCModule.java
@@ -74,21 +74,21 @@ public class KCModule extends TQWidget  {
 		newKCModule();
 	}
 	private native void newKCModule();
-	public KCModule(KInstanceInterface instance, TQWidget parent, String[] args) {
+	public KCModule(TDEInstanceInterface instance, TQWidget parent, String[] args) {
 		super((Class) null);
 		newKCModule(instance,parent,args);
 	}
-	private native void newKCModule(KInstanceInterface instance, TQWidget parent, String[] args);
-	public KCModule(KInstanceInterface instance, TQWidget parent) {
+	private native void newKCModule(TDEInstanceInterface instance, TQWidget parent, String[] args);
+	public KCModule(TDEInstanceInterface instance, TQWidget parent) {
 		super((Class) null);
 		newKCModule(instance,parent);
 	}
-	private native void newKCModule(KInstanceInterface instance, TQWidget parent);
-	public KCModule(KInstanceInterface instance) {
+	private native void newKCModule(TDEInstanceInterface instance, TQWidget parent);
+	public KCModule(TDEInstanceInterface instance) {
 		super((Class) null);
 		newKCModule(instance);
 	}
-	private native void newKCModule(KInstanceInterface instance);
+	private native void newKCModule(TDEInstanceInterface instance);
 	/**	
 		 Load the configuration data into the module.
 			 The load method sets the user interface elements of the
@@ -154,16 +154,16 @@ public class KCModule extends TQWidget  {
 	/**	
 		 This is generally only called for the KBugReport.
 		 If you override you should  have it return a pointer to a constant.
-				@return the KAboutData for this module
+				@return the TDEAboutData for this module
    
 		@short    This is generally only called for the KBugReport.
 	*/
-	public native KAboutData aboutData();
+	public native TDEAboutData aboutData();
 	/**	
-		 This sets the KAboutData returned by aboutData()
-				@short    This sets the KAboutData returned by aboutData()
+		 This sets the TDEAboutData returned by aboutData()
+				@short    This sets the TDEAboutData returned by aboutData()
 	*/
-	public native void setAboutData(KAboutData about);
+	public native void setAboutData(TDEAboutData about);
 	/**	
 		 Indicate which buttons will be used.
 			 The return value is a value or'ed together from
@@ -194,7 +194,7 @@ public class KCModule extends TQWidget  {
 		@see KCModule#setUseRootOnlyMsg
 	*/
 	public native boolean useRootOnlyMsg();
-	public native KInstanceInterface instance();
+	public native TDEInstanceInterface instance();
 	/**	
 				@return a list of @ref KConfigDialogManager's in use, if any.
 
diff --git a/kdejava/koala/org/kde/koala/KDE.java b/kdejava/koala/org/kde/koala/KDE.java
index c0f57c5b..1ceb3188 100644
--- a/kdejava/koala/org/kde/koala/KDE.java
+++ b/kdejava/koala/org/kde/koala/KDE.java
@@ -205,7 +205,7 @@ public class KDE {
 		 Load a desktop icon.
 		 		@short    {@link KIconLoader}  Load a desktop icon.
 	*/
-	public static native TQPixmap DesktopIcon(String name, int size, int state, KInstanceInterface instance);
+	public static native TQPixmap DesktopIcon(String name, int size, int state, TDEInstanceInterface instance);
 	public static native TQPixmap DesktopIcon(String name, int size, int state);
 	public static native TQPixmap DesktopIcon(String name, int size);
 	public static native TQPixmap DesktopIcon(String name);
@@ -214,13 +214,13 @@ public class KDE {
 		 Load a desktop icon.
 		 		@short    {@link KIconLoader}  Load a desktop icon.
 	*/
-	public static native TQPixmap DesktopIcon(String name, KInstanceInterface instance);
+	public static native TQPixmap DesktopIcon(String name, TDEInstanceInterface instance);
 	/**	
 		 {@link KIconLoader}
 		 Load a desktop icon, and apply the necessary effects to get an IconSet.
 		 		@short    {@link KIconLoader}  Load a desktop icon, and apply the necessary effects to get an IconSet.
 	*/
-	public static native TQIconSet DesktopIconSet(String name, int size, KInstanceInterface instance);
+	public static native TQIconSet DesktopIconSet(String name, int size, TDEInstanceInterface instance);
 	public static native TQIconSet DesktopIconSet(String name, int size);
 	public static native TQIconSet DesktopIconSet(String name);
 	/**	
@@ -228,7 +228,7 @@ public class KDE {
 		 Load a toolbar icon.
 		 		@short    {@link KIconLoader}  Load a toolbar icon.
 	*/
-	public static native TQPixmap BarIcon(String name, int size, int state, KInstanceInterface instance);
+	public static native TQPixmap BarIcon(String name, int size, int state, TDEInstanceInterface instance);
 	public static native TQPixmap BarIcon(String name, int size, int state);
 	public static native TQPixmap BarIcon(String name, int size);
 	public static native TQPixmap BarIcon(String name);
@@ -237,13 +237,13 @@ public class KDE {
 		 Load a toolbar icon.
 		 		@short    {@link KIconLoader}  Load a toolbar icon.
 	*/
-	public static native TQPixmap BarIcon(String name, KInstanceInterface instance);
+	public static native TQPixmap BarIcon(String name, TDEInstanceInterface instance);
 	/**	
 		 {@link KIconLoader}
 		 Load a toolbar icon, and apply the necessary effects to get an IconSet.
 		 		@short    {@link KIconLoader}  Load a toolbar icon, and apply the necessary effects to get an IconSet.
 	*/
-	public static native TQIconSet BarIconSet(String name, int size, KInstanceInterface instance);
+	public static native TQIconSet BarIconSet(String name, int size, TDEInstanceInterface instance);
 	public static native TQIconSet BarIconSet(String name, int size);
 	public static native TQIconSet BarIconSet(String name);
 	/**	
@@ -251,7 +251,7 @@ public class KDE {
 		 Load a small icon.
 		 		@short    {@link KIconLoader}  Load a small icon.
 	*/
-	public static native TQPixmap SmallIcon(String name, int size, int state, KInstanceInterface instance);
+	public static native TQPixmap SmallIcon(String name, int size, int state, TDEInstanceInterface instance);
 	public static native TQPixmap SmallIcon(String name, int size, int state);
 	public static native TQPixmap SmallIcon(String name, int size);
 	public static native TQPixmap SmallIcon(String name);
@@ -260,13 +260,13 @@ public class KDE {
 		 Load a small icon.
 		 		@short    {@link KIconLoader}  Load a small icon.
 	*/
-	public static native TQPixmap SmallIcon(String name, KInstanceInterface instance);
+	public static native TQPixmap SmallIcon(String name, TDEInstanceInterface instance);
 	/**	
 		 {@link KIconLoader}
 		 Load a small icon, and apply the necessary effects to get an IconSet.
 		 		@short    {@link KIconLoader}  Load a small icon, and apply the necessary effects to get an IconSet.
 	*/
-	public static native TQIconSet SmallIconSet(String name, int size, KInstanceInterface instance);
+	public static native TQIconSet SmallIconSet(String name, int size, TDEInstanceInterface instance);
 	public static native TQIconSet SmallIconSet(String name, int size);
 	public static native TQIconSet SmallIconSet(String name);
 	/**	
@@ -274,7 +274,7 @@ public class KDE {
 		 Load a main toolbar icon.
 		 		@short    {@link KIconLoader}  Load a main toolbar icon.
 	*/
-	public static native TQPixmap MainBarIcon(String name, int size, int state, KInstanceInterface instance);
+	public static native TQPixmap MainBarIcon(String name, int size, int state, TDEInstanceInterface instance);
 	public static native TQPixmap MainBarIcon(String name, int size, int state);
 	public static native TQPixmap MainBarIcon(String name, int size);
 	public static native TQPixmap MainBarIcon(String name);
@@ -283,13 +283,13 @@ public class KDE {
 		 Load a main toolbar icon.
 		 		@short    {@link KIconLoader}  Load a main toolbar icon.
 	*/
-	public static native TQPixmap MainBarIcon(String name, KInstanceInterface instance);
+	public static native TQPixmap MainBarIcon(String name, TDEInstanceInterface instance);
 	/**	
 		 {@link KIconLoader}
 		 Load a main toolbar icon, and apply the effects to get an IconSet.
 		 		@short    {@link KIconLoader}  Load a main toolbar icon, and apply the effects to get an IconSet.
 	*/
-	public static native TQIconSet MainBarIconSet(String name, int size, KInstanceInterface instance);
+	public static native TQIconSet MainBarIconSet(String name, int size, TDEInstanceInterface instance);
 	public static native TQIconSet MainBarIconSet(String name, int size);
 	public static native TQIconSet MainBarIconSet(String name);
 	/**	
@@ -297,7 +297,7 @@ public class KDE {
 		 Load a user icon. User icons are searched in $appdir/pics.
 		 		@short    {@link KIconLoader}  Load a user icon.
 	*/
-	public static native TQPixmap UserIcon(String name, int state, KInstanceInterface instance);
+	public static native TQPixmap UserIcon(String name, int state, TDEInstanceInterface instance);
 	public static native TQPixmap UserIcon(String name, int state);
 	public static native TQPixmap UserIcon(String name);
 	/**	
@@ -305,20 +305,20 @@ public class KDE {
 		 Load a user icon. User icons are searched in $appdir/pics.
 		 		@short    {@link KIconLoader}  Load a user icon.
 	*/
-	public static native TQPixmap UserIcon(String name, KInstanceInterface instance);
+	public static native TQPixmap UserIcon(String name, TDEInstanceInterface instance);
 	/**	
 		 {@link KIconLoader}
 		 Load a user icon, and apply the effects to get an IconSet.
 		 		@short    {@link KIconLoader}  Load a user icon, and apply the effects to get an IconSet.
 	*/
-	public static native TQIconSet UserIconSet(String name, KInstanceInterface instance);
+	public static native TQIconSet UserIconSet(String name, TDEInstanceInterface instance);
 	public static native TQIconSet UserIconSet(String name);
 	/**	
 		 {@link KIconLoader}
 		 Returns the current icon size for a specific group.
 		 		@short    {@link KIconLoader}  Returns the current icon size for a specific group.
 	*/
-	public static native int IconSize(int group, KInstanceInterface instance);
+	public static native int IconSize(int group, TDEInstanceInterface instance);
 	public static native int IconSize(int group);
 	/**	
 		 \addtogroup locates Locate Functions
@@ -364,11 +364,11 @@ public class KDE {
 		    </pre>
 				@short    \addtogroup locates Locate Functions   @{  On The Usage Of 'locate' and 'locateLocal'
 	*/
-	public static native String locate(String type, String filename, KInstanceInterface instance);
+	public static native String locate(String type, String filename, TDEInstanceInterface instance);
 	public static native String locate(String type, String filename);
-	public static native String locateLocal(String type, String filename, KInstanceInterface instance);
+	public static native String locateLocal(String type, String filename, TDEInstanceInterface instance);
 	public static native String locateLocal(String type, String filename);
-	public static native String locateLocal(String type, String filename, boolean createDir, KInstanceInterface instance);
+	public static native String locateLocal(String type, String filename, boolean createDir, TDEInstanceInterface instance);
 	public static native String locateLocal(String type, String filename, boolean createDir);
 	public static native int op_incr(int group);
 	public static native int op_incr(int group, int arg2);
diff --git a/kdejava/koala/org/kde/koala/KDataTool.java b/kdejava/koala/org/kde/koala/KDataTool.java
index fa1f4df3..d56a95c4 100644
--- a/kdejava/koala/org/kde/koala/KDataTool.java
+++ b/kdejava/koala/org/kde/koala/KDataTool.java
@@ -47,7 +47,7 @@ public class KDataTool extends TQObject  {
 	/**	
 			     		@short
 	*/
-	public native void setInstance(KInstanceInterface instance);
+	public native void setInstance(TDEInstanceInterface instance);
 	/**	
 		 Returns the instance of the part that created this tool.
 		 Usually used if the tool wants to read its configuration in the app's config file.
@@ -55,7 +55,7 @@ public class KDataTool extends TQObject  {
      
 		@short    Returns the instance of the part that created this tool.
 	*/
-	public native KInstanceInterface instance();
+	public native TDEInstanceInterface instance();
 	/**	
 		 Interface for 'running' this tool.
 		 This is the method that the data-tool must implement.
diff --git a/kdejava/koala/org/kde/koala/KDataToolInfo.java b/kdejava/koala/org/kde/koala/KDataToolInfo.java
index 594b32d9..5b3e1ea0 100644
--- a/kdejava/koala/org/kde/koala/KDataToolInfo.java
+++ b/kdejava/koala/org/kde/koala/KDataToolInfo.java
@@ -36,7 +36,7 @@ public class KDataToolInfo implements QtSupport {
 			@param instance the instance to use
 		     		@short    Create a valid KDataToolInfo.
 	*/
-	// KDataToolInfo* KDataToolInfo(const KService::Ptr& arg1,KInstance* arg2); >>>> NOT CONVERTED
+	// KDataToolInfo* KDataToolInfo(const KService::Ptr& arg1,TDEInstance* arg2); >>>> NOT CONVERTED
 	/**	
 		 Copy constructor.
 		     		@short    Copy constructor.
@@ -131,7 +131,7 @@ public class KDataToolInfo implements QtSupport {
      
 		@short    The instance of the service.
 	*/
-	public native KInstanceInterface instance();
+	public native TDEInstanceInterface instance();
 	/**	
 		 A DataToolInfo may be invalid if the KService passed to its constructor does
 		 not feature the service type "KDataTool".
@@ -150,7 +150,7 @@ public class KDataToolInfo implements QtSupport {
      
 		@short    Queries the KTrader about installed KDataTool implementations.
 	*/
-	// TQValueList<KDataToolInfo> query(const TQString& arg1,const TQString& arg2,KInstance* arg3); >>>> NOT CONVERTED
+	// TQValueList<KDataToolInfo> query(const TQString& arg1,const TQString& arg2,TDEInstance* arg3); >>>> NOT CONVERTED
 	/** Deletes the wrapped C++ instance */
 	protected native void finalize() throws InternalError;
 	/** Delete the wrapped C++ instance ahead of finalize() */
diff --git a/kdejava/koala/org/kde/koala/KEditToolbarWidget.java b/kdejava/koala/org/kde/koala/KEditToolbarWidget.java
index 23fcaaa0..1c37e907 100644
--- a/kdejava/koala/org/kde/koala/KEditToolbarWidget.java
+++ b/kdejava/koala/org/kde/koala/KEditToolbarWidget.java
@@ -198,11 +198,11 @@ public class KEditToolbarWidget extends TQWidget implements KXMLGUIClientInterfa
 	*/
 	public native KAction action(TQDomElement element);
 	/**	
-				@return The instance ( KInstance ) for this GUI client.
+				@return The instance ( TDEInstance ) for this GUI client.
    
 		@short
 	*/
-	public native KInstanceInterface instance();
+	public native TDEInstanceInterface instance();
 	/**	
 				@return The parsed XML in a TQDomDocument, set by
  setXMLFile() or setXML().
@@ -349,12 +349,12 @@ public class KEditToolbarWidget extends TQWidget implements KXMLGUIClientInterfa
 	public native void prepareXMLUnplug(TQWidget arg1);
 	public static native String findMostRecentXMLFile(String[] files, StringBuffer doc);
 	/**	
-		 Sets the instance ( KInstance) for this part.
+		 Sets the instance ( TDEInstance) for this part.
 			 Call this first in the inherited class constructor.
 		 (At least before setXMLFile().)
-		   		@short    Sets the instance ( KInstance) for this part.
+		   		@short    Sets the instance ( TDEInstance) for this part.
 	*/
-	protected native void setInstance(KInstanceInterface instance);
+	protected native void setInstance(TDEInstanceInterface instance);
 	/**	
 		 Sets the name of the rc file containing the XML for the part.
 			 Call this in the Part-inherited class constructor.
diff --git a/kdejava/koala/org/kde/koala/KGlobal.java b/kdejava/koala/org/kde/koala/KGlobal.java
index 707e4b48..fefce311 100644
--- a/kdejava/koala/org/kde/koala/KGlobal.java
+++ b/kdejava/koala/org/kde/koala/KGlobal.java
@@ -33,7 +33,7 @@ public class KGlobal implements QtSupport {
      
 		@short    Returns the global instance.
 	*/
-	public static native KInstanceInterface instance();
+	public static native TDEInstanceInterface instance();
 	/**	
 		  Returns the application standard dirs object.
 				@return the global standard dir object
@@ -124,8 +124,8 @@ public class KGlobal implements QtSupport {
 		 Don't use this - it's mainly for KAboutDialog and KBugReport.
 			     		@short    The instance currently active (useful in a multi-instance  application, such as a KParts application).
 	*/
-	public static native void setActiveInstance(KInstanceInterface d);
-	public static native KInstanceInterface activeInstance();
+	public static native void setActiveInstance(TDEInstanceInterface d);
+	public static native TDEInstanceInterface activeInstance();
 	/** Deletes the wrapped C++ instance */
 	protected native void finalize() throws InternalError;
 	/** Delete the wrapped C++ instance ahead of finalize() */
diff --git a/kdejava/koala/org/kde/koala/KGuiItem.java b/kdejava/koala/org/kde/koala/KGuiItem.java
index 503d8a6b..94b23269 100644
--- a/kdejava/koala/org/kde/koala/KGuiItem.java
+++ b/kdejava/koala/org/kde/koala/KGuiItem.java
@@ -55,7 +55,7 @@ public class KGuiItem implements QtSupport {
 	private native void newKGuiItem(KGuiItem rhs);
 	public native String text();
 	public native String plainText();
-	public native TQIconSet iconSet(int arg1, int size, KInstanceInterface instance);
+	public native TQIconSet iconSet(int arg1, int size, TDEInstanceInterface instance);
 	public native TQIconSet iconSet(int arg1, int size);
 	public native TQIconSet iconSet(int arg1);
 	public native TQIconSet iconSet();
diff --git a/kdejava/koala/org/kde/koala/KHelpMenu.java b/kdejava/koala/org/kde/koala/KHelpMenu.java
index 68124c85..6f79aeec 100644
--- a/kdejava/koala/org/kde/koala/KHelpMenu.java
+++ b/kdejava/koala/org/kde/koala/KHelpMenu.java
@@ -136,21 +136,21 @@ public class KHelpMenu extends TQObject  {
 		        standard actions.
 			     		@short    Constructor.
 	*/
-	public KHelpMenu(TQWidget parent, KAboutData aboutData, boolean showWhatsThis, KActionCollection actions) {
+	public KHelpMenu(TQWidget parent, TDEAboutData aboutData, boolean showWhatsThis, KActionCollection actions) {
 		super((Class) null);
 		newKHelpMenu(parent,aboutData,showWhatsThis,actions);
 	}
-	private native void newKHelpMenu(TQWidget parent, KAboutData aboutData, boolean showWhatsThis, KActionCollection actions);
-	public KHelpMenu(TQWidget parent, KAboutData aboutData, boolean showWhatsThis) {
+	private native void newKHelpMenu(TQWidget parent, TDEAboutData aboutData, boolean showWhatsThis, KActionCollection actions);
+	public KHelpMenu(TQWidget parent, TDEAboutData aboutData, boolean showWhatsThis) {
 		super((Class) null);
 		newKHelpMenu(parent,aboutData,showWhatsThis);
 	}
-	private native void newKHelpMenu(TQWidget parent, KAboutData aboutData, boolean showWhatsThis);
-	public KHelpMenu(TQWidget parent, KAboutData aboutData) {
+	private native void newKHelpMenu(TQWidget parent, TDEAboutData aboutData, boolean showWhatsThis);
+	public KHelpMenu(TQWidget parent, TDEAboutData aboutData) {
 		super((Class) null);
 		newKHelpMenu(parent,aboutData);
 	}
-	private native void newKHelpMenu(TQWidget parent, KAboutData aboutData);
+	private native void newKHelpMenu(TQWidget parent, TDEAboutData aboutData);
 	/**	
 		 Returns a popup menu you can use in the menu bar or where you
 		 need it.
diff --git a/kdejava/koala/org/kde/koala/KIconLoader.java b/kdejava/koala/org/kde/koala/KIconLoader.java
index 871ee546..dbf56143 100644
--- a/kdejava/koala/org/kde/koala/KIconLoader.java
+++ b/kdejava/koala/org/kde/koala/KIconLoader.java
@@ -67,11 +67,11 @@ public class KIconLoader implements QtSupport {
 			@param dirs the KStandardDirs object to use. If null the global one is used
 			 Usually, you use the default iconloader, which can be accessed via
 		 KGlobal.iconLoader(), so you hardly ever have to create an
-		 iconloader object yourself. That one is the current KInstance's
+		 iconloader object yourself. That one is the current TDEInstance's
 		 (typically TDEApplication's) iconloader.
 				@short    Constructs an iconloader.
 		@see KGlobal#iconLoader
-		@see KInstance#iconLoader
+		@see TDEInstance#iconLoader
 	*/
 	public KIconLoader(String appname, KStandardDirs dirs) {
 		newKIconLoader(appname,dirs);
@@ -287,11 +287,11 @@ public class KIconLoader implements QtSupport {
 	*/
 	public native KIconEffect iconEffect();
 	/**	
-		 Called by KInstance.newIconLoader to reconfigure the icon loader.
+		 Called by TDEInstance.newIconLoader to reconfigure the icon loader.
 			@param _appname the new application name
 			@param _dirs the new standard directories. If 0, the directories
 		              from KGlobal will be taken.
-		     		@short    Called by KInstance.newIconLoader to reconfigure the icon loader.
+		     		@short    Called by TDEInstance.newIconLoader to reconfigure the icon loader.
 	*/
 	public native void reconfigure(String _appname, KStandardDirs _dirs);
 	/**	
@@ -315,7 +315,7 @@ public class KIconLoader implements QtSupport {
 			 The default is disabled, as the iconloader object must not be
 		 destroyed before all those iconsets are destroyed.
 			 (Some broken applications use temporary KIconLoader objects).
-		 Every KInstance 's iconloader has this feature enabled.
+		 Every TDEInstance 's iconloader has this feature enabled.
 			@param enable true to enable delayed icon loading, false to disable
 				@short    Enables on-demand icon loading for TQIconSets using TQIconFactory.
 		@see #isDelayedIconSetLoadingEnabled
diff --git a/kdejava/koala/org/kde/koala/KInstance.java b/kdejava/koala/org/kde/koala/KInstance.java
index 70732b42..a012c30e 100644
--- a/kdejava/koala/org/kde/koala/KInstance.java
+++ b/kdejava/koala/org/kde/koala/KInstance.java
@@ -15,39 +15,39 @@ import org.kde.qt.QtSupport;
 		@short    Access to KDE global objects for use in shared libraries.
 
 */
-public class KInstance implements QtSupport, KInstanceInterface {
+public class TDEInstance implements QtSupport, TDEInstanceInterface {
 	private long _qt;
 	private boolean _allocatedInJavaWorld = true;
-	protected KInstance(Class dummy){}
+	protected TDEInstance(Class dummy){}
 
 	/**	
 		  Constructor.
 			@param instanceName the name of the instance
 		     		@short     Constructor.
 	*/
-	public KInstance(String instanceName) {
-		newKInstance(instanceName);
+	public TDEInstance(String instanceName) {
+		newTDEInstance(instanceName);
 	}
-	private native void newKInstance(String instanceName);
+	private native void newTDEInstance(String instanceName);
 	/**	
 		  Constructor.
-		  When building a KInstance that is not your TDEApplication,
-		  make sure that the KAboutData and the KInstance have the same life time.
+		  When building a TDEInstance that is not your TDEApplication,
+		  make sure that the TDEAboutData and the TDEInstance have the same life time.
 		  You have to destroy both, since the instance doesn't own the about data.
-		  Don't build a KAboutData on the stack in this case !
-		  Building a KAboutData on the stack is only ok for usage with
+		  Don't build a TDEAboutData on the stack in this case !
+		  Building a TDEAboutData on the stack is only ok for usage with
 		  TDECmdLineArgs and TDEApplication (not destroyed until the app exits).
-			@param aboutData data about this instance (see KAboutData)
+			@param aboutData data about this instance (see TDEAboutData)
 		     		@short     Constructor.
 	*/
-	public KInstance(KAboutData aboutData) {
-		newKInstance(aboutData);
+	public TDEInstance(TDEAboutData aboutData) {
+		newTDEInstance(aboutData);
 	}
-	private native void newKInstance(KAboutData aboutData);
-	public KInstance(KInstanceInterface src) {
-		newKInstance(src);
+	private native void newTDEInstance(TDEAboutData aboutData);
+	public TDEInstance(TDEInstanceInterface src) {
+		newTDEInstance(src);
 	}
-	private native void newKInstance(KInstanceInterface src);
+	private native void newTDEInstance(TDEInstanceInterface src);
 	/**	
 		 Returns the application standard dirs object.
 				@return The KStandardDirs of the application.
@@ -89,10 +89,10 @@ public class KInstance implements QtSupport, KInstanceInterface {
      
 		@short     Returns the about data of this instance   Warning, can be 0L
 	*/
-	public native KAboutData aboutData();
+	public native TDEAboutData aboutData();
 	/**	
 		 Returns the name of the instance
-				@return the instance name, can be null if the KInstance has been 
+				@return the instance name, can be null if the TDEInstance has been 
          created with a null name
      
 		@short    Returns the name of the instance
diff --git a/kdejava/koala/org/kde/koala/KInstanceInterface.java b/kdejava/koala/org/kde/koala/KInstanceInterface.java
index db6869b2..2e338eb0 100644
--- a/kdejava/koala/org/kde/koala/KInstanceInterface.java
+++ b/kdejava/koala/org/kde/koala/KInstanceInterface.java
@@ -3,13 +3,13 @@ package org.kde.koala;
 
 import org.kde.qt.QtSupport;
 
-public interface KInstanceInterface {
+public interface TDEInstanceInterface {
 		KStandardDirs dirs();
 		KConfig config();
 		KSharedConfig sharedConfig();
 		KIconLoader iconLoader();
 		void newIconLoader();
-		KAboutData aboutData();
+		TDEAboutData aboutData();
 		String instanceName();
 		KMimeSourceFactory mimeSourceFactory();
 }
diff --git a/kdejava/koala/org/kde/koala/KKeyDialog.java b/kdejava/koala/org/kde/koala/KKeyDialog.java
index 7fc1247d..d6e11da7 100644
--- a/kdejava/koala/org/kde/koala/KKeyDialog.java
+++ b/kdejava/koala/org/kde/koala/KKeyDialog.java
@@ -69,7 +69,7 @@ public class KKeyDialog extends KDialogBase  {
 		 design, with actions in both the document and the view.
 		 Simply call insert with the action collections of each one in turn.
 			@param title the title associated with the collection (if null, the
-		 KAboutData.progName() of the collection's instance is used)
+		 TDEAboutData.progName() of the collection's instance is used)
 				@return true :)
 
 		@short    Insert an action collection, i.
diff --git a/kdejava/koala/org/kde/koala/KLibFactory.java b/kdejava/koala/org/kde/koala/KLibFactory.java
index 4aac16e3..4381dcb1 100644
--- a/kdejava/koala/org/kde/koala/KLibFactory.java
+++ b/kdejava/koala/org/kde/koala/KLibFactory.java
@@ -19,12 +19,12 @@ import org.kde.qt.TQObject;
  of your factory.
  NOTE: you probably want to use KGenericFactory<PluginClassName>
  instead of writing your own factory.
- In the constructor of your factory you should create an instance of KInstance
+ In the constructor of your factory you should create an instance of TDEInstance
  like this:
  <pre>
-     s_global = new KInstance( "kspread" );
+     s_global = new TDEInstance( "kspread" );
  </pre>
- This KInstance is comparable to KGlobal used by normal applications.
+ This TDEInstance is comparable to KGlobal used by normal applications.
  It allows you to find resource files (images, XML, sound etc.) belonging
  to the library.
  If you want to load a library, use KLibLoader. You can query KLibLoader
diff --git a/kdejava/koala/org/kde/koala/KLibLoader.java b/kdejava/koala/org/kde/koala/KLibLoader.java
index 88695376..fb173996 100644
--- a/kdejava/koala/org/kde/koala/KLibLoader.java
+++ b/kdejava/koala/org/kde/koala/KLibLoader.java
@@ -137,10 +137,10 @@ public class KLibLoader extends TQObject  {
 			@param name of the library. If it is not a path, the function searches in
 		             the "module" and "lib" resources. If there is no extension,
 		             ".la" will be appended.
-			@param instance a KInstance used to get the standard paths
+			@param instance a TDEInstance used to get the standard paths
 		     		@short    Helper method which looks for a library in the standard paths  ("module" and "lib" resources).
 	*/
-	public static native String findLibrary(String name, KInstanceInterface instance);
+	public static native String findLibrary(String name, TDEInstanceInterface instance);
 	public static native String findLibrary(String name);
 	public KLibLoader(TQObject parent, String name) {
 		super((Class) null);
diff --git a/kdejava/koala/org/kde/koala/KMainWindow.java b/kdejava/koala/org/kde/koala/KMainWindow.java
index 78bc533b..babf9808 100644
--- a/kdejava/koala/org/kde/koala/KMainWindow.java
+++ b/kdejava/koala/org/kde/koala/KMainWindow.java
@@ -168,7 +168,7 @@ public class KMainWindow extends TQMainWindow implements KXMLGUIBuilderInterface
 		 </pre>
 			@param aboutAppText The string that is used in the application
 		        specific dialog box. If you leave this string empty the
-		        information in the global KAboutData of the
+		        information in the global TDEAboutData of the
 		        application will be used to make a standard dialog box.
 			@param showWhatsThis Set this to false if you do not want to include
 		        the "What's This" menu entry.
@@ -796,8 +796,8 @@ public class KMainWindow extends TQMainWindow implements KXMLGUIBuilderInterface
 	public native boolean isDisposed();
 	public native KXMLGUIClientInterface builderClient();
 	public native void setBuilderClient(KXMLGUIClientInterface client);
-	public native KInstanceInterface builderInstance();
-	public native void setBuilderInstance(KInstanceInterface instance);
+	public native TDEInstanceInterface builderInstance();
+	public native void setBuilderInstance(TDEInstanceInterface instance);
 	public native TQWidget widget();
 	public native ArrayList containerTags();
 	/**	
@@ -848,11 +848,11 @@ public class KMainWindow extends TQMainWindow implements KXMLGUIBuilderInterface
 	*/
 	public native KActionCollection actionCollection();
 	/**	
-				@return The instance ( KInstance ) for this GUI client.
+				@return The instance ( TDEInstance ) for this GUI client.
    
 		@short
 	*/
-	public native KInstanceInterface instance();
+	public native TDEInstanceInterface instance();
 	/**	
 				@return The parsed XML in a TQDomDocument, set by
  setXMLFile() or setXML().
@@ -999,12 +999,12 @@ public class KMainWindow extends TQMainWindow implements KXMLGUIBuilderInterface
 	public native void prepareXMLUnplug(TQWidget arg1);
 	public static native String findMostRecentXMLFile(String[] files, StringBuffer doc);
 	/**	
-		 Sets the instance ( KInstance) for this part.
+		 Sets the instance ( TDEInstance) for this part.
 			 Call this first in the inherited class constructor.
 		 (At least before setXMLFile().)
-		   		@short    Sets the instance ( KInstance) for this part.
+		   		@short    Sets the instance ( TDEInstance) for this part.
 	*/
-	protected native void setInstance(KInstanceInterface instance);
+	protected native void setInstance(TDEInstanceInterface instance);
 	/**	
 		 Sets the name of the rc file containing the XML for the part.
 			 Call this in the Part-inherited class constructor.
diff --git a/kdejava/koala/org/kde/koala/KNotifyClient.java b/kdejava/koala/org/kde/koala/KNotifyClient.java
index 2520e126..34fdbe86 100644
--- a/kdejava/koala/org/kde/koala/KNotifyClient.java
+++ b/kdejava/koala/org/kde/koala/KNotifyClient.java
@@ -206,9 +206,9 @@ public class KNotifyClient {
 	public static native String getDefaultFile(String eventname, int present);
 	/**	
 		 Shortcut to KNotifyClient.Instance.current() :)
-				@return the current KInstance.
+				@return the current TDEInstance.
 	 
 		@short    Shortcut to KNotifyClient.Instance.current() :)
 	*/
-	public static native KInstanceInterface instance();
+	public static native TDEInstanceInterface instance();
 }
diff --git a/kdejava/koala/org/kde/koala/KPluginSelector.java b/kdejava/koala/org/kde/koala/KPluginSelector.java
index 92e03db0..72d47ed5 100644
--- a/kdejava/koala/org/kde/koala/KPluginSelector.java
+++ b/kdejava/koala/org/kde/koala/KPluginSelector.java
@@ -53,7 +53,7 @@ public class KPluginSelector extends TQWidget  {
 		 function.
 			 The information about the plugins will be loaded from the
 		 share/apps/&lt;instancename&gt;/kpartplugins directory.
-			@param instanceName The name of the KInstance of the plugin's parent.
+			@param instanceName The name of the TDEInstance of the plugin's parent.
 			@param catname The translated name of the category. This is the
 		                     name that is shown in the TabWidget if there is
 		                     more than one category.
@@ -82,10 +82,10 @@ public class KPluginSelector extends TQWidget  {
 		 If not set explicitely, <code>config</code> is set to instance.config().
 		         		@short    Add a list of KParts plugins.
 	*/
-	public native void addPlugins(KInstanceInterface instance, String catname, String category, KConfig config);
-	public native void addPlugins(KInstanceInterface instance, String catname, String category);
-	public native void addPlugins(KInstanceInterface instance, String catname);
-	public native void addPlugins(KInstanceInterface instance);
+	public native void addPlugins(TDEInstanceInterface instance, String catname, String category, KConfig config);
+	public native void addPlugins(TDEInstanceInterface instance, String catname, String category);
+	public native void addPlugins(TDEInstanceInterface instance, String catname);
+	public native void addPlugins(TDEInstanceInterface instance);
 	/**	
 		 Add a list of non-KParts plugins
 			@param plugininfos A list of KPluginInfo objects containing the
diff --git a/kdejava/koala/org/kde/koala/KShortcutList.java b/kdejava/koala/org/kde/koala/KShortcutList.java
index 34406013..dc19b35f 100644
--- a/kdejava/koala/org/kde/koala/KShortcutList.java
+++ b/kdejava/koala/org/kde/koala/KShortcutList.java
@@ -116,12 +116,12 @@ public class KShortcutList implements QtSupport {
 	*/
 	public native int index(KKeySequence keySeq);
 	/**	
-		 The KInstance.
-				@return the KInstance of the list, can be 0 if not available
+		 The TDEInstance.
+				@return the TDEInstance of the list, can be 0 if not available
 	 
-		@short    The KInstance.
+		@short    The TDEInstance.
 	*/
-	public native KInstanceInterface instance();
+	public native TDEInstanceInterface instance();
 	/**	 \internal 		@short   \internal
 	*/
 	public native TQVariant getOther(int arg1, int index);
diff --git a/kdejava/koala/org/kde/koala/KStandardDirs.java b/kdejava/koala/org/kde/koala/KStandardDirs.java
index fa216f4a..b153e7da 100644
--- a/kdejava/koala/org/kde/koala/KStandardDirs.java
+++ b/kdejava/koala/org/kde/koala/KStandardDirs.java
@@ -129,7 +129,7 @@ import java.util.ArrayList;
  appends the name of the application.
  So while you had to .locate("data", "appname/filename") so you can
  also write .locate("appdata", "filename") if your TDEApplication instance
- is called "appname" (as set via TDEApplication's constructor or KAboutData, if
+ is called "appname" (as set via TDEApplication's constructor or TDEAboutData, if
  you use the global KStandardDirs object KGlobal.dirs()).
  Please note though that you cannot use the "appdata"
  type if you intend to use it in an applet for Kicker because 'appname' would
diff --git a/kdejava/koala/org/kde/koala/KSystemTray.java b/kdejava/koala/org/kde/koala/KSystemTray.java
index 1b46e082..772feec6 100644
--- a/kdejava/koala/org/kde/koala/KSystemTray.java
+++ b/kdejava/koala/org/kde/koala/KSystemTray.java
@@ -94,7 +94,7 @@ public class KSystemTray extends TQLabel  {
 	public native void setPixmap(TQPixmap icon);
 	/**	
 		 Changes the tray's text description (which can be seen e.g. in the systray
-		 configuration dialog). The default value is KAboutData.programName().
+		 configuration dialog). The default value is TDEAboutData.programName().
 		     		@short    Changes the tray's text description (which can be seen e.
 	*/
 	public native void setCaption(String title);
@@ -123,7 +123,7 @@ public class KSystemTray extends TQLabel  {
 		 It's commonly used in the form : systray.setPixmap( systray.loadIcon( "mysystray" ) );
 				@short    Loads an icon <code>icon</code> using the icon loader class of the given instance <code>instance.</code>
 	*/
-	public static native TQPixmap loadIcon(String icon, KInstanceInterface instance);
+	public static native TQPixmap loadIcon(String icon, TDEInstanceInterface instance);
 	public static native TQPixmap loadIcon(String icon);
 	/**	
 		       Reimplemented to provide the standard show/raise behavior
diff --git a/kdejava/koala/org/kde/koala/KToolBar.java b/kdejava/koala/org/kde/koala/KToolBar.java
index 07417db1..ebda229c 100644
--- a/kdejava/koala/org/kde/koala/KToolBar.java
+++ b/kdejava/koala/org/kde/koala/KToolBar.java
@@ -196,7 +196,7 @@ public class KToolBar extends TQToolBar  {
    
 		@short    Insert a button (a KToolBarButton) with a pixmap.
 	*/
-	public native int insertButton(String icon, int id, boolean enabled, String text, int index, KInstanceInterface _instance);
+	public native int insertButton(String icon, int id, boolean enabled, String text, int index, TDEInstanceInterface _instance);
 	public native int insertButton(String icon, int id, boolean enabled, String text, int index);
 	public native int insertButton(String icon, int id, boolean enabled, String text);
 	public native int insertButton(String icon, int id, boolean enabled);
@@ -218,7 +218,7 @@ public class KToolBar extends TQToolBar  {
    
 		@short    This is the same as above, but with specified signals and  slots to which this button will be connected.
 	*/
-	public native int insertButton(String icon, int id, String signal, TQObject receiver, String slot, boolean enabled, String text, int index, KInstanceInterface _instance);
+	public native int insertButton(String icon, int id, String signal, TQObject receiver, String slot, boolean enabled, String text, int index, TDEInstanceInterface _instance);
 	public native int insertButton(String icon, int id, String signal, TQObject receiver, String slot, boolean enabled, String text, int index);
 	public native int insertButton(String icon, int id, String signal, TQObject receiver, String slot, boolean enabled, String text);
 	public native int insertButton(String icon, int id, String signal, TQObject receiver, String slot, boolean enabled);
diff --git a/kdejava/koala/org/kde/koala/KToolBarButton.java b/kdejava/koala/org/kde/koala/KToolBarButton.java
index 47d8a9c3..25bbd746 100644
--- a/kdejava/koala/org/kde/koala/KToolBarButton.java
+++ b/kdejava/koala/org/kde/koala/KToolBarButton.java
@@ -40,11 +40,11 @@ public class KToolBarButton extends TQToolButton  {
 			@param _instance the instance to use for this button
 		   		@short    Construct a button with an icon loaded by the button itself.
 	*/
-	public KToolBarButton(String icon, int id, TQWidget parent, String name, String txt, KInstanceInterface _instance) {
+	public KToolBarButton(String icon, int id, TQWidget parent, String name, String txt, TDEInstanceInterface _instance) {
 		super((Class) null);
 		newKToolBarButton(icon,id,parent,name,txt,_instance);
 	}
-	private native void newKToolBarButton(String icon, int id, TQWidget parent, String name, String txt, KInstanceInterface _instance);
+	private native void newKToolBarButton(String icon, int id, TQWidget parent, String name, String txt, TDEInstanceInterface _instance);
 	public KToolBarButton(String icon, int id, TQWidget parent, String name, String txt) {
 		super((Class) null);
 		newKToolBarButton(icon,id,parent,name,txt);
diff --git a/kdejava/koala/org/kde/koala/KUniqueApplication.java b/kdejava/koala/org/kde/koala/KUniqueApplication.java
index 2884efe0..e75e9288 100644
--- a/kdejava/koala/org/kde/koala/KUniqueApplication.java
+++ b/kdejava/koala/org/kde/koala/KUniqueApplication.java
@@ -117,7 +117,7 @@ public class KUniqueApplication extends TDEApplication implements DCOPObjectInte
 			 Typically this is used like:
 		 <pre>
 		 int main(String[] args) {
-		    KAboutData about("myappname", "myAppName", .....);
+		    TDEAboutData about("myappname", "myAppName", .....);
 		    TDECmdLineArgs.init(args, &about);
 		    TDECmdLineArgs.addCmdLineOptions( myCmdOptions );
 		    KUniqueApplication.addCmdLineOptions();
diff --git a/kdejava/koala/org/kde/koala/KXMLGUIBuilder.java b/kdejava/koala/org/kde/koala/KXMLGUIBuilder.java
index acf8a793..c73a0ab7 100644
--- a/kdejava/koala/org/kde/koala/KXMLGUIBuilder.java
+++ b/kdejava/koala/org/kde/koala/KXMLGUIBuilder.java
@@ -27,8 +27,8 @@ public class KXMLGUIBuilder implements QtSupport, KXMLGUIBuilderInterface {
 	private native void newKXMLGUIBuilder(TQWidget widget);
 	public native KXMLGUIClientInterface builderClient();
 	public native void setBuilderClient(KXMLGUIClientInterface client);
-	public native KInstanceInterface builderInstance();
-	public native void setBuilderInstance(KInstanceInterface instance);
+	public native TDEInstanceInterface builderInstance();
+	public native void setBuilderInstance(TDEInstanceInterface instance);
 	public native TQWidget widget();
 	public native ArrayList containerTags();
 	/**	
diff --git a/kdejava/koala/org/kde/koala/KXMLGUIBuilderInterface.java b/kdejava/koala/org/kde/koala/KXMLGUIBuilderInterface.java
index d1d47342..adbc49b5 100644
--- a/kdejava/koala/org/kde/koala/KXMLGUIBuilderInterface.java
+++ b/kdejava/koala/org/kde/koala/KXMLGUIBuilderInterface.java
@@ -9,8 +9,8 @@ import org.kde.qt.TQDomElement;
 public interface KXMLGUIBuilderInterface {
 		KXMLGUIClientInterface builderClient();
 		void setBuilderClient(KXMLGUIClientInterface client);
-		KInstanceInterface builderInstance();
-		void setBuilderInstance(KInstanceInterface instance);
+		TDEInstanceInterface builderInstance();
+		void setBuilderInstance(TDEInstanceInterface instance);
 		TQWidget widget();
 		ArrayList containerTags();
 		TQWidget createContainer(TQWidget parent, int index, TQDomElement element, int[] id);
diff --git a/kdejava/koala/org/kde/koala/KXMLGUIClient.java b/kdejava/koala/org/kde/koala/KXMLGUIClient.java
index 20cdd967..0b916257 100644
--- a/kdejava/koala/org/kde/koala/KXMLGUIClient.java
+++ b/kdejava/koala/org/kde/koala/KXMLGUIClient.java
@@ -72,11 +72,11 @@ public class KXMLGUIClient implements QtSupport, KXMLGUIClientInterface {
 	*/
 	public native KActionCollection actionCollection();
 	/**	
-				@return The instance ( KInstance ) for this GUI client.
+				@return The instance ( TDEInstance ) for this GUI client.
    
 		@short
 	*/
-	public native KInstanceInterface instance();
+	public native TDEInstanceInterface instance();
 	/**	
 				@return The parsed XML in a TQDomDocument, set by
  setXMLFile() or setXML().
@@ -223,12 +223,12 @@ public class KXMLGUIClient implements QtSupport, KXMLGUIClientInterface {
 	public native void prepareXMLUnplug(TQWidget arg1);
 	public static native String findMostRecentXMLFile(String[] files, StringBuffer doc);
 	/**	
-		 Sets the instance ( KInstance) for this part.
+		 Sets the instance ( TDEInstance) for this part.
 			 Call this first in the inherited class constructor.
 		 (At least before setXMLFile().)
-		   		@short    Sets the instance ( KInstance) for this part.
+		   		@short    Sets the instance ( TDEInstance) for this part.
 	*/
-	protected native void setInstance(KInstanceInterface instance);
+	protected native void setInstance(TDEInstanceInterface instance);
 	/**	
 		 Sets the name of the rc file containing the XML for the part.
 			 Call this in the Part-inherited class constructor.
diff --git a/kdejava/koala/org/kde/koala/KXMLGUIClientInterface.java b/kdejava/koala/org/kde/koala/KXMLGUIClientInterface.java
index b22ac418..37982a59 100644
--- a/kdejava/koala/org/kde/koala/KXMLGUIClientInterface.java
+++ b/kdejava/koala/org/kde/koala/KXMLGUIClientInterface.java
@@ -10,7 +10,7 @@ public interface KXMLGUIClientInterface {
 		KAction action(String name);
 		KAction action(TQDomElement element);
 		KActionCollection actionCollection();
-		KInstanceInterface instance();
+		TDEInstanceInterface instance();
 		TQDomDocument domDocument();
 		String xmlFile();
 		String localXMLFile();
diff --git a/kdejava/koala/org/kde/koala/KXMLGUIFactory.java b/kdejava/koala/org/kde/koala/KXMLGUIFactory.java
index f598b159..80da94a4 100644
--- a/kdejava/koala/org/kde/koala/KXMLGUIFactory.java
+++ b/kdejava/koala/org/kde/koala/KXMLGUIFactory.java
@@ -138,11 +138,11 @@ public class KXMLGUIFactory extends TQObject  {
 	public native int configureShortcuts(boolean bAllowLetterShortcuts, boolean bSaveSettings);
 	public native int configureShortcuts(boolean bAllowLetterShortcuts);
 	public native int configureShortcuts();
-	public static native String readConfigFile(String filename, boolean never_null, KInstanceInterface instance);
+	public static native String readConfigFile(String filename, boolean never_null, TDEInstanceInterface instance);
 	public static native String readConfigFile(String filename, boolean never_null);
-	public static native String readConfigFile(String filename, KInstanceInterface instance);
+	public static native String readConfigFile(String filename, TDEInstanceInterface instance);
 	public static native String readConfigFile(String filename);
-	public static native boolean saveConfigFile(TQDomDocument doc, String filename, KInstanceInterface instance);
+	public static native boolean saveConfigFile(TQDomDocument doc, String filename, TDEInstanceInterface instance);
 	public static native boolean saveConfigFile(TQDomDocument doc, String filename);
 	public static native String documentToXML(TQDomDocument doc);
 	public static native String elementToXML(TQDomElement elem);
diff --git a/kdejava/koala/org/kde/koala/MainWindow.java b/kdejava/koala/org/kde/koala/MainWindow.java
index 425acb20..a7f7d886 100644
--- a/kdejava/koala/org/kde/koala/MainWindow.java
+++ b/kdejava/koala/org/kde/koala/MainWindow.java
@@ -134,19 +134,19 @@ public class MainWindow extends KMainWindow implements PartBaseInterface {
 	public native void setPartObject(TQObject object);
 	public native TQObject partObject();
 	/**	
-		 Set the instance ( KInstance) for this part.
+		 Set the instance ( TDEInstance) for this part.
 			 Call this first in the inherited class constructor,
 		 because it loads the i18n catalogues.
-		   		@short    Set the instance ( KInstance) for this part.
+		   		@short    Set the instance ( TDEInstance) for this part.
 	*/
-	protected native void setInstance(KInstanceInterface instance);
+	protected native void setInstance(TDEInstanceInterface instance);
 	/**	
-		 Set the instance ( KInstance) for this part.
+		 Set the instance ( TDEInstance) for this part.
 			 Call this first in the inherited class constructor,
 		 because it loads the i18n catalogues.
-		   		@short    Set the instance ( KInstance) for this part.
+		   		@short    Set the instance ( TDEInstance) for this part.
 	*/
-	protected native void setInstance(KInstanceInterface instance, boolean loadPlugins);
+	protected native void setInstance(TDEInstanceInterface instance, boolean loadPlugins);
 	/**	
 		 Load the Plugins honoring the PluginLoadingMode.
 			 If you call this method in an already constructed GUI (like when the user
@@ -167,7 +167,7 @@ public class MainWindow extends KMainWindow implements PartBaseInterface {
 		 </pre>
 		   		@short    Load the Plugins honoring the PluginLoadingMode.
 	*/
-	protected native void loadPlugins(TQObject parent, KXMLGUIClientInterface parentGUIClient, KInstanceInterface instance);
+	protected native void loadPlugins(TQObject parent, KXMLGUIClientInterface parentGUIClient, TDEInstanceInterface instance);
 	/**	
 		 For a KParts.Part: call this before setInstance().
 		 For a KParts.MainWindow: call this before createGUI().
diff --git a/kdejava/koala/org/kde/koala/Makefile.am b/kdejava/koala/org/kde/koala/Makefile.am
index 1a1d49f3..889e2156 100644
--- a/kdejava/koala/org/kde/koala/Makefile.am
+++ b/kdejava/koala/org/kde/koala/Makefile.am
@@ -1,7 +1,7 @@
 ####### tdevelop will overwrite this part!!! (begin)##########
 
 
-EXTRA_DIST = KGlobal.java KMdiToolViewAccessor.java BrowserExtension.java DCOPClient.java DCOPObject.java DCOPObjectInterface.java DCOPObjectProxy.java KAboutApplication.java KAboutContainer.java KAboutData.java KAboutDialog.java KAboutKDE.java KAboutPerson.java KAboutWidget.java KAccel.java KAction.java KActionCollection.java KActionMenu.java KActionSeparator.java KAnimWidget.java TDEApplication.java KAudioPlayer.java KAuthIcon.java KBugReport.java KButtonBox.java KCModule.java KCharSelect.java KCharSelectTable.java KCharsets.java TDECmdLineArgs.java KColorButton.java KColorCombo.java KColorDrag.java KCombiView.java KComboBox.java KCompletion.java KCompletionBase.java KCompletionBaseInterface.java KConfig.java KConfigBackEnd.java KConfigBase.java KConfigGroupSaver.java KConfigINIBackEnd.java KContextMenuManager.java KCursor.java KDCOPActionProxy.java KDCOPPropertyProxy.java KDEDesktopMimeType.java KDatePicker.java KDateTable.java KDateValidator.java KDesktopFile.java KDialog.java KDialogBase.java KDirOperator.java KDirWatch.java KDockWidgetAbstractHeader.java KDockWidgetAbstractHeaderDrag.java KDockWidgetHeader.java KDockWidgetHeaderDrag.java KDoubleNumInput.java KDualColorButton.java KEdFind.java KEdGotoLine.java KEdReplace.java KEditToolbar.java KEditToolbarWidget.java KEntry.java KEntryKey.java KExecMimeType.java KFile.java KFileDetailView.java KFileDialog.java KFileFilter.java KFileIconView.java KFileIconViewItem.java KFileItem.java KFileListViewItem.java KFilePreview.java KFileView.java KFileViewInterface.java KFileViewSignaler.java KFolderType.java KFontAction.java KFontChooser.java KFontDialog.java KFontSizeAction.java KGlobalAccel.java KGlobalSettings.java KGradientSelector.java KHTMLPart.java KHTMLSettings.java KHTMLView.java KHelpMenu.java KHistoryCombo.java KIPC.java KIconButton.java KIconCanvas.java KIconDialog.java KIconEffect.java KIconLoader.java KIconView.java KImageEffect.java KImageIO.java KInstance.java KInstanceInterface.java KIntNumInput.java KIntSpinBox.java KIntValidator.java KJanusWidget.java KKeyChooser.java KLed.java KLibFactory.java KLibLoader.java KLineEdit.java KListBox.java KListView.java KLocale.java KMainWindow.java KMenuBar.java KMessageBox.java KMimeType.java KNotifyClient.java KNumInput.java KOpenWithDlg.java KPalette.java KPanelApplet.java KPanelMenu.java KPasswordDialog.java KPasswordEdit.java KPixmap.java KPixmapEffect.java KPixmapIO.java KPixmapProvider.java KPopupFrame.java KPopupMenu.java KPopupTitle.java KProcIO.java KProcess.java KProcessController.java KProcessRunner.java KProgress.java KProtocolInfo.java KProtocolManager.java KRFCDate.java KRadioAction.java KRandomSequence.java KRecentDocument.java KRestrictedLine.java KRootPermsIcon.java KRootPixmap.java KRootProp.java KRuler.java KRun.java KSSL.java KSSLCertificate.java KSSLCertificateHome.java KSSLConnectionInfo.java KSSLInfoDlg.java KSSLPeerInfo.java KSSLSettings.java KSSLX509Map.java KSaveFile.java KSelectAction.java KSelector.java KSeparator.java KService.java KServiceGroup.java KServiceOffer.java KServiceType.java KServiceTypeProfile.java KSessionManaged.java KShared.java KShellCompletion.java KShred.java KSimpleConfig.java KSpell.java KSpellConfig.java KSpellDlg.java KStandardDirs.java KStaticDeleterBase.java KStatusBar.java KStatusBarLabel.java KStdAccel.java KStdAction.java KStringHandler.java KSycoca.java KSycocaEntry.java KSystemTray.java KTabCtl.java KTempFile.java KTextBrowser.java KToggleAction.java KToolBar.java KToolBarButton.java KToolBarRadioGroup.java KToolBarSeparator.java KTrader.java KURIFilter.java KURIFilterData.java KURIFilterPlugin.java KURL.java KURLComboBox.java KURLCompletion.java KURLDrag.java KURLLabel.java KURLRequester.java KURLRequesterDlg.java KUniqueApplication.java KWizard.java KWritePermsIcon.java KXMLGUIBuilder.java KXMLGUIBuilderInterface.java KXMLGUIClient.java KXMLGUIClientInterface.java KXMLGUIFactory.java KXYSelector.java Part.java PartBaseInterface.java ReadOnlyPart.java NetAccess.java kdejava.java Event.java GUIActivateEvent.java MouseEvent.java OpenURLEvent.java PartActivateEvent.java PartSelectEvent.java ReadWritePart.java DocumentFragment.java DocumentStyle.java DocumentType.java HTMLDocument.java NamedNodeMap.java CSSStyleSheet.java StyleSheet.java CSSException.java CSSPrimitiveValue.java CSSStyleDeclaration.java CSSValue.java Counter.java RGBColor.java Rect.java Element.java HTMLAnchorElement.java HTMLAppletElement.java HTMLAreaElement.java HTMLBRElement.java HTMLBaseElement.java HTMLBaseFontElement.java HTMLBlockquoteElement.java HTMLBodyElement.java HTMLButtonElement.java HTMLCollection.java HTMLDListElement.java HTMLDirectoryElement.java HTMLDivElement.java HTMLElement.java HTMLFieldSetElement.java HTMLFontElement.java HTMLFormElement.java HTMLFrameElement.java HTMLFrameSetElement.java HTMLHRElement.java HTMLHeadElement.java HTMLHeadingElement.java HTMLHtmlElement.java HTMLIFrameElement.java HTMLImageElement.java HTMLInputElement.java HTMLIsIndexElement.java HTMLLIElement.java HTMLLabelElement.java HTMLLegendElement.java HTMLLinkElement.java HTMLMapElement.java HTMLMenuElement.java HTMLMetaElement.java HTMLModElement.java HTMLOListElement.java HTMLObjectElement.java HTMLOptGroupElement.java HTMLOptionElement.java HTMLParagraphElement.java HTMLParamElement.java HTMLPreElement.java HTMLQuoteElement.java HTMLScriptElement.java HTMLSelectElement.java HTMLStyleElement.java HTMLTableCaptionElement.java HTMLTableCellElement.java HTMLTableColElement.java HTMLTableElement.java HTMLTableRowElement.java HTMLTableSectionElement.java HTMLTextAreaElement.java HTMLTitleElement.java HTMLUListElement.java Attr.java DockMainWindow.java MainWindow.java CDATASection.java Comment.java EntityReference.java NodeFilter.java NodeIterator.java ProcessingInstruction.java Range.java Text.java TreeWalker.java CharacterData.java CopyJob.java DeleteJob.java FileCopyJob.java Job.java KDirNotify.java KDirNotifyInterface.java KDirSize.java ListJob.java MimetypeJob.java SimpleJob.java StatJob.java TransferJob.java Connection.java Slave.java KAboutContributor.java KAboutTranslator.java KCodecs.java KCommand.java KCommandHistory.java KCompletionBox.java KDialogQueue.java KEditListBox.java KFilterBase.java KFilterDev.java KFontCombo.java KMacroCommand.java KPanelExtension.java KPixmapSplitter.java KPreviewWidgetBase.java KPushButton.java KScanDialog.java KSqueezedTextLabel.java KToolBarPopupAction.java KTipDatabase.java KTipDialog.java BrowserExtensionSignals.java CopyJobSignals.java DCOPClientSignals.java DeleteJobSignals.java JobSignals.java KAboutContainerSignals.java KAboutContributorSignals.java KAboutDialogSignals.java KAboutWidgetSignals.java KAccelSignals.java KActionCollectionSignals.java KActionSignals.java KAnimWidgetSignals.java TDEApplicationSignals.java KCModuleSignals.java KCharSelectSignals.java KCharSelectTableSignals.java KColorButtonSignals.java KColorComboSignals.java KComboBoxSignals.java KCommandHistorySignals.java KCompletionBoxSignals.java KCompletionSignals.java KDatePickerSignals.java KDateTableSignals.java KDialogBaseSignals.java KDialogSignals.java KDirListerSignals.java KDirOperatorSignals.java KDirWatchSignals.java KDoubleNumInputSignals.java KDualColorButtonSignals.java KEdFindSignals.java KEdReplaceSignals.java KEditListBoxSignals.java KEditSignals.java KEditToolbarSignals.java KEditToolbarWidgetSignals.java KFileDetailViewSignals.java KFileDialogSignals.java KFileIconViewSignals.java KFilePreviewSignals.java KFontChooserSignals.java KFontDialogSignals.java KFontSizeActionSignals.java KHTMLPartSignals.java KHTMLViewSignals.java KHelpMenuSignals.java KHistoryComboSignals.java KIconButtonSignals.java KIconCanvasSignals.java KIconDialogSignals.java KIconViewSignals.java KIntNumInputSignals.java KJanusWidgetSignals.java KKeyChooserSignals.java KLineEditSignals.java KListBoxSignals.java KListViewSignals.java KPanelAppletSignals.java KPanelExtensionSignals.java KPopupMenuSignals.java KProcIOSignals.java KProcessSignals.java KProgressSignals.java KRecentFilesActionSignals.java KRestrictedLineSignals.java KRootPixmapSignals.java KRunSignals.java KScanDialogSignals.java KSelectActionSignals.java KSelectorSignals.java KShredSignals.java KSpellConfigSignals.java KSpellDlgSignals.java KSpellSignals.java KStatusBarLabelSignals.java KStatusBarSignals.java KSycocaSignals.java KSystemTraySignals.java KTabCtlSignals.java KTextBrowserSignals.java KToggleActionSignals.java KToolBarButtonSignals.java KToolBarSignals.java KURLComboBoxSignals.java KURLLabelSignals.java KURLRequesterSignals.java KXMLGUIFactorySignals.java KXYSelectorSignals.java ListJobSignals.java SlaveSignals.java StatJobSignals.java TransferJobSignals.java KListViewItem.java KTar.java KArchive.java KArchiveDirectory.java KSSLPKCS12.java KArchiveEntry.java KArchiveFile.java KFileMetaInfo.java KFileMetaInfoItem.java KGuiItem.java KIconViewItem.java KStdGuiItem.java KDataTool.java KDataToolAction.java KDataToolInfo.java KDateWidget.java KDirSelectDialog.java KEMailSettings.java KFileFilterCombo.java KFileTreeBranch.java KFileTreeView.java KFileTreeViewItem.java KFileTreeViewToolTip.java KMultipleDrag.java KWordWrap.java KDataToolActionSignals.java KDateWidgetSignals.java KFileFilterComboSignals.java KFileTreeBranchSignals.java KFileTreeViewSignals.java KShortcut.java KKey.java KKeyDialog.java KIO.java Scheduler.java SchedulerSignals.java StatusbarProgress.java ProgressBase.java ProgressBaseSignals.java KKeySequence.java KDockMainWindow.java KDockManager.java KDockManagerSignals.java KDockTabGroup.java KDockWidget.java KDockWidgetSignals.java KURLPixmapProvider.java KAccelAction.java KColor.java KColorCells.java KColorCellsSignals.java KColorDialog.java KColorDialogSignals.java KColorPatch.java KColorPatchSignals.java KHSSelector.java KPaletteTable.java KPaletteTableSignals.java KValueSelector.java DCOPAnswer.java KDE.java KSSLCertDlgRet.java KListAction.java KRecentFilesAction.java KArrowButton.java KDateTimeWidget.java KDateTimeWidgetSignals.java KFindDialog.java KFind.java KFindSignals.java KMultiTabBarButton.java KMultiTabBarButtonSignals.java KMultiTabBarTab.java KPrintAction.java KPrintActionSignals.java KProgressDialog.java KReplaceDialog.java KReplace.java KReplaceSignals.java KURLBarSignals.java KMultiTabBar.java KCatalogue.java KDoubleValidator.java KKeyButton.java KMdiChildArea.java KMdiChildFrmCaption.java KMdiChildFrmDragBeginEvent.java KMdiChildFrmDragEndEvent.java KMdiChildFrm.java KMdiChildFrmMoveEvent.java KMdiChildFrmResizeBeginEvent.java KMdiChildFrmResizeEndEvent.java KMdiChildView.java KMdi.java KMdiMainFrm.java KMdiTaskBarButton.java KMdiTaskBar.java KMdiViewCloseEvent.java KMdiWin32IconButton.java KPasteTextAction.java KStringListValidator.java KTabBar.java KTabWidget.java KTextEdit.java KTimeWidget.java KToggleToolBarAction.java KURLComboRequester.java KMdiChildAreaSignals.java KMdiChildViewSignals.java KMdiMainFrmSignals.java KMdiTaskBarButtonSignals.java KMdiWin32IconButtonSignals.java KTabBarSignals.java KTabWidgetSignals.java KTimeWidgetSignals.java DefaultProgress.java SlaveBase.java KEdit.java KFloatValidator.java KMimeMagic.java KMimeMagicResult.java BrowserInterface.java CSSRule.java CSSRuleList.java CustomNodeFilter.java DavJob.java Document.java DomShared.java EventListener.java Invocation.java KCalendarSystem.java KDirLister.java KFileMetaInfoGroup.java KMimeSourceFactory.java KSharedConfig.java KShellProcess.java KShortcutList.java KSSLCertBox.java KSSLCertChain.java KSSLSession.java KSSLX509V3.java KToggleFullScreenAction.java KURLBarItem.java KURLBar.java KURLBarListBox.java Marchaller.java MetaInfoJob.java Node.java Observer.java PreviewJob.java SlaveInterface.java UIEvent.java KAsyncIO.java KAsyncIOSignals.java KBufferedIO.java KBufferedIOSignals.java AuthInfo.java RenameDlg.java AbstractView.java KInputDialog.java KAuthIconSignals.java KFileViewSignalerSignals.java KKeyButtonSignals.java KLibFactorySignals.java KURLBarListBoxSignals.java MetaInfoJobSignals.java PartSignals.java PreviewJobSignals.java ReadOnlyPartSignals.java ReadWritePartSignals.java SlaveInterfaceSignals.java CSSCharsetRule.java CSSFontFaceRule.java CSSImportRule.java CSSMediaRule.java CSSPageRule.java CSSStyleRule.java CSSUnknownRule.java CSSValueList.java DOMException.java DOMImplementation.java Entity.java EventException.java Factory.java HistoryProvider.java HistoryProviderSignals.java HTMLFormCollection.java KAccelShortcutList.java KActionShortcutList.java KActiveLabel.java KAr.java KCalendarSystemFactory.java KCModuleInfo.java KCModuleLoader.java KCMultiDialog.java KCMultiDialogSignals.java KConfigGroup.java KCPUInfo.java KCustomMenuEditor.java KDCOPServiceStarter.java KDiskFreeSp.java KDiskFreeSpSignals.java KDockArea.java KDockAreaSignals.java KFilePlugin.java KFileShare.java KFontRequester.java KFontRequesterSignals.java KIDNA.java KKeyNative.java KMD5.java KMimeTypeResolverBase.java KMimeTypeResolverHelper.java KMimeTypeValidator.java KMountPoint.java KOCRDialog.java KOCRDialogSignals.java KPanelAppMenu.java KPanelAppMenuSignals.java KPassivePopup.java KPassivePopupSignals.java KPluginSelector.java KPluginSelectorSignals.java KRegExpEditorInterface.java KServiceSeparator.java KShell.java KSimpleFileFilter.java KSMIMECrypto.java KSpellingHighlighter.java KSSLCertDlg.java KSSLCertificateCache.java KSSLCertificateFactory.java KSSLKeyGen.java KSSLPKCS7.java KSSLSigners.java KSyntaxHighlighter.java KTempDir.java KURLBarItemDialog.java KWidgetAction.java KWindowInfo.java KXMLGUI.java KZipFileEntry.java KZip.java LinkStyle.java LiveConnectExtension.java LiveConnectExtensionSignals.java MultiGetJob.java MultiGetJobSignals.java MutationEvent.java Notation.java PartBase.java PasswordDialog.java Plugin.java RangeException.java SessionData.java SkipDlg.java SkipDlgSignals.java SlaveConfigSignals.java StatusBarExtension.java TextEvent.java KNamedCommand.java PartManager.java PartManagerSignals.java URLArgs.java WindowArgs.java BrowserHostExtension.java BrowserRun.java KAccelActions.java KDockMainWindowSignals.java StoredTransferJob.java 
+EXTRA_DIST = KGlobal.java KMdiToolViewAccessor.java BrowserExtension.java DCOPClient.java DCOPObject.java DCOPObjectInterface.java DCOPObjectProxy.java KAboutApplication.java KAboutContainer.java TDEAboutData.java KAboutDialog.java KAboutKDE.java KAboutPerson.java KAboutWidget.java KAccel.java KAction.java KActionCollection.java KActionMenu.java KActionSeparator.java KAnimWidget.java TDEApplication.java KAudioPlayer.java KAuthIcon.java KBugReport.java KButtonBox.java KCModule.java KCharSelect.java KCharSelectTable.java KCharsets.java TDECmdLineArgs.java KColorButton.java KColorCombo.java KColorDrag.java KCombiView.java KComboBox.java KCompletion.java KCompletionBase.java KCompletionBaseInterface.java KConfig.java KConfigBackEnd.java KConfigBase.java KConfigGroupSaver.java KConfigINIBackEnd.java KContextMenuManager.java KCursor.java KDCOPActionProxy.java KDCOPPropertyProxy.java KDEDesktopMimeType.java KDatePicker.java KDateTable.java KDateValidator.java KDesktopFile.java KDialog.java KDialogBase.java KDirOperator.java KDirWatch.java KDockWidgetAbstractHeader.java KDockWidgetAbstractHeaderDrag.java KDockWidgetHeader.java KDockWidgetHeaderDrag.java KDoubleNumInput.java KDualColorButton.java KEdFind.java KEdGotoLine.java KEdReplace.java KEditToolbar.java KEditToolbarWidget.java KEntry.java KEntryKey.java KExecMimeType.java KFile.java KFileDetailView.java KFileDialog.java KFileFilter.java KFileIconView.java KFileIconViewItem.java KFileItem.java KFileListViewItem.java KFilePreview.java KFileView.java KFileViewInterface.java KFileViewSignaler.java KFolderType.java KFontAction.java KFontChooser.java KFontDialog.java KFontSizeAction.java KGlobalAccel.java KGlobalSettings.java KGradientSelector.java KHTMLPart.java KHTMLSettings.java KHTMLView.java KHelpMenu.java KHistoryCombo.java KIPC.java KIconButton.java KIconCanvas.java KIconDialog.java KIconEffect.java KIconLoader.java KIconView.java KImageEffect.java KImageIO.java TDEInstance.java TDEInstanceInterface.java KIntNumInput.java KIntSpinBox.java KIntValidator.java KJanusWidget.java KKeyChooser.java KLed.java KLibFactory.java KLibLoader.java KLineEdit.java KListBox.java KListView.java KLocale.java KMainWindow.java KMenuBar.java KMessageBox.java KMimeType.java KNotifyClient.java KNumInput.java KOpenWithDlg.java KPalette.java KPanelApplet.java KPanelMenu.java KPasswordDialog.java KPasswordEdit.java KPixmap.java KPixmapEffect.java KPixmapIO.java KPixmapProvider.java KPopupFrame.java KPopupMenu.java KPopupTitle.java KProcIO.java KProcess.java KProcessController.java KProcessRunner.java KProgress.java KProtocolInfo.java KProtocolManager.java KRFCDate.java KRadioAction.java KRandomSequence.java KRecentDocument.java KRestrictedLine.java KRootPermsIcon.java KRootPixmap.java KRootProp.java KRuler.java KRun.java KSSL.java KSSLCertificate.java KSSLCertificateHome.java KSSLConnectionInfo.java KSSLInfoDlg.java KSSLPeerInfo.java KSSLSettings.java KSSLX509Map.java KSaveFile.java KSelectAction.java KSelector.java KSeparator.java KService.java KServiceGroup.java KServiceOffer.java KServiceType.java KServiceTypeProfile.java KSessionManaged.java KShared.java KShellCompletion.java KShred.java KSimpleConfig.java KSpell.java KSpellConfig.java KSpellDlg.java KStandardDirs.java KStaticDeleterBase.java KStatusBar.java KStatusBarLabel.java KStdAccel.java KStdAction.java KStringHandler.java KSycoca.java KSycocaEntry.java KSystemTray.java KTabCtl.java KTempFile.java KTextBrowser.java KToggleAction.java KToolBar.java KToolBarButton.java KToolBarRadioGroup.java KToolBarSeparator.java KTrader.java KURIFilter.java KURIFilterData.java KURIFilterPlugin.java KURL.java KURLComboBox.java KURLCompletion.java KURLDrag.java KURLLabel.java KURLRequester.java KURLRequesterDlg.java KUniqueApplication.java KWizard.java KWritePermsIcon.java KXMLGUIBuilder.java KXMLGUIBuilderInterface.java KXMLGUIClient.java KXMLGUIClientInterface.java KXMLGUIFactory.java KXYSelector.java Part.java PartBaseInterface.java ReadOnlyPart.java NetAccess.java kdejava.java Event.java GUIActivateEvent.java MouseEvent.java OpenURLEvent.java PartActivateEvent.java PartSelectEvent.java ReadWritePart.java DocumentFragment.java DocumentStyle.java DocumentType.java HTMLDocument.java NamedNodeMap.java CSSStyleSheet.java StyleSheet.java CSSException.java CSSPrimitiveValue.java CSSStyleDeclaration.java CSSValue.java Counter.java RGBColor.java Rect.java Element.java HTMLAnchorElement.java HTMLAppletElement.java HTMLAreaElement.java HTMLBRElement.java HTMLBaseElement.java HTMLBaseFontElement.java HTMLBlockquoteElement.java HTMLBodyElement.java HTMLButtonElement.java HTMLCollection.java HTMLDListElement.java HTMLDirectoryElement.java HTMLDivElement.java HTMLElement.java HTMLFieldSetElement.java HTMLFontElement.java HTMLFormElement.java HTMLFrameElement.java HTMLFrameSetElement.java HTMLHRElement.java HTMLHeadElement.java HTMLHeadingElement.java HTMLHtmlElement.java HTMLIFrameElement.java HTMLImageElement.java HTMLInputElement.java HTMLIsIndexElement.java HTMLLIElement.java HTMLLabelElement.java HTMLLegendElement.java HTMLLinkElement.java HTMLMapElement.java HTMLMenuElement.java HTMLMetaElement.java HTMLModElement.java HTMLOListElement.java HTMLObjectElement.java HTMLOptGroupElement.java HTMLOptionElement.java HTMLParagraphElement.java HTMLParamElement.java HTMLPreElement.java HTMLQuoteElement.java HTMLScriptElement.java HTMLSelectElement.java HTMLStyleElement.java HTMLTableCaptionElement.java HTMLTableCellElement.java HTMLTableColElement.java HTMLTableElement.java HTMLTableRowElement.java HTMLTableSectionElement.java HTMLTextAreaElement.java HTMLTitleElement.java HTMLUListElement.java Attr.java DockMainWindow.java MainWindow.java CDATASection.java Comment.java EntityReference.java NodeFilter.java NodeIterator.java ProcessingInstruction.java Range.java Text.java TreeWalker.java CharacterData.java CopyJob.java DeleteJob.java FileCopyJob.java Job.java KDirNotify.java KDirNotifyInterface.java KDirSize.java ListJob.java MimetypeJob.java SimpleJob.java StatJob.java TransferJob.java Connection.java Slave.java KAboutContributor.java KAboutTranslator.java KCodecs.java KCommand.java KCommandHistory.java KCompletionBox.java KDialogQueue.java KEditListBox.java KFilterBase.java KFilterDev.java KFontCombo.java KMacroCommand.java KPanelExtension.java KPixmapSplitter.java KPreviewWidgetBase.java KPushButton.java KScanDialog.java KSqueezedTextLabel.java KToolBarPopupAction.java KTipDatabase.java KTipDialog.java BrowserExtensionSignals.java CopyJobSignals.java DCOPClientSignals.java DeleteJobSignals.java JobSignals.java KAboutContainerSignals.java KAboutContributorSignals.java KAboutDialogSignals.java KAboutWidgetSignals.java KAccelSignals.java KActionCollectionSignals.java KActionSignals.java KAnimWidgetSignals.java TDEApplicationSignals.java KCModuleSignals.java KCharSelectSignals.java KCharSelectTableSignals.java KColorButtonSignals.java KColorComboSignals.java KComboBoxSignals.java KCommandHistorySignals.java KCompletionBoxSignals.java KCompletionSignals.java KDatePickerSignals.java KDateTableSignals.java KDialogBaseSignals.java KDialogSignals.java KDirListerSignals.java KDirOperatorSignals.java KDirWatchSignals.java KDoubleNumInputSignals.java KDualColorButtonSignals.java KEdFindSignals.java KEdReplaceSignals.java KEditListBoxSignals.java KEditSignals.java KEditToolbarSignals.java KEditToolbarWidgetSignals.java KFileDetailViewSignals.java KFileDialogSignals.java KFileIconViewSignals.java KFilePreviewSignals.java KFontChooserSignals.java KFontDialogSignals.java KFontSizeActionSignals.java KHTMLPartSignals.java KHTMLViewSignals.java KHelpMenuSignals.java KHistoryComboSignals.java KIconButtonSignals.java KIconCanvasSignals.java KIconDialogSignals.java KIconViewSignals.java KIntNumInputSignals.java KJanusWidgetSignals.java KKeyChooserSignals.java KLineEditSignals.java KListBoxSignals.java KListViewSignals.java KPanelAppletSignals.java KPanelExtensionSignals.java KPopupMenuSignals.java KProcIOSignals.java KProcessSignals.java KProgressSignals.java KRecentFilesActionSignals.java KRestrictedLineSignals.java KRootPixmapSignals.java KRunSignals.java KScanDialogSignals.java KSelectActionSignals.java KSelectorSignals.java KShredSignals.java KSpellConfigSignals.java KSpellDlgSignals.java KSpellSignals.java KStatusBarLabelSignals.java KStatusBarSignals.java KSycocaSignals.java KSystemTraySignals.java KTabCtlSignals.java KTextBrowserSignals.java KToggleActionSignals.java KToolBarButtonSignals.java KToolBarSignals.java KURLComboBoxSignals.java KURLLabelSignals.java KURLRequesterSignals.java KXMLGUIFactorySignals.java KXYSelectorSignals.java ListJobSignals.java SlaveSignals.java StatJobSignals.java TransferJobSignals.java KListViewItem.java KTar.java KArchive.java KArchiveDirectory.java KSSLPKCS12.java KArchiveEntry.java KArchiveFile.java KFileMetaInfo.java KFileMetaInfoItem.java KGuiItem.java KIconViewItem.java KStdGuiItem.java KDataTool.java KDataToolAction.java KDataToolInfo.java KDateWidget.java KDirSelectDialog.java KEMailSettings.java KFileFilterCombo.java KFileTreeBranch.java KFileTreeView.java KFileTreeViewItem.java KFileTreeViewToolTip.java KMultipleDrag.java KWordWrap.java KDataToolActionSignals.java KDateWidgetSignals.java KFileFilterComboSignals.java KFileTreeBranchSignals.java KFileTreeViewSignals.java KShortcut.java KKey.java KKeyDialog.java KIO.java Scheduler.java SchedulerSignals.java StatusbarProgress.java ProgressBase.java ProgressBaseSignals.java KKeySequence.java KDockMainWindow.java KDockManager.java KDockManagerSignals.java KDockTabGroup.java KDockWidget.java KDockWidgetSignals.java KURLPixmapProvider.java KAccelAction.java KColor.java KColorCells.java KColorCellsSignals.java KColorDialog.java KColorDialogSignals.java KColorPatch.java KColorPatchSignals.java KHSSelector.java KPaletteTable.java KPaletteTableSignals.java KValueSelector.java DCOPAnswer.java KDE.java KSSLCertDlgRet.java KListAction.java KRecentFilesAction.java KArrowButton.java KDateTimeWidget.java KDateTimeWidgetSignals.java KFindDialog.java KFind.java KFindSignals.java KMultiTabBarButton.java KMultiTabBarButtonSignals.java KMultiTabBarTab.java KPrintAction.java KPrintActionSignals.java KProgressDialog.java KReplaceDialog.java KReplace.java KReplaceSignals.java KURLBarSignals.java KMultiTabBar.java KCatalogue.java KDoubleValidator.java KKeyButton.java KMdiChildArea.java KMdiChildFrmCaption.java KMdiChildFrmDragBeginEvent.java KMdiChildFrmDragEndEvent.java KMdiChildFrm.java KMdiChildFrmMoveEvent.java KMdiChildFrmResizeBeginEvent.java KMdiChildFrmResizeEndEvent.java KMdiChildView.java KMdi.java KMdiMainFrm.java KMdiTaskBarButton.java KMdiTaskBar.java KMdiViewCloseEvent.java KMdiWin32IconButton.java KPasteTextAction.java KStringListValidator.java KTabBar.java KTabWidget.java KTextEdit.java KTimeWidget.java KToggleToolBarAction.java KURLComboRequester.java KMdiChildAreaSignals.java KMdiChildViewSignals.java KMdiMainFrmSignals.java KMdiTaskBarButtonSignals.java KMdiWin32IconButtonSignals.java KTabBarSignals.java KTabWidgetSignals.java KTimeWidgetSignals.java DefaultProgress.java SlaveBase.java KEdit.java KFloatValidator.java KMimeMagic.java KMimeMagicResult.java BrowserInterface.java CSSRule.java CSSRuleList.java CustomNodeFilter.java DavJob.java Document.java DomShared.java EventListener.java Invocation.java KCalendarSystem.java KDirLister.java KFileMetaInfoGroup.java KMimeSourceFactory.java KSharedConfig.java KShellProcess.java KShortcutList.java KSSLCertBox.java KSSLCertChain.java KSSLSession.java KSSLX509V3.java KToggleFullScreenAction.java KURLBarItem.java KURLBar.java KURLBarListBox.java Marchaller.java MetaInfoJob.java Node.java Observer.java PreviewJob.java SlaveInterface.java UIEvent.java KAsyncIO.java KAsyncIOSignals.java KBufferedIO.java KBufferedIOSignals.java AuthInfo.java RenameDlg.java AbstractView.java KInputDialog.java KAuthIconSignals.java KFileViewSignalerSignals.java KKeyButtonSignals.java KLibFactorySignals.java KURLBarListBoxSignals.java MetaInfoJobSignals.java PartSignals.java PreviewJobSignals.java ReadOnlyPartSignals.java ReadWritePartSignals.java SlaveInterfaceSignals.java CSSCharsetRule.java CSSFontFaceRule.java CSSImportRule.java CSSMediaRule.java CSSPageRule.java CSSStyleRule.java CSSUnknownRule.java CSSValueList.java DOMException.java DOMImplementation.java Entity.java EventException.java Factory.java HistoryProvider.java HistoryProviderSignals.java HTMLFormCollection.java KAccelShortcutList.java KActionShortcutList.java KActiveLabel.java KAr.java KCalendarSystemFactory.java KCModuleInfo.java KCModuleLoader.java KCMultiDialog.java KCMultiDialogSignals.java KConfigGroup.java KCPUInfo.java KCustomMenuEditor.java KDCOPServiceStarter.java KDiskFreeSp.java KDiskFreeSpSignals.java KDockArea.java KDockAreaSignals.java KFilePlugin.java KFileShare.java KFontRequester.java KFontRequesterSignals.java KIDNA.java KKeyNative.java KMD5.java KMimeTypeResolverBase.java KMimeTypeResolverHelper.java KMimeTypeValidator.java KMountPoint.java KOCRDialog.java KOCRDialogSignals.java KPanelAppMenu.java KPanelAppMenuSignals.java KPassivePopup.java KPassivePopupSignals.java KPluginSelector.java KPluginSelectorSignals.java KRegExpEditorInterface.java KServiceSeparator.java KShell.java KSimpleFileFilter.java KSMIMECrypto.java KSpellingHighlighter.java KSSLCertDlg.java KSSLCertificateCache.java KSSLCertificateFactory.java KSSLKeyGen.java KSSLPKCS7.java KSSLSigners.java KSyntaxHighlighter.java KTempDir.java KURLBarItemDialog.java KWidgetAction.java KWindowInfo.java KXMLGUI.java KZipFileEntry.java KZip.java LinkStyle.java LiveConnectExtension.java LiveConnectExtensionSignals.java MultiGetJob.java MultiGetJobSignals.java MutationEvent.java Notation.java PartBase.java PasswordDialog.java Plugin.java RangeException.java SessionData.java SkipDlg.java SkipDlgSignals.java SlaveConfigSignals.java StatusBarExtension.java TextEvent.java KNamedCommand.java PartManager.java PartManagerSignals.java URLArgs.java WindowArgs.java BrowserHostExtension.java BrowserRun.java KAccelActions.java KDockMainWindowSignals.java StoredTransferJob.java 
 
 ####### tdevelop will overwrite this part!!! (end)############
 
diff --git a/kdejava/koala/org/kde/koala/Part.java b/kdejava/koala/org/kde/koala/Part.java
index 0d488501..9bd399c7 100644
--- a/kdejava/koala/org/kde/koala/Part.java
+++ b/kdejava/koala/org/kde/koala/Part.java
@@ -159,19 +159,19 @@ public class Part extends TQObject implements PartBaseInterface {
 	public native void setPartObject(TQObject object);
 	public native TQObject partObject();
 	/**	
-		 Set the instance ( KInstance) for this part.
+		 Set the instance ( TDEInstance) for this part.
 			 Call this first in the inherited class constructor,
 		 because it loads the i18n catalogues.
-		   		@short    Set the instance ( KInstance) for this part.
+		   		@short    Set the instance ( TDEInstance) for this part.
 	*/
-	protected native void setInstance(KInstanceInterface instance);
+	protected native void setInstance(TDEInstanceInterface instance);
 	/**	
-		 Set the instance ( KInstance) for this part.
+		 Set the instance ( TDEInstance) for this part.
 			 Call this first in the inherited class constructor,
 		 because it loads the i18n catalogues.
-		   		@short    Set the instance ( KInstance) for this part.
+		   		@short    Set the instance ( TDEInstance) for this part.
 	*/
-	protected native void setInstance(KInstanceInterface instance, boolean loadPlugins);
+	protected native void setInstance(TDEInstanceInterface instance, boolean loadPlugins);
 	/**	
 		 Load the Plugins honoring the PluginLoadingMode.
 			 If you call this method in an already constructed GUI (like when the user
@@ -192,7 +192,7 @@ public class Part extends TQObject implements PartBaseInterface {
 		 </pre>
 		   		@short    Load the Plugins honoring the PluginLoadingMode.
 	*/
-	protected native void loadPlugins(TQObject parent, KXMLGUIClientInterface parentGUIClient, KInstanceInterface instance);
+	protected native void loadPlugins(TQObject parent, KXMLGUIClientInterface parentGUIClient, TDEInstanceInterface instance);
 	/**	
 		 For a KParts.Part: call this before setInstance().
 		 For a KParts.MainWindow: call this before createGUI().
diff --git a/kdejava/koala/org/kde/koala/PartBase.java b/kdejava/koala/org/kde/koala/PartBase.java
index ea374dbc..d71bf129 100644
--- a/kdejava/koala/org/kde/koala/PartBase.java
+++ b/kdejava/koala/org/kde/koala/PartBase.java
@@ -29,19 +29,19 @@ public class PartBase extends KXMLGUIClient  {
 	public native void setPartObject(TQObject object);
 	public native TQObject partObject();
 	/**	
-		 Set the instance ( KInstance) for this part.
+		 Set the instance ( TDEInstance) for this part.
 			 Call this first in the inherited class constructor,
 		 because it loads the i18n catalogues.
-		   		@short    Set the instance ( KInstance) for this part.
+		   		@short    Set the instance ( TDEInstance) for this part.
 	*/
-	protected native void setInstance(KInstanceInterface instance);
+	protected native void setInstance(TDEInstanceInterface instance);
 	/**	
-		 Set the instance ( KInstance) for this part.
+		 Set the instance ( TDEInstance) for this part.
 			 Call this first in the inherited class constructor,
 		 because it loads the i18n catalogues.
-		   		@short    Set the instance ( KInstance) for this part.
+		   		@short    Set the instance ( TDEInstance) for this part.
 	*/
-	protected native void setInstance(KInstanceInterface instance, boolean loadPlugins);
+	protected native void setInstance(TDEInstanceInterface instance, boolean loadPlugins);
 	/**	
 		 Load the Plugins honoring the PluginLoadingMode.
 			 If you call this method in an already constructed GUI (like when the user
@@ -62,7 +62,7 @@ public class PartBase extends KXMLGUIClient  {
 		 </pre>
 		   		@short    Load the Plugins honoring the PluginLoadingMode.
 	*/
-	protected native void loadPlugins(TQObject parent, KXMLGUIClientInterface parentGUIClient, KInstanceInterface instance);
+	protected native void loadPlugins(TQObject parent, KXMLGUIClientInterface parentGUIClient, TDEInstanceInterface instance);
 	/**	
 		 For a KParts.Part: call this before setInstance().
 		 For a KParts.MainWindow: call this before createGUI().
diff --git a/kdejava/koala/org/kde/koala/PartManager.java b/kdejava/koala/org/kde/koala/PartManager.java
index 6c6bdf9f..ebb58389 100644
--- a/kdejava/koala/org/kde/koala/PartManager.java
+++ b/kdejava/koala/org/kde/koala/PartManager.java
@@ -215,7 +215,7 @@ public class PartManager extends TQObject  {
 		 Override if you really need to - usually you don't need to.
 		   		@short    Changes the active instance when the active part changes.
 	*/
-	protected native void setActiveInstance(KInstanceInterface instance);
+	protected native void setActiveInstance(TDEInstanceInterface instance);
 	/**	
 		 Removes a part when it is destroyed.
 				@short    Removes a part when it is destroyed.
diff --git a/kdejava/koala/org/kde/koala/Plugin.java b/kdejava/koala/org/kde/koala/Plugin.java
index 349f4536..46529066 100644
--- a/kdejava/koala/org/kde/koala/Plugin.java
+++ b/kdejava/koala/org/kde/koala/Plugin.java
@@ -67,7 +67,7 @@ public class Plugin extends TQObject implements KXMLGUIClientInterface {
 		 to support enabling and disabling of plugins.
 		     		@short    Load the plugin libraries from the directories appropriate  to <code>instance</code> and make the Plugin objects children of <code>parent.</code>
 	*/
-	public static native void loadPlugins(TQObject parent, KInstanceInterface instance);
+	public static native void loadPlugins(TQObject parent, TDEInstanceInterface instance);
 	/**	
 		 Load the plugin libraries specified by the list <code>docs</code> and make the
 		 Plugin objects children of <code>parent</code> .
@@ -83,7 +83,7 @@ public class Plugin extends TQObject implements KXMLGUIClientInterface {
 		 to support enabling and disabling of plugins.
 		     		@short    Load the plugin libraries specified by the list <code>pluginInfos</code>, make the  Plugin objects children of <code>parent</code>, and use the given <code>instance.</code>
 	*/
-	// void loadPlugins(TQObject* arg1,const TQValueList<KParts::Plugin::PluginInfo>& arg2,const KInstance* arg3); >>>> NOT CONVERTED
+	// void loadPlugins(TQObject* arg1,const TQValueList<KParts::Plugin::PluginInfo>& arg2,const TDEInstance* arg3); >>>> NOT CONVERTED
 	/**	
 		 Load the plugin libraries for the given <code>instance</code>, make the
 		 Plugin objects children of <code>parent</code>, and insert the plugin as a child GUI client
@@ -115,8 +115,8 @@ public class Plugin extends TQObject implements KXMLGUIClientInterface {
 		 </pre>
 		     		@short    Load the plugin libraries for the given <code>instance</code>, make the  Plugin objects children of <code>parent</code>, and insert the plugin as a child GUI client  of <code>parentGUIClient.</code>
 	*/
-	public static native void loadPlugins(TQObject parent, KXMLGUIClientInterface parentGUIClient, KInstanceInterface instance, boolean enableNewPluginsByDefault);
-	public static native void loadPlugins(TQObject parent, KXMLGUIClientInterface parentGUIClient, KInstanceInterface instance);
+	public static native void loadPlugins(TQObject parent, KXMLGUIClientInterface parentGUIClient, TDEInstanceInterface instance, boolean enableNewPluginsByDefault);
+	public static native void loadPlugins(TQObject parent, KXMLGUIClientInterface parentGUIClient, TDEInstanceInterface instance);
 	/**	
 		 Returns a list of plugin objects loaded for <code>parent.</code> This
 		 functions basically calls the queryList method of
@@ -125,14 +125,14 @@ public class Plugin extends TQObject implements KXMLGUIClientInterface {
 				@short    Returns a list of plugin objects loaded for <code>parent.</code>
 	*/
 	// TQPtrList<KParts::Plugin> pluginObjects(TQObject* arg1); >>>> NOT CONVERTED
-	protected native void setInstance(KInstanceInterface instance);
+	protected native void setInstance(TDEInstanceInterface instance);
 	/**	
 		 Look for plugins in the <code>instance</code>'s "data" directory (+"/kpartplugins")
 				@return A list of TQDomDocument s, containing the parsed xml documents returned by plugins.
      
 		@short    Look for plugins in the <code>instance</code>'s "data" directory (+"/kpartplugins")
 	*/
-	// TQValueList<KParts::Plugin::PluginInfo> pluginInfos(const KInstance* arg1); >>>> NOT CONVERTED
+	// TQValueList<KParts::Plugin::PluginInfo> pluginInfos(const TDEInstance* arg1); >>>> NOT CONVERTED
 	/**	
 				@return The plugin created from the library <code>libname</code>
      
@@ -165,11 +165,11 @@ public class Plugin extends TQObject implements KXMLGUIClientInterface {
 	*/
 	public native KActionCollection actionCollection();
 	/**	
-				@return The instance ( KInstance ) for this GUI client.
+				@return The instance ( TDEInstance ) for this GUI client.
    
 		@short
 	*/
-	public native KInstanceInterface instance();
+	public native TDEInstanceInterface instance();
 	/**	
 				@return The parsed XML in a TQDomDocument, set by
  setXMLFile() or setXML().
diff --git a/kdejava/koala/org/kde/koala/TDEApplication.java b/kdejava/koala/org/kde/koala/TDEApplication.java
index b9b8c2c0..a78f0dcf 100644
--- a/kdejava/koala/org/kde/koala/TDEApplication.java
+++ b/kdejava/koala/org/kde/koala/TDEApplication.java
@@ -75,7 +75,7 @@ import org.kde.qt.TQApplication;
 		@short Controls and provides information to all KDE applications.
 
 */
-public class TDEApplication extends TQApplication implements KInstanceInterface {
+public class TDEApplication extends TQApplication implements TDEInstanceInterface {
 	protected TDEApplication(Class dummy){super((Class) null);}
 	public static final int ShiftModifier = 1<<0;
 	public static final int LockModifier = 1<<1;
@@ -980,11 +980,11 @@ public class TDEApplication extends TQApplication implements KInstanceInterface
 	/**	
 			   		@short
 	*/
-	public TDEApplication(boolean allowStyles, boolean GUIenabled, KInstanceInterface _instance) {
+	public TDEApplication(boolean allowStyles, boolean GUIenabled, TDEInstanceInterface _instance) {
 		super((Class) null);
 		newTDEApplication(allowStyles,GUIenabled,_instance);
 	}
-	private native void newTDEApplication(boolean allowStyles, boolean GUIenabled, KInstanceInterface _instance);
+	private native void newTDEApplication(boolean allowStyles, boolean GUIenabled, TDEInstanceInterface _instance);
 	/**	
 		 This method is used internally to determine which edit slots are implemented
 		 by the widget that has the focus, and to invoke those slots if available.
@@ -1057,10 +1057,10 @@ public class TDEApplication extends TQApplication implements KInstanceInterface
      
 		@short     Returns the about data of this instance   Warning, can be 0L
 	*/
-	public native KAboutData aboutData();
+	public native TDEAboutData aboutData();
 	/**	
 		 Returns the name of the instance
-				@return the instance name, can be null if the KInstance has been 
+				@return the instance name, can be null if the TDEInstance has been 
          created with a null name
      
 		@short    Returns the name of the instance
diff --git a/kdejava/koala/org/kde/koala/TDECmdLineArgs.java b/kdejava/koala/org/kde/koala/TDECmdLineArgs.java
index 67901ba6..423df7a3 100644
--- a/kdejava/koala/org/kde/koala/TDECmdLineArgs.java
+++ b/kdejava/koala/org/kde/koala/TDECmdLineArgs.java
@@ -257,29 +257,29 @@ public class TDECmdLineArgs implements QtSupport {
 	/**	
 		 Initialize class.
 			 This function should be called as the very first thing in
-		  your application. It uses KAboutData to replace some of the
+		  your application. It uses TDEAboutData to replace some of the
 		  arguments that would otherwise be required.
 				@param _argv As passed to <code>main</code>(...).
-			@param about A KAboutData object describing your program.
+			@param about A TDEAboutData object describing your program.
 			@param noKApp Set this true to not add commandline options for
 		        TQApplication / TDEApplication
 		   		@short    Initialize class.
 	*/
-	public static native void init(String[] _argv, KAboutData about, boolean noKApp);
-	public static native void init(String[] _argv, KAboutData about);
+	public static native void init(String[] _argv, TDEAboutData about, boolean noKApp);
+	public static native void init(String[] _argv, TDEAboutData about);
 	/**	
 		 Initialize Class
 			 This function should be called as the very first thing in your
 		 application. This method will rarely be used, since it doesn't
 		 provide any argument parsing. It does provide access to the
-		 KAboutData information.
+		 TDEAboutData information.
 		 This method is exactly the same as calling
-		 init(0,0, const KAboutData about, true).
+		 init(0,0, const TDEAboutData about, true).
 			@param about the about data.
-		 \see KAboutData
+		 \see TDEAboutData
 		   		@short    Initialize Class
 	*/
-	public static native void init(KAboutData about);
+	public static native void init(TDEAboutData about);
 	/**	
 		 Add options to your application.
 			 You must make sure that all possible options have been added before
diff --git a/kdejava/koala/test/dcop/Test.java b/kdejava/koala/test/dcop/Test.java
index 15df3840..3e6a087a 100644
--- a/kdejava/koala/test/dcop/Test.java
+++ b/kdejava/koala/test/dcop/Test.java
@@ -12,8 +12,8 @@ public class Test{
    * dcop needs the eventloop (app.exec())
    */
   public static void main(String[] argv){
-   KAboutData aboutData = new KAboutData( "test", "Test",
-         "0.1", description, KAboutData.License_GPL,
+   TDEAboutData aboutData = new TDEAboutData( "test", "Test",
+         "0.1", description, TDEAboutData.License_GPL,
          "(C) 2002 Gert-Jan van der Heiden");
     TDECmdLineArgs.init( argv, aboutData );
     
diff --git a/kdejava/koala/test/kbase/KBase.java b/kdejava/koala/test/kbase/KBase.java
index ab163a40..22f5c968 100644
--- a/kdejava/koala/test/kbase/KBase.java
+++ b/kdejava/koala/test/kbase/KBase.java
@@ -554,8 +554,8 @@ static String VERSION = "0.1";
 public static void main(String[] cmdLineArgs)
 {
 
-	KAboutData aboutData = new KAboutData( "kbase", "JavaApiTest",
-		VERSION, description, KAboutData.License_GPL,
+	TDEAboutData aboutData = new TDEAboutData( "kbase", "JavaApiTest",
+		VERSION, description, TDEAboutData.License_GPL,
 		"(c) 2001, Richard Dale");
 	aboutData.addAuthor("Richard Dale",null, "Lost_Highway@tipitina.demon.co.uk");
 	TDECmdLineArgs.init( cmdLineArgs, aboutData );
diff --git a/kdejava/koala/test/kcombobox/KComboBoxTest.java b/kdejava/koala/test/kcombobox/KComboBoxTest.java
index dc640ee1..fcb38e54 100644
--- a/kdejava/koala/test/kcombobox/KComboBoxTest.java
+++ b/kdejava/koala/test/kcombobox/KComboBoxTest.java
@@ -28,8 +28,8 @@ import java.util.*;
 
     public static void main(String[] cmdLineArgs) {
 
-       KAboutData aboutData = new KAboutData( "kcomboboxtest", "KComboBoxTest",
-          VERSION, description, KAboutData.License_GPL,
+       TDEAboutData aboutData = new TDEAboutData( "kcomboboxtest", "KComboBoxTest",
+          VERSION, description, TDEAboutData.License_GPL,
           "(c) 2002, Kenneth J. Pouncey");
        aboutData.addAuthor("Kenneth J. Pouncey",null, "kjpou@hotmail.com");
        TDECmdLineArgs.init( cmdLineArgs, aboutData );
diff --git a/kdejava/koala/test/kfontdialog/KFontDialogTest.java b/kdejava/koala/test/kfontdialog/KFontDialogTest.java
index 156da41d..d2afce2d 100644
--- a/kdejava/koala/test/kfontdialog/KFontDialogTest.java
+++ b/kdejava/koala/test/kfontdialog/KFontDialogTest.java
@@ -48,8 +48,8 @@ public class KFontDialogTest {
 
    public static void main(String[] cmdLineArgs) {
 
-      KAboutData aboutData = new KAboutData( "kfontdialogtest", "KFontDialogTest",
-         VERSION, description, KAboutData.License_GPL,
+      TDEAboutData aboutData = new TDEAboutData( "kfontdialogtest", "KFontDialogTest",
+         VERSION, description, TDEAboutData.License_GPL,
          "(c) 2002, Kenneth J. Pouncey");
       aboutData.addAuthor("Kenneth J. Pouncey",null, "kjpou@hotmail.com");
       TDECmdLineArgs.init( cmdLineArgs, aboutData );
diff --git a/kdejava/koala/test/khelpers/Main.java b/kdejava/koala/test/khelpers/Main.java
index 28ccca14..ee04d747 100644
--- a/kdejava/koala/test/khelpers/Main.java
+++ b/kdejava/koala/test/khelpers/Main.java
@@ -29,8 +29,8 @@ static String VERSION = "0.1";
 
    public static void main(String[] cmdLineArgs) {
 
-      KAboutData aboutData = new KAboutData( "KHelpers", "KHelpers",
-         VERSION, description, KAboutData.License_GPL,
+      TDEAboutData aboutData = new TDEAboutData( "KHelpers", "KHelpers",
+         VERSION, description, TDEAboutData.License_GPL,
          "KDE 2 Development");
       TDECmdLineArgs.init( cmdLineArgs, aboutData );
       TDECmdLineArgs.addCmdLineOptions( options ); // Add our own options.
diff --git a/kdejava/koala/test/kprogress/KProgressTest.java b/kdejava/koala/test/kprogress/KProgressTest.java
index ce875c5c..ccb1d267 100644
--- a/kdejava/koala/test/kprogress/KProgressTest.java
+++ b/kdejava/koala/test/kprogress/KProgressTest.java
@@ -22,8 +22,8 @@ public class KProgressTest {
 
    public static void main(String[] cmdLineArgs) {
 
-      KAboutData aboutData = new KAboutData( "kprogresstest", "KProgressTest",
-         VERSION, description, KAboutData.License_GPL,
+      TDEAboutData aboutData = new TDEAboutData( "kprogresstest", "KProgressTest",
+         VERSION, description, TDEAboutData.License_GPL,
          "(c) 2002, Kenneth J. Pouncey");
       aboutData.addAuthor("Kenneth J. Pouncey",null, "kjpou@hotmail.com");
       TDECmdLineArgs.init( cmdLineArgs, aboutData );
diff --git a/kdejava/koala/test/ksystemtray/Test.java b/kdejava/koala/test/ksystemtray/Test.java
index 164af878..e1fd9c7e 100644
--- a/kdejava/koala/test/ksystemtray/Test.java
+++ b/kdejava/koala/test/ksystemtray/Test.java
@@ -7,8 +7,8 @@ public class Test {
 //  static String[][] options = new String[0][0];//{{ null, null, null }};
 
   public static void main(String[] argv){
-   KAboutData aboutData = new KAboutData( "test", "Test",
-         "0.1", description, KAboutData.License_GPL,
+   TDEAboutData aboutData = new TDEAboutData( "test", "Test",
+         "0.1", description, TDEAboutData.License_GPL,
          "(C) 2002 Gert-Jan van der Heiden");
     TDECmdLineArgs.init( argv, aboutData );
     TDECmdLineArgs.addCmdLineOptions(options);