From 1b35744b7931a67f9ad418bb1cbee870a7dda811 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 9 Jul 2023 20:12:22 +0900 Subject: Drop compatibility code for TQToolButton Signed-off-by: Michele Calgaro --- .../org/trinitydesktop/qt/TQToolButton.java | 6 ---- qtjava/javalib/qtjava/TQToolButton.cpp | 42 ---------------------- qtjava/javalib/qtjava/TQToolButton.h | 6 ---- qtsharp/src/bindings/static/TQToolButton.cs | 20 ----------- 4 files changed, 74 deletions(-) diff --git a/qtjava/javalib/org/trinitydesktop/qt/TQToolButton.java b/qtjava/javalib/org/trinitydesktop/qt/TQToolButton.java index 1db010c1..24d86bd0 100644 --- a/qtjava/javalib/org/trinitydesktop/qt/TQToolButton.java +++ b/qtjava/javalib/org/trinitydesktop/qt/TQToolButton.java @@ -44,12 +44,6 @@ public class TQToolButton extends TQButton { private native void newTQToolButton(int type, TQWidget parent); public native TQSize sizeHint(); public native TQSize minimumSizeHint(); - public native void setOnIconSet(TQIconSet arg1); - public native void setOffIconSet(TQIconSet arg1); - public native void setIconSet(TQIconSet arg1, boolean on); - public native TQIconSet onIconSet(); - public native TQIconSet offIconSet(); - public native TQIconSet iconSet(boolean on); public native void setIconSet(TQIconSet arg1); public native TQIconSet iconSet(); public native boolean usesBigPixmap(); diff --git a/qtjava/javalib/qtjava/TQToolButton.cpp b/qtjava/javalib/qtjava/TQToolButton.cpp index 372ec0df..af6ad45a 100644 --- a/qtjava/javalib/qtjava/TQToolButton.cpp +++ b/qtjava/javalib/qtjava/TQToolButton.cpp @@ -473,13 +473,6 @@ Java_org_trinitydesktop_qt_QToolButton_iconSet__(JNIEnv* env, jobject obj) return xret; } -JNIEXPORT jobject JNICALL -Java_org_trinitydesktop_qt_QToolButton_iconSet__Z(JNIEnv* env, jobject obj, jboolean on) -{ - jobject xret = QtSupport::objectForQtKey(env, (void*)new TQIconSet(((TQToolButton*) QtSupport::getQt(env, obj))->iconSet((bool) on)), "org.trinitydesktop.qt.TQIconSet", TRUE); - return xret; -} - JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_qt_QToolButton_isDisposed(JNIEnv* env, jobject obj) { @@ -588,20 +581,6 @@ static TQCString* _qstring_name = 0; return; } -JNIEXPORT jobject JNICALL -Java_org_trinitydesktop_qt_QToolButton_offIconSet(JNIEnv* env, jobject obj) -{ - jobject xret = QtSupport::objectForQtKey(env, (void*)new TQIconSet(((TQToolButton*) QtSupport::getQt(env, obj))->offIconSet()), "org.trinitydesktop.qt.TQIconSet", TRUE); - return xret; -} - -JNIEXPORT jobject JNICALL -Java_org_trinitydesktop_qt_QToolButton_onIconSet(JNIEnv* env, jobject obj) -{ - jobject xret = QtSupport::objectForQtKey(env, (void*)new TQIconSet(((TQToolButton*) QtSupport::getQt(env, obj))->onIconSet()), "org.trinitydesktop.qt.TQIconSet", TRUE); - return xret; -} - JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QToolButton_openPopup(JNIEnv* env, jobject obj) { @@ -644,27 +623,6 @@ Java_org_trinitydesktop_qt_QToolButton_setIconSet__Lorg_trinitydesktop_qt_QIconS return; } -JNIEXPORT void JNICALL -Java_org_trinitydesktop_qt_QToolButton_setIconSet__Lorg_trinitydesktop_qt_QIconSet_2Z(JNIEnv* env, jobject obj, jobject arg1, jboolean on) -{ - ((TQToolButton*) QtSupport::getQt(env, obj))->setIconSet((const TQIconSet&)*(const TQIconSet*) QtSupport::getQt(env, arg1), (bool) on); - return; -} - -JNIEXPORT void JNICALL -Java_org_trinitydesktop_qt_QToolButton_setOffIconSet(JNIEnv* env, jobject obj, jobject arg1) -{ - ((TQToolButton*) QtSupport::getQt(env, obj))->setOffIconSet((const TQIconSet&)*(const TQIconSet*) QtSupport::getQt(env, arg1)); - return; -} - -JNIEXPORT void JNICALL -Java_org_trinitydesktop_qt_QToolButton_setOnIconSet(JNIEnv* env, jobject obj, jobject arg1) -{ - ((TQToolButton*) QtSupport::getQt(env, obj))->setOnIconSet((const TQIconSet&)*(const TQIconSet*) QtSupport::getQt(env, arg1)); - return; -} - JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QToolButton_setOn(JNIEnv* env, jobject obj, jboolean enable) { diff --git a/qtjava/javalib/qtjava/TQToolButton.h b/qtjava/javalib/qtjava/TQToolButton.h index 6a34cf61..563369ee 100644 --- a/qtjava/javalib/qtjava/TQToolButton.h +++ b/qtjava/javalib/qtjava/TQToolButton.h @@ -20,12 +20,6 @@ extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QToolButton_newTQToolBu extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QToolButton_newTQToolButton__ILorg_trinitydesktop_qt_QWidget_2 (JNIEnv *env, jobject, jint, jobject); extern JNIEXPORT jobject JNICALL Java_org_trinitydesktop_qt_QToolButton_sizeHint (JNIEnv *env, jobject); extern JNIEXPORT jobject JNICALL Java_org_trinitydesktop_qt_QToolButton_minimumSizeHint (JNIEnv *env, jobject); -extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QToolButton_setOnIconSet (JNIEnv *env, jobject, jobject); -extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QToolButton_setOffIconSet (JNIEnv *env, jobject, jobject); -extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QToolButton_setIconSet__Lorg_trinitydesktop_qt_QIconSet_2Z (JNIEnv *env, jobject, jobject, jboolean); -extern JNIEXPORT jobject JNICALL Java_org_trinitydesktop_qt_QToolButton_onIconSet (JNIEnv *env, jobject); -extern JNIEXPORT jobject JNICALL Java_org_trinitydesktop_qt_QToolButton_offIconSet (JNIEnv *env, jobject); -extern JNIEXPORT jobject JNICALL Java_org_trinitydesktop_qt_QToolButton_iconSet__Z (JNIEnv *env, jobject, jboolean); extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QToolButton_setIconSet__Lorg_trinitydesktop_qt_QIconSet_2 (JNIEnv *env, jobject, jobject); extern JNIEXPORT jobject JNICALL Java_org_trinitydesktop_qt_QToolButton_iconSet__ (JNIEnv *env, jobject); extern JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_qt_QToolButton_usesBigPixmap (JNIEnv *env, jobject); diff --git a/qtsharp/src/bindings/static/TQToolButton.cs b/qtsharp/src/bindings/static/TQToolButton.cs index 6f3d7dfa..855a9202 100644 --- a/qtsharp/src/bindings/static/TQToolButton.cs +++ b/qtsharp/src/bindings/static/TQToolButton.cs @@ -174,26 +174,6 @@ namespace Qt { qt_QToolButton_setIconSet (rawObject, set.RawObject); } - [DllImport("libtqtc", CharSet=CharSet.Ansi)] - private static extern void qt_QToolButton_setIconSet1 (IntPtr raw, IntPtr set, bool on); - public void SetIconSet (TQIconSet set, bool on) - { - if (disposed) - throw new ObjectDisposedException (this+": Attempted use of disposed object"); - - qt_QToolButton_setIconSet1 (rawObject, set.RawObject, on); - } - - [DllImport("libtqtc", CharSet=CharSet.Ansi)] - private static extern IntPtr qt_QToolButton_iconSet (IntPtr raw, bool on); - public TQIconSet IconSet (bool on) - { - if (disposed) - throw new ObjectDisposedException (this+": Attempted use of disposed object"); - - return LookupObject (qt_QToolButton_iconSet (rawObject, on), typeof (TQIconSet)) as TQIconSet; - } - [DllImport("libtqtc", CharSet=CharSet.Ansi)] private static extern void qt_QToolButton_setPopupDelay (IntPtr raw, int delay); public void SetPopupDelay (int delay) -- cgit v1.2.1