diff options
author | Corentin Noël <corentin.noel@collabora.com> | 2019-06-03 09:23:16 +0200 |
---|---|---|
committer | Alberto Fanjul <albertofanjul@gmail.com> | 2019-06-09 20:54:29 +0200 |
commit | 0b3337f5cb83f1f4e8e925556d135b1f3558f8c8 (patch) | |
tree | 5bfa44908490885341497c325015f006cf7999b0 | |
parent | 9c3dee68b24fe9c8f60cdcc63817c4fcf5e7ffa8 (diff) | |
download | glade-tintou/modernize-gobject.tar.gz |
GladeClipboard: use modern GObject syntaxtintou/modernize-gobject
-rw-r--r-- | gladeui/glade-clipboard.c | 40 | ||||
-rw-r--r-- | gladeui/glade-clipboard.h | 19 |
2 files changed, 16 insertions, 43 deletions
diff --git a/gladeui/glade-clipboard.c b/gladeui/glade-clipboard.c index a77c72b5..fc3e7410 100644 --- a/gladeui/glade-clipboard.c +++ b/gladeui/glade-clipboard.c @@ -40,8 +40,10 @@ #include "glade-placeholder.h" #include "glade-project.h" -struct _GladeClipboardPrivate +struct _GladeClipboard { + GObject parent_instance; + GList *widgets; /* A list of GladeWidget's on the clipboard */ gboolean has_selection; /* TRUE if clipboard has selection */ }; @@ -55,7 +57,7 @@ enum static GParamSpec *properties[N_PROPERTIES]; -G_DEFINE_TYPE_WITH_PRIVATE (GladeClipboard, glade_clipboard, G_TYPE_OBJECT); +G_DEFINE_TYPE (GladeClipboard, glade_clipboard, G_TYPE_OBJECT); static void glade_project_get_property (GObject *object, @@ -68,7 +70,7 @@ glade_project_get_property (GObject *object, switch (prop_id) { case PROP_HAS_SELECTION: - g_value_set_boolean (value, clipboard->priv->has_selection); + g_value_set_boolean (value, clipboard->has_selection); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -99,19 +101,17 @@ glade_clipboard_class_init (GladeClipboardClass * klass) static void glade_clipboard_init (GladeClipboard *clipboard) { - clipboard->priv = glade_clipboard_get_instance_private (clipboard); - - clipboard->priv->widgets = NULL; - clipboard->priv->has_selection = FALSE; + clipboard->widgets = NULL; + clipboard->has_selection = FALSE; } static void glade_clipboard_set_has_selection (GladeClipboard *clipboard, gboolean has_selection) { - if (clipboard->priv->has_selection != has_selection) + if (clipboard->has_selection != has_selection) { - clipboard->priv->has_selection = has_selection; + clipboard->has_selection = has_selection; g_object_notify_by_pspec (G_OBJECT (clipboard), properties[PROP_HAS_SELECTION]); } @@ -128,7 +128,7 @@ glade_clipboard_get_has_selection (GladeClipboard *clipboard) { g_return_val_if_fail (GLADE_IS_CLIPBOARD (clipboard), FALSE); - return clipboard->priv->has_selection; + return clipboard->has_selection; } /** @@ -142,8 +142,7 @@ glade_clipboard_widgets (GladeClipboard *clipboard) { g_return_val_if_fail (GLADE_IS_CLIPBOARD (clipboard), NULL); - - return clipboard->priv->widgets; + return clipboard->widgets; } /** @@ -181,8 +180,8 @@ glade_clipboard_add (GladeClipboard *clipboard, GList *widgets) for (list = widgets; list && list->data; list = list->next) { widget = list->data; - clipboard->priv->widgets = - g_list_prepend (clipboard->priv->widgets, g_object_ref_sink (G_OBJECT (widget))); + clipboard->widgets = + g_list_prepend (clipboard->widgets, g_object_ref_sink (G_OBJECT (widget))); } glade_clipboard_set_has_selection (clipboard, TRUE); @@ -197,20 +196,9 @@ glade_clipboard_add (GladeClipboard *clipboard, GList *widgets) void glade_clipboard_clear (GladeClipboard *clipboard) { - GladeWidget *widget; - GList *list; - g_return_if_fail (GLADE_IS_CLIPBOARD (clipboard)); - for (list = clipboard->priv->widgets; list && list->data; list = list->next) - { - widget = list->data; - - g_object_unref (G_OBJECT (widget)); - } - - clipboard->priv->widgets = - (g_list_free (clipboard->priv->widgets), NULL); + clipboard->widgets = (g_list_free_full (clipboard->widgets, g_object_unref), NULL); glade_clipboard_set_has_selection (clipboard, FALSE); } diff --git a/gladeui/glade-clipboard.h b/gladeui/glade-clipboard.h index b0d23299..5bec2ee2 100644 --- a/gladeui/glade-clipboard.h +++ b/gladeui/glade-clipboard.h @@ -5,20 +5,8 @@ G_BEGIN_DECLS -#define GLADE_TYPE_CLIPBOARD (glade_clipboard_get_type ()) -#define GLADE_CLIPBOARD(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_CLIPBOARD, GladeClipboard)) -#define GLADE_IS_CLIPBOARD(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_CLIPBOARD)) - -typedef struct _GladeClipboard GladeClipboard; -typedef struct _GladeClipboardClass GladeClipboardClass; -typedef struct _GladeClipboardPrivate GladeClipboardPrivate; - -struct _GladeClipboard -{ - GObject parent_instance; - - GladeClipboardPrivate *priv; -}; +#define GLADE_TYPE_CLIPBOARD glade_clipboard_get_type () +G_DECLARE_FINAL_TYPE (GladeClipboard, glade_clipboard, GLADE, CLIPBOARD, GObject) struct _GladeClipboardClass { @@ -30,9 +18,6 @@ struct _GladeClipboardClass void (* glade_reserved4) (void); }; - -GType glade_clipboard_get_type (void); - GladeClipboard *glade_clipboard_new (void); void glade_clipboard_add (GladeClipboard *clipboard, GList *widgets); |