Rename KInstance and KAboutData to avoid conflicts with KDE4

1 files changed, 11 insertions, 11 deletions

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;
 }