From 84ec64868159247777c9779014b8cf8c11be2689 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 7 Aug 2023 18:06:42 +0900 Subject: [PATCH] Drop compatibility code for TQSignal Signed-off-by: Michele Calgaro --- .../org/trinitydesktop/qt/TQSignal.java | 4 --- qtjava/javalib/qtjava/TQSignal.cpp | 28 ------------------- qtjava/javalib/qtjava/TQSignal.h | 4 --- qtsharp/src/api/qt.xml | 8 ------ 4 files changed, 44 deletions(-) diff --git a/qtjava/javalib/org/trinitydesktop/qt/TQSignal.java b/qtjava/javalib/org/trinitydesktop/qt/TQSignal.java index ebc96889..b41c23ff 100644 --- a/qtjava/javalib/org/trinitydesktop/qt/TQSignal.java +++ b/qtjava/javalib/org/trinitydesktop/qt/TQSignal.java @@ -66,10 +66,6 @@ public class TQSignal extends TQObject { public native boolean disconnect(TQObject receiver, String member); public native boolean disconnect(TQObject receiver); public native void activate(); - public native boolean isBlocked(); - public native void block(boolean b); - public native void setParameter(int value); - public native int parameter(); public native void setValue(TQVariant value); public native TQVariant value(); public static native String tr(String arg1, String arg2); diff --git a/qtjava/javalib/qtjava/TQSignal.cpp b/qtjava/javalib/qtjava/TQSignal.cpp index 0dd4ef00..9a37dc57 100644 --- a/qtjava/javalib/qtjava/TQSignal.cpp +++ b/qtjava/javalib/qtjava/TQSignal.cpp @@ -59,13 +59,6 @@ Java_org_trinitydesktop_qt_QSignal_activate(JNIEnv* env, jobject obj) return; } -JNIEXPORT void JNICALL -Java_org_trinitydesktop_qt_QSignal_block(JNIEnv* env, jobject obj, jboolean b) -{ - ((TQSignal*) QtSupport::getQt(env, obj))->block((bool) b); - return; -} - JNIEXPORT jstring JNICALL Java_org_trinitydesktop_qt_QSignal_className(JNIEnv* env, jobject obj) { @@ -112,13 +105,6 @@ Java_org_trinitydesktop_qt_QSignal_finalize(JNIEnv* env, jobject obj) return; } -JNIEXPORT jboolean JNICALL -Java_org_trinitydesktop_qt_QSignal_isBlocked(JNIEnv* env, jobject obj) -{ - jboolean xret = (jboolean) ((TQSignal*) QtSupport::getQt(env, obj))->isBlocked(); - return xret; -} - JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_qt_QSignal_isDisposed(JNIEnv* env, jobject obj) { @@ -163,20 +149,6 @@ static TQCString* _qstring_name = 0; return; } -JNIEXPORT jint JNICALL -Java_org_trinitydesktop_qt_QSignal_parameter(JNIEnv* env, jobject obj) -{ - jint xret = (jint) ((TQSignal*) QtSupport::getQt(env, obj))->parameter(); - return xret; -} - -JNIEXPORT void JNICALL -Java_org_trinitydesktop_qt_QSignal_setParameter(JNIEnv* env, jobject obj, jint value) -{ - ((TQSignal*) QtSupport::getQt(env, obj))->setParameter((int) value); - return; -} - JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QSignal_setValue(JNIEnv* env, jobject obj, jobject value) { diff --git a/qtjava/javalib/qtjava/TQSignal.h b/qtjava/javalib/qtjava/TQSignal.h index e8a2f296..15997e2b 100644 --- a/qtjava/javalib/qtjava/TQSignal.h +++ b/qtjava/javalib/qtjava/TQSignal.h @@ -19,10 +19,6 @@ extern JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_qt_QSignal_connect (JN extern JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_qt_QSignal_disconnect__Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2 (JNIEnv *env, jobject, jobject, jstring); extern JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_qt_QSignal_disconnect__Lorg_trinitydesktop_qt_QObject_2 (JNIEnv *env, jobject, jobject); extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QSignal_activate (JNIEnv *env, jobject); -extern JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_qt_QSignal_isBlocked (JNIEnv *env, jobject); -extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QSignal_block (JNIEnv *env, jobject, jboolean); -extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QSignal_setParameter (JNIEnv *env, jobject, jint); -extern JNIEXPORT jint JNICALL Java_org_trinitydesktop_qt_QSignal_parameter (JNIEnv *env, jobject); extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QSignal_setValue (JNIEnv *env, jobject, jobject); extern JNIEXPORT jobject JNICALL Java_org_trinitydesktop_qt_QSignal_value (JNIEnv *env, jobject); extern JNIEXPORT jstring JNICALL Java_org_trinitydesktop_qt_QSignal_tr__Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jclass, jstring, jstring); diff --git a/qtsharp/src/api/qt.xml b/qtsharp/src/api/qt.xml index 9556a187..744f0925 100644 --- a/qtsharp/src/api/qt.xml +++ b/qtsharp/src/api/qt.xml @@ -15342,14 +15342,6 @@ id="0"> - - - - - - - -