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