diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:16:43 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:16:43 -0600 |
commit | 8f7ac92d27834427c1fa2a4a350d70d05529bbf4 (patch) | |
tree | fc53a45a5d9693bfe8a156579b921e960351e31c /kdejava/koala/kdejava/KXMLGUIClient.cpp | |
parent | 427847240b11c1733dd9c259c613d68a6405fe68 (diff) | |
download | tdebindings-8f7ac92d27834427c1fa2a4a350d70d05529bbf4.tar.gz tdebindings-8f7ac92d27834427c1fa2a4a350d70d05529bbf4.zip |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kdejava/koala/kdejava/KXMLGUIClient.cpp')
-rw-r--r-- | kdejava/koala/kdejava/KXMLGUIClient.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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; } |