Bug 479614 - [Graphics] HiDPI support for eclipse platform

Remove explicit casts to enable building on older versions of libraries
(current build machines)

Change-Id: I58ee5af92225cf2060ba601bca81ea5e102a2691

2 files changed, 34 insertions, 84 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
index 46ac1e3cda..3f657ea724 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
@@ -3875,12 +3875,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1settings_1get)
 	if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
 /*
-	g_settings_get((GSettings *)arg0, (const gchar *)lparg1, lparg2, lparg3, lparg4);
+	g_settings_get(arg0, lparg1, lparg2, lparg3, lparg4);
 */
 	{
 		OS_LOAD_FUNCTION(fp, g_settings_get)
 		if (fp) {
-			((void (CALLING_CONVENTION*)(GSettings *, const gchar *, jbyte *, jbyte *, jint *))fp)((GSettings *)arg0, (const gchar *)lparg1, lparg2, lparg3, lparg4);
+			((void (CALLING_CONVENTION*)(jintLong, jbyte *, jbyte *, jbyte *, jint *))fp)(arg0, lparg1, lparg2, lparg3, lparg4);
 		}
 	}
 fail:
@@ -3901,12 +3901,12 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1settings_1get_1value)
 	OS_NATIVE_ENTER(env, that, _1g_1settings_1get_1value_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 /*
-	rc = (jintLong)g_settings_get_value((GSettings *)arg0, (const gchar *)lparg1);
+	rc = (jintLong)g_settings_get_value(arg0, lparg1);
 */
 	{
 		OS_LOAD_FUNCTION(fp, g_settings_get_value)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GSettings *, const gchar *))fp)((GSettings *)arg0, (const gchar *)lparg1);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1);
 		}
 	}
 fail:
@@ -3969,12 +3969,12 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1settings_1schema_1source_1lookup)
 	OS_NATIVE_ENTER(env, that, _1g_1settings_1schema_1source_1lookup_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 /*
-	rc = (jintLong)g_settings_schema_source_lookup((GSettingsSchemaSource *)arg0, (const gchar *)lparg1, (gboolean)arg2);
+	rc = (jintLong)g_settings_schema_source_lookup(arg0, lparg1, arg2);
 */
 	{
 		OS_LOAD_FUNCTION(fp, g_settings_schema_source_lookup)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GSettingsSchemaSource *, const gchar *, gboolean))fp)((GSettingsSchemaSource *)arg0, (const gchar *)lparg1, (gboolean)arg2);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jbyte *, jboolean))fp)(arg0, lparg1, arg2);
 		}
 	}
 fail:
@@ -4740,12 +4740,12 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1variant_1dict_1lookup_1value)
 	OS_NATIVE_ENTER(env, that, _1g_1variant_1dict_1lookup_1value_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 /*
-	rc = (jintLong)g_variant_dict_lookup_value((GVariant *)arg0, (const gchar *)lparg1, (const GVariantType *)arg2);
+	rc = (jintLong)g_variant_dict_lookup_value(arg0, lparg1, arg2);
 */
 	{
 		OS_LOAD_FUNCTION(fp, g_variant_dict_lookup_value)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GVariant *, const gchar *, const GVariantType *))fp)((GVariant *)arg0, (const gchar *)lparg1, (const GVariantType *)arg2);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jbyte *, jintLong))fp)(arg0, lparg1, arg2);
 		}
 	}
 fail:
@@ -4929,12 +4929,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1variant_1iter_1free)
 {
 	OS_NATIVE_ENTER(env, that, _1g_1variant_1iter_1free_FUNC);
 /*
-	g_variant_iter_free((GVariantIter *)arg0);
+	g_variant_iter_free(arg0);
 */
 	{
 		OS_LOAD_FUNCTION(fp, g_variant_iter_free)
 		if (fp) {
-			((void (CALLING_CONVENTION*)(GVariantIter *))fp)((GVariantIter *)arg0);
+			((void (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1g_1variant_1iter_1free_FUNC);
@@ -4948,12 +4948,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1variant_1iter_1init)
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1variant_1iter_1init_FUNC);
 /*
-	rc = (jint)g_variant_iter_init((GVariantIter *)arg0, (GVariant *)arg1);
+	rc = (jint)g_variant_iter_init(arg0, arg1);
 */
 	{
 		OS_LOAD_FUNCTION(fp, g_variant_iter_init)
 		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(GVariantIter *, GVariant *))fp)((GVariantIter *)arg0, (GVariant *)arg1);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1g_1variant_1iter_1init_FUNC);
@@ -4968,12 +4968,12 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1variant_1iter_1new)
 	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1variant_1iter_1new_FUNC);
 /*
-	rc = (jintLong)g_variant_iter_new((GVariant *)arg0);
+	rc = (jintLong)g_variant_iter_new(arg0);
 */
 	{
 		OS_LOAD_FUNCTION(fp, g_variant_iter_new)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GVariant *))fp)((GVariant *)arg0);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1g_1variant_1iter_1new_FUNC);
