Rename KInstance and KAboutData to avoid conflicts with KDE4

1 files changed, 12 insertions, 12 deletions

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