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/KSystemTray.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/KSystemTray.cpp')
| -rw-r--r-- | kdejava/koala/kdejava/KSystemTray.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kdejava/koala/kdejava/KSystemTray.cpp b/kdejava/koala/kdejava/KSystemTray.cpp index ce85d869..7b698248 100644 --- a/kdejava/koala/kdejava/KSystemTray.cpp +++ b/kdejava/koala/kdejava/KSystemTray.cpp @@ -487,11 +487,11 @@ static TQString* _qstring_icon = 0; } JNIEXPORT jobject JNICALL -Java_org_kde_koala_KSystemTray_loadIcon__Ljava_lang_String_2Lorg_kde_koala_KInstanceInterface_2(JNIEnv* env, jclass cls, jstring icon, jobject instance) +Java_org_kde_koala_KSystemTray_loadIcon__Ljava_lang_String_2Lorg_kde_koala_TDEInstanceInterface_2(JNIEnv* env, jclass cls, jstring icon, jobject instance) { (void) cls; static TQString* _qstring_icon = 0; - jobject xret = QtSupport::objectForQtKey(env, (void*)new TQPixmap(KSystemTrayJBridge::loadIcon((const TQString&)*(TQString*) QtSupport::toTQString(env, icon, &_qstring_icon), (KInstance*) QtSupport::getQt(env, instance))), "org.kde.qt.TQPixmap", TRUE); + jobject xret = QtSupport::objectForQtKey(env, (void*)new TQPixmap(KSystemTrayJBridge::loadIcon((const TQString&)*(TQString*) QtSupport::toTQString(env, icon, &_qstring_icon), (TDEInstance*) QtSupport::getQt(env, instance))), "org.kde.qt.TQPixmap", TRUE); return xret; } |