@@ -4990,12 +4990,12 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1variant_1iter_1next)
 	OS_NATIVE_ENTER(env, that, _1g_1variant_1iter_1next_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 /*
-	rc = (jboolean)g_variant_iter_next((const GVariantIter *)arg0, lparg1, (gchar *)arg2, arg3);
+	rc = (jboolean)g_variant_iter_next(arg0, lparg1, arg2, arg3);
 */
 	{
 		OS_LOAD_FUNCTION(fp, g_variant_iter_next)
 		if (fp) {
-			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(const GVariantIter *, jbyte *, gchar *, jintLong))fp)((const GVariantIter *)arg0, lparg1, (gchar *)arg2, arg3);
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jbyte *, jintLong, jintLong))fp)(arg0, lparg1, arg2, arg3);
 		}
 	}
 fail:
@@ -5012,12 +5012,12 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1variant_1iter_1next_1value)
 	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1variant_1iter_1next_1value_FUNC);
 /*
-	rc = (jintLong)g_variant_iter_next_value((const GVariantIter *)arg0);
+	rc = (jintLong)g_variant_iter_next_value(arg0);
 */
 	{
 		OS_LOAD_FUNCTION(fp, g_variant_iter_next_value)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(const GVariantIter *))fp)((const GVariantIter *)arg0);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1g_1variant_1iter_1next_1value_FUNC);
@@ -5224,12 +5224,12 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1variant_1print)
 	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1variant_1print_FUNC);
 /*
-	rc = (jintLong)g_variant_print((const GVariant *)arg0);
+	rc = (jintLong)g_variant_print(arg0);
 */
 	{
 		OS_LOAD_FUNCTION(fp, g_variant_print)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(const GVariant *))fp)((const GVariant *)arg0);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1g_1variant_1print_FUNC);
