From 1337802177d57cf566629a8222378947472b2465 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Tue, 18 Jul 2023 15:20:38 +0900 Subject: Drop compatibility code for TQPalette Signed-off-by: Michele Calgaro --- qtjava/javalib/org/trinitydesktop/qt/TQPalette.java | 3 --- qtjava/javalib/qtjava/TQPalette.cpp | 15 --------------- qtjava/javalib/qtjava/TQPalette.h | 2 -- qtsharp/src/api/qt.xml | 4 ---- 4 files changed, 24 deletions(-) diff --git a/qtjava/javalib/org/trinitydesktop/qt/TQPalette.java b/qtjava/javalib/org/trinitydesktop/qt/TQPalette.java index cce475ed..c92cb8b2 100644 --- a/qtjava/javalib/org/trinitydesktop/qt/TQPalette.java +++ b/qtjava/javalib/org/trinitydesktop/qt/TQPalette.java @@ -12,7 +12,6 @@ public class TQPalette implements QtSupport { public static final int Active = 1; public static final int Inactive = 2; public static final int NColorGroups = 3; - public static final int Normal = Active; public TQPalette() { newTQPalette(); @@ -44,11 +43,9 @@ public class TQPalette implements QtSupport { public native TQColorGroup active(); public native TQColorGroup disabled(); public native TQColorGroup inactive(); - public native TQColorGroup normal(); public native void setActive(TQColorGroup arg1); public native void setDisabled(TQColorGroup arg1); public native void setInactive(TQColorGroup arg1); - public native void setNormal(TQColorGroup cg); public native boolean op_equals(TQPalette p); public native boolean op_not_equals(TQPalette p); public native boolean isCopyOf(TQPalette arg1); diff --git a/qtjava/javalib/qtjava/TQPalette.cpp b/qtjava/javalib/qtjava/TQPalette.cpp index dbd9d9e1..98b79f40 100644 --- a/qtjava/javalib/qtjava/TQPalette.cpp +++ b/qtjava/javalib/qtjava/TQPalette.cpp @@ -158,13 +158,6 @@ Java_org_trinitydesktop_qt_QPalette_newTQPalette__Lorg_trinitydesktop_qt_QPalett return; } -JNIEXPORT jobject JNICALL -Java_org_trinitydesktop_qt_QPalette_normal(JNIEnv* env, jobject obj) -{ - jobject xret = QtSupport::objectForQtKey(env, (void*)(TQColorGroup *) &((TQPalette*) QtSupport::getQt(env, obj))->normal(), "org.trinitydesktop.qt.TQColorGroup"); - return xret; -} - JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_qt_QPalette_op_1equals(JNIEnv* env, jobject obj, jobject p) { @@ -234,11 +227,3 @@ Java_org_trinitydesktop_qt_QPalette_setInactive(JNIEnv* env, jobject obj, jobjec ((TQPalette*) QtSupport::getQt(env, obj))->setInactive((const TQColorGroup&)*(const TQColorGroup*) QtSupport::getQt(env, arg1)); return; } - -JNIEXPORT void JNICALL -Java_org_trinitydesktop_qt_QPalette_setNormal(JNIEnv* env, jobject obj, jobject cg) -{ - ((TQPalette*) QtSupport::getQt(env, obj))->setNormal((const TQColorGroup&)*(const TQColorGroup*) QtSupport::getQt(env, cg)); - return; -} - diff --git a/qtjava/javalib/qtjava/TQPalette.h b/qtjava/javalib/qtjava/TQPalette.h index e793cf92..73de43c4 100644 --- a/qtjava/javalib/qtjava/TQPalette.h +++ b/qtjava/javalib/qtjava/TQPalette.h @@ -25,11 +25,9 @@ extern JNIEXPORT jobject JNICALL Java_org_trinitydesktop_qt_QPalette_copy (JNIEn extern JNIEXPORT jobject JNICALL Java_org_trinitydesktop_qt_QPalette_active (JNIEnv *env, jobject); extern JNIEXPORT jobject JNICALL Java_org_trinitydesktop_qt_QPalette_disabled (JNIEnv *env, jobject); extern JNIEXPORT jobject JNICALL Java_org_trinitydesktop_qt_QPalette_inactive (JNIEnv *env, jobject); -extern JNIEXPORT jobject JNICALL Java_org_trinitydesktop_qt_QPalette_normal (JNIEnv *env, jobject); extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QPalette_setActive (JNIEnv *env, jobject, jobject); extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QPalette_setDisabled (JNIEnv *env, jobject, jobject); extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QPalette_setInactive (JNIEnv *env, jobject, jobject); -extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QPalette_setNormal (JNIEnv *env, jobject, jobject); extern JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_qt_QPalette_op_1equals (JNIEnv *env, jobject, jobject); extern JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_qt_QPalette_op_1not_1equals (JNIEnv *env, jobject, jobject); extern JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_qt_QPalette_isCopyOf (JNIEnv *env, jobject, jobject); diff --git a/qtsharp/src/api/qt.xml b/qtsharp/src/api/qt.xml index 751e79c9..9556a187 100644 --- a/qtsharp/src/api/qt.xml +++ b/qtsharp/src/api/qt.xml @@ -13070,7 +13070,6 @@ id="0"> - @@ -13080,9 +13079,6 @@ id="0"> - - - -- cgit v1.2.1