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/KXMLGUIBuilder.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/KXMLGUIBuilder.cpp')
-rw-r--r-- | kdejava/koala/kdejava/KXMLGUIBuilder.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |