From 2b24e8c9cb1ea79ddb1e32c4c5f9a629a711ad16 Mon Sep 17 00:00:00 2001 From: nathan Date: Thu, 5 Apr 2018 13:07:29 +0200 Subject: [PATCH] Renamed Gobject -> GObject (changed case...) --- src/dorkbox/util/jna/linux/{Gobject.java => GObject.java} | 8 ++++---- src/dorkbox/util/jna/linux/GObjectType.java | 4 ++-- src/dorkbox/util/jna/linux/GtkTheme.java | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) rename src/dorkbox/util/jna/linux/{Gobject.java => GObject.java} (94%) diff --git a/src/dorkbox/util/jna/linux/Gobject.java b/src/dorkbox/util/jna/linux/GObject.java similarity index 94% rename from src/dorkbox/util/jna/linux/Gobject.java rename to src/dorkbox/util/jna/linux/GObject.java index 3aa4f4c..336b5c5 100644 --- a/src/dorkbox/util/jna/linux/Gobject.java +++ b/src/dorkbox/util/jna/linux/GObject.java @@ -29,16 +29,16 @@ import dorkbox.util.jna.JnaHelper; * Direct-mapping, See: https://github.com/java-native-access/jna/blob/master/www/DirectMapping.md */ public -class Gobject { +class GObject { static { try { - NativeLibrary library = JnaHelper.register("gobject-2.0", Gobject.class); + NativeLibrary library = JnaHelper.register("gobject-2.0", GObject.class); if (library == null) { - LoggerFactory.getLogger(Gobject.class).error("Error loading GObject library, it failed to load."); + LoggerFactory.getLogger(GObject.class).error("Error loading GObject library, it failed to load."); } } catch (Throwable e) { - LoggerFactory.getLogger(Gobject.class).error("Error loading GObject library, it failed to load {}", e.getMessage()); + LoggerFactory.getLogger(GObject.class).error("Error loading GObject library, it failed to load {}", e.getMessage()); } } diff --git a/src/dorkbox/util/jna/linux/GObjectType.java b/src/dorkbox/util/jna/linux/GObjectType.java index 3bca864..f30f6fb 100644 --- a/src/dorkbox/util/jna/linux/GObjectType.java +++ b/src/dorkbox/util/jna/linux/GObjectType.java @@ -37,11 +37,11 @@ class GObjectType extends PointerType { public void ref() { - Gobject.g_object_ref(getPointer()); + GObject.g_object_ref(getPointer()); } public void unref() { - Gobject.g_object_unref(getPointer()); + GObject.g_object_unref(getPointer()); } } diff --git a/src/dorkbox/util/jna/linux/GtkTheme.java b/src/dorkbox/util/jna/linux/GtkTheme.java index d3ba265..ccd83b7 100644 --- a/src/dorkbox/util/jna/linux/GtkTheme.java +++ b/src/dorkbox/util/jna/linux/GtkTheme.java @@ -101,7 +101,7 @@ class GtkTheme { Gtk2.gtk_container_add(offscreen, item); PointerByReference r = new PointerByReference(); - Gobject.g_object_get(item, "image", r.getPointer(), null); + GObject.g_object_get(item, "image", r.getPointer(), null); Pointer imageWidget = r.getValue(); GtkRequisition gtkRequisition = new GtkRequisition(); @@ -432,7 +432,7 @@ My ratio is 1.47674, that means I have no scaling at all when there is a 1.5 fac // NOTE: gtk-icon-sizes is deprecated and ignored since GTK+ 3.10. // A list of icon sizes. The list is separated by colons, and item has the form: size-name = width , height - Gobject.g_object_get(settings, "gtk-icon-sizes", pointer.getPointer(), null); + GObject.g_object_get(settings, "gtk-icon-sizes", pointer.getPointer(), null); Pointer value = pointer.getValue(); if (value != null) {