From ad91a735750b37f4e2c7ffe46c55afa719d37709 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 1 May 2018 02:21:55 +0200 Subject: Updated following latest changes to tdelibs related to bug 2734. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- tdejava/koala/org/trinitydesktop/koala/KOpenWithDlg.java | 4 ++-- tdejava/koala/tdejava/KOpenWithDlg.cpp | 10 ++++++---- tdejava/koala/tdejava/KOpenWithDlg.h | 4 ++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/tdejava/koala/org/trinitydesktop/koala/KOpenWithDlg.java b/tdejava/koala/org/trinitydesktop/koala/KOpenWithDlg.java index de858f09..8a7e7ae6 100644 --- a/tdejava/koala/org/trinitydesktop/koala/KOpenWithDlg.java +++ b/tdejava/koala/org/trinitydesktop/koala/KOpenWithDlg.java @@ -129,8 +129,8 @@ public class KOpenWithDlg extends TQDialog { @short The slot for clearing the edit widget */ public native void slotClear(); - public native void slotSelected(String _name, String _exec); - public native void slotHighlighted(String _name, String _exec); + public native void slotSelected(String _name, String _exec, String _desktopPath); + public native void slotHighlighted(String _name, String _exec, String _desktopPath); public native void slotTextChanged(); public native void slotTerminalToggled(boolean arg1); public native void slotDbClick(); diff --git a/tdejava/koala/tdejava/KOpenWithDlg.cpp b/tdejava/koala/tdejava/KOpenWithDlg.cpp index c6edfe90..ee711d34 100644 --- a/tdejava/koala/tdejava/KOpenWithDlg.cpp +++ b/tdejava/koala/tdejava/KOpenWithDlg.cpp @@ -557,11 +557,12 @@ Java_org_trinitydesktop_koala_KOpenWithDlg_slotDbClick(JNIEnv* env, jobject obj) } JNIEXPORT void JNICALL -Java_org_trinitydesktop_koala_KOpenWithDlg_slotHighlighted(JNIEnv* env, jobject obj, jstring _name, jstring _exec) +Java_org_trinitydesktop_koala_KOpenWithDlg_slotHighlighted(JNIEnv* env, jobject obj, jstring _name, jstring _exec, jstring _desktopPath) { static TQString* _qstring__name = 0; static TQString* _qstring__exec = 0; - ((KOpenWithDlg*) QtSupport::getQt(env, obj))->slotHighlighted((const TQString&)*(TQString*) QtSupport::toTQString(env, _name, &_qstring__name), (const TQString&)*(TQString*) QtSupport::toTQString(env, _exec, &_qstring__exec)); +static TQString* _qstring__desktopPath = 0; + ((KOpenWithDlg*) QtSupport::getQt(env, obj))->slotHighlighted((const TQString&)*(TQString*) QtSupport::toTQString(env, _name, &_qstring__name), (const TQString&)*(TQString*) QtSupport::toTQString(env, _exec, &_qstring__exec), (const TQString&)*(TQString*) QtSupport::toTQString(env, _desktopPath, &_qstring__desktopPath)); return; } @@ -573,11 +574,12 @@ Java_org_trinitydesktop_koala_KOpenWithDlg_slotOK(JNIEnv* env, jobject obj) } JNIEXPORT void JNICALL -Java_org_trinitydesktop_koala_KOpenWithDlg_slotSelected(JNIEnv* env, jobject obj, jstring _name, jstring _exec) +Java_org_trinitydesktop_koala_KOpenWithDlg_slotSelected(JNIEnv* env, jobject obj, jstring _name, jstring _exec, jstring _desktopPath) { static TQString* _qstring__name = 0; static TQString* _qstring__exec = 0; - ((KOpenWithDlg*) QtSupport::getQt(env, obj))->slotSelected((const TQString&)*(TQString*) QtSupport::toTQString(env, _name, &_qstring__name), (const TQString&)*(TQString*) QtSupport::toTQString(env, _exec, &_qstring__exec)); +static TQString* _qstring__desktopPath = 0; + ((KOpenWithDlg*) QtSupport::getQt(env, obj))->slotSelected((const TQString&)*(TQString*) QtSupport::toTQString(env, _name, &_qstring__name), (const TQString&)*(TQString*) QtSupport::toTQString(env, _exec, &_qstring__exec), (const TQString&)*(TQString*) QtSupport::toTQString(env, _desktopPath, &_qstring__desktopPath)); return; } diff --git a/tdejava/koala/tdejava/KOpenWithDlg.h b/tdejava/koala/tdejava/KOpenWithDlg.h index f03d79ef..d028d2cf 100644 --- a/tdejava/koala/tdejava/KOpenWithDlg.h +++ b/tdejava/koala/tdejava/KOpenWithDlg.h @@ -25,8 +25,8 @@ extern JNIEXPORT void JNICALL Java_org_trinitydesktop_koala_KOpenWithDlg_hideNoC extern JNIEXPORT void JNICALL Java_org_trinitydesktop_koala_KOpenWithDlg_hideRunInTerminal (JNIEnv *env, jobject); extern JNIEXPORT void JNICALL Java_org_trinitydesktop_koala_KOpenWithDlg_setSaveNewApplications (JNIEnv *env, jobject, jboolean); extern JNIEXPORT void JNICALL Java_org_trinitydesktop_koala_KOpenWithDlg_slotClear (JNIEnv *env, jobject); -extern JNIEXPORT void JNICALL Java_org_trinitydesktop_koala_KOpenWithDlg_slotSelected (JNIEnv *env, jobject, jstring, jstring); -extern JNIEXPORT void JNICALL Java_org_trinitydesktop_koala_KOpenWithDlg_slotHighlighted (JNIEnv *env, jobject, jstring, jstring); +extern JNIEXPORT void JNICALL Java_org_trinitydesktop_koala_KOpenWithDlg_slotSelected (JNIEnv *env, jobject, jstring, jstring, jstring); +extern JNIEXPORT void JNICALL Java_org_trinitydesktop_koala_KOpenWithDlg_slotHighlighted (JNIEnv *env, jobject, jstring, jstring, jstring); extern JNIEXPORT void JNICALL Java_org_trinitydesktop_koala_KOpenWithDlg_slotTextChanged (JNIEnv *env, jobject); extern JNIEXPORT void JNICALL Java_org_trinitydesktop_koala_KOpenWithDlg_slotTerminalToggled (JNIEnv *env, jobject, jboolean); extern JNIEXPORT void JNICALL Java_org_trinitydesktop_koala_KOpenWithDlg_slotDbClick (JNIEnv *env, jobject); -- cgit v1.2.3