@@ -5243,12 +5243,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1variant_1unref)
 {
 	OS_NATIVE_ENTER(env, that, _1g_1variant_1unref_FUNC);
 /*
-	g_variant_unref((GVariant *)arg0);
+	g_variant_unref(arg0);
 */
 	{
 		OS_LOAD_FUNCTION(fp, g_variant_unref)
 		if (fp) {
-			((void (CALLING_CONVENTION*)(GVariant *))fp)((GVariant *)arg0);
+			((void (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1g_1variant_1unref_FUNC);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
index 9a0230d6f1..6540becbc5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
@@ -17089,14 +17089,7 @@ public static final long /*int*/ g_settings_new (byte[] schema_id) {
 		lock.unlock();
 	}
 }
-/**
- * @method flags=dynamic
- * @param settings cast=(GSettings *)
- * @param key cast=(const gchar *)
- * @param format = (const gchar *)
- * @param monitorId = (const gchar *)
- * @param scalingfactor = (gint *)
- */
+/** @method flags=dynamic */
 public static final native void _g_settings_get (long /*int*/ settings, byte[] key, byte[] format, byte[] monitorId, int[] scalingfactor);
 public static final void g_settings_get (long /*int*/ settings, byte[] key, byte[] format, byte[] monitorId, int[] scalingfactor) {
 	lock.lock();
@@ -17106,11 +17099,7 @@ public static final void g_settings_get (long /*int*/ settings, byte[] key, byte
 		lock.unlock();
 	}
 }
-/**
- * @method flags=dynamic
- * @param settings cast=(GSettings *)
- * @param key cast=(const gchar *)
- */
+/** @method flags=dynamic */
 public static final native long /*int*/ _g_settings_get_value (long /*int*/ settings, byte[] key);
 public static final long /*int*/ g_settings_get_value (long /*int*/ settings, byte[] key) {
 	lock.lock();
@@ -17120,12 +17109,7 @@ public static final long /*int*/ g_settings_get_value (long /*int*/ settings, by
 		lock.unlock();
 	}
 }
-/**
- * @method flags=dynamic
- * @param variant cast=(GVariant *)
- * @param key cast=(const gchar *)
- * @param expectedType cast=(const GVariantType *)
- */
+/** @method flags=dynamic */
 public static final native long /*int*/ _g_variant_dict_lookup_value (long /*int*/ variant, byte[] key, long /*int*/ expectedType);
 public static final long /*int*/ g_variant_dict_lookup_value (long /*int*/ variant, byte[] key, long /*int*/ expectedType) {
 	lock.lock();
@@ -17135,10 +17119,7 @@ public static final long /*int*/ g_variant_dict_lookup_value (long /*int*/ varia
 		lock.unlock();
 	}
 }
-/**
- * @method flags=dynamic
- * @param variant cast=(GVariant *)
- */
+/** @method flags=dynamic */
 public static final native long /*int*/ _g_variant_iter_new (long /*int*/ variant);
 public static final long /*int*/ g_variant_iter_new (long /*int*/ variant) {
 	lock.lock();
@@ -17148,10 +17129,7 @@ public static final long /*int*/ g_variant_iter_new (long /*int*/ variant) {
 		lock.unlock();
 	}
 }
-/**
- * @method flags=dynamic
- * @param variant cast=(GVariantIter *)
- */
+/** @method flags=dynamic */
 public static final native void _g_variant_iter_free (long /*int*/ variant);
 public static final void g_variant_iter_free (long /*int*/ variant) {
 	lock.lock();
@@ -17161,11 +17139,7 @@ public static final void g_variant_iter_free (long /*int*/ variant) {
 		lock.unlock();
 	}
 }
-/**
- * @method flags=dynamic
- * @param iter cast=(GVariantIter *)
- * @param variant cast=(GVariant *)
- */
+/** @method flags=dynamic */
 public static final native int _g_variant_iter_init (long /*int*/ iter, long /*int*/ variant);
 public static final int g_variant_iter_init (long /*int*/ iter, long /*int*/ variant) {
 	lock.lock();
@@ -17175,13 +17149,7 @@ public static final int g_variant_iter_init (long /*int*/ iter, long /*int*/ var
 		lock.unlock();
 	}
 }
-/**
- * @method flags=dynamic
- * @param iter cast=(const GVariantIter *)
- * @param key cast = (gchar *)
- * @param format = (const gchar *)
- * @param value = (GVariant *)
- */
+/** @method flags=dynamic */
 public static final native boolean _g_variant_iter_next (long /*int*/ iter, byte[] format, long /*int*/ key, long /*int*/ value);
 public static final boolean g_variant_iter_next (long /*int*/ iter, byte[] format, long /*int*/ key, long /*int*/ value) {
 	lock.lock();
@@ -17191,10 +17159,7 @@ public static final boolean g_variant_iter_next (long /*int*/ iter, byte[] forma
 		lock.unlock();
 	}
 }
-/**
- * @method flags=dynamic
- * @param iter cast=(const GVariantIter *)
- */
+/** @method flags=dynamic */
 public static final native long /*int*/ _g_variant_iter_next_value (long /*int*/ iter);
 public static final long /*int*/ g_variant_iter_next_value (long /*int*/ iter) {
 	lock.lock();
@@ -17204,10 +17169,7 @@ public static final long /*int*/ g_variant_iter_next_value (long /*int*/ iter) {
 		lock.unlock();
 	}
 }
-/**
- * @method flags=dynamic
- * @param value cast=(const GVariant *)
- */
+/** @method flags=dynamic */
 public static final native long /*int*/ _g_variant_print (long /*int*/ value);
 public static final long /*int*/ g_variant_print (long /*int*/ value) {
 	lock.lock();
@@ -17217,10 +17179,7 @@ public static final long /*int*/ g_variant_print (long /*int*/ value) {
 		lock.unlock();
 	}
 }
-/**
- * @method flags=dynamic
- * @param variant cast=(GVariant *)
- */
+/** @method flags=dynamic */
 public static final native void _g_variant_unref (long /*int*/ variant);
 public static final void g_variant_unref (long /*int*/ variant) {
 	lock.lock();
@@ -17230,9 +17189,7 @@ public static final void g_variant_unref (long /*int*/ variant) {
 		lock.unlock();
 	}
 }
-/**
- * @method flags=dynamic
- */
+/** @method flags=dynamic */
 public static final native long /*int*/ _g_settings_schema_source_get_default ();
 public static final long /*int*/ g_settings_schema_source_get_default () {
 	lock.lock();
@@ -17242,12 +17199,7 @@ public static final long /*int*/ g_settings_schema_source_get_default () {
 		lock.unlock();
 	}
 }
-/**
- * @method flags=dynamic
- * @param schemaSource cast = (GSettingsSchemaSource *)
- * @param schema_id cast = (const gchar *)
- * @param recursive cast = (gboolean)
- */
+/** @method flags=dynamic */
 public static final native long /*int*/ _g_settings_schema_source_lookup (long /*int*/ schemaSource, byte[] schema_id, boolean recursive);
 public static final long /*int*/ g_settings_schema_source_lookup (long /*int*/ schemaSource, byte[] schema_id, boolean recursive) {
 	lock.lock();
@@ -17258,6 +17210,4 @@ public static final long /*int*/ g_settings_schema_source_lookup (long /*int*/ s
 	}
 }
 
-
-
 }