gplugin/gplugin

Move the gplugin-gtk types to use the G_DECLARE_* macros
glib-macros
2019-07-18, Gary Kramlich
32eb959d3b5e
Parents 5092a2557d2f
Children 879f665c7aeb
Move the gplugin-gtk types to use the G_DECLARE_* macros
6 files changed, 58 insertions(+), 129 deletions(-)
  • +40 -45
    gplugin-gtk/gplugin-gtk-plugin-info.c
  • +2 -23
    gplugin-gtk/gplugin-gtk-plugin-info.h
  • +4 -0
    gplugin-gtk/gplugin-gtk-store.c
  • +3 -25
    gplugin-gtk/gplugin-gtk-store.h
  • +7 -13
    gplugin-gtk/gplugin-gtk-view.c
  • +2 -23
    gplugin-gtk/gplugin-gtk-view.h
    • --- a/gplugin-gtk/gplugin-gtk-plugin-info.c Thu Jul 18 05:09:47 2019 -0500
    +++ b/gplugin-gtk/gplugin-gtk-plugin-info.c Thu Jul 18 05:25:28 2019 -0500
    @@ -30,7 +30,9 @@
    /******************************************************************************
    * Structs
    *****************************************************************************/
    -typedef struct {
    +struct _GPluginGtkPluginInfo {
    + GtkBox parent;
    +
    GPluginPlugin *plugin;
    GtkWidget *name;
    @@ -47,7 +49,7 @@
    GtkWidget *loader;
    GtkWidget *internal;
    GtkWidget *load_on_query;
    -} GPluginGtkPluginInfoPrivate;
    +};
    /*****************************************************************************s
    * Enums
    @@ -59,7 +61,7 @@
    };
    static GParamSpec *properties[N_PROPERTIES] = {NULL,};
    -G_DEFINE_TYPE_WITH_PRIVATE(GPluginGtkPluginInfo, gplugin_gtk_plugin_info, GTK_TYPE_BOX);
    +G_DEFINE_TYPE(GPluginGtkPluginInfo, gplugin_gtk_plugin_info, GTK_TYPE_BOX);
    /******************************************************************************
    * Callbacks
    @@ -78,7 +80,7 @@
    * Helpers
    *****************************************************************************/
    static void
    -_gplugin_gtk_plugin_info_refresh(GPluginGtkPluginInfoPrivate *priv,
    +_gplugin_gtk_plugin_info_refresh(GPluginGtkPluginInfo *info,
    GPluginPlugin *plugin)
    {
    GtkWidget *widget = NULL;
    @@ -93,7 +95,7 @@
    const gchar *filename = NULL;
    /* remove all the children from the authors box */
    - children = gtk_container_get_children(GTK_CONTAINER(priv->authors_box));
    + children = gtk_container_get_children(GTK_CONTAINER(info->authors_box));
    for(iter = children; iter; iter = iter->next)
    gtk_widget_destroy(GTK_WIDGET(iter->data));
    g_list_free(children);
    @@ -145,17 +147,17 @@
    g_object_unref(G_OBJECT(plugin_info));
    }
    - gtk_label_set_markup(GTK_LABEL(priv->name), (name) ? name : "Unnamed");
    - gtk_label_set_text(GTK_LABEL(priv->version), (version) ? version : "");
    - gtk_label_set_markup(GTK_LABEL(priv->website), (website) ? website : "");
    - gtk_label_set_text(GTK_LABEL(priv->summary), (summary) ? summary : "");
    - gtk_label_set_text(GTK_LABEL(priv->description), (description) ? description : "");
    - gtk_label_set_text(GTK_LABEL(priv->id), (id) ? id : "");
    - gtk_label_set_text(GTK_LABEL(priv->filename), (filename) ? filename : "");
    - gtk_label_set_text(GTK_LABEL(priv->abi_version), (abi_version) ? abi_version : "");
    - gtk_label_set_text(GTK_LABEL(priv->loader), (loader) ? loader : "Unknown");
    - gtk_label_set_text(GTK_LABEL(priv->internal), (internal) ? "Yes" : "No");
    - gtk_label_set_text(GTK_LABEL(priv->load_on_query), (loq) ? "Yes" : "No");
    + gtk_label_set_markup(GTK_LABEL(info->name), (name) ? name : "Unnamed");
    + gtk_label_set_text(GTK_LABEL(info->version), (version) ? version : "");
    + gtk_label_set_markup(GTK_LABEL(info->website), (website) ? website : "");
    + gtk_label_set_text(GTK_LABEL(info->summary), (summary) ? summary : "");
    + gtk_label_set_text(GTK_LABEL(info->description), (description) ? description : "");
    + gtk_label_set_text(GTK_LABEL(info->id), (id) ? id : "");
    + gtk_label_set_text(GTK_LABEL(info->filename), (filename) ? filename : "");
    + gtk_label_set_text(GTK_LABEL(info->abi_version), (abi_version) ? abi_version : "");
    + gtk_label_set_text(GTK_LABEL(info->loader), (loader) ? loader : "Unknown");
    + gtk_label_set_text(GTK_LABEL(info->internal), (internal) ? "Yes" : "No");
    + gtk_label_set_text(GTK_LABEL(info->load_on_query), (loq) ? "Yes" : "No");
    g_free(description);
    g_free(id);
    @@ -172,7 +174,7 @@
    widget = gtk_label_new(authors[i]);
    gtk_widget_set_halign(widget, GTK_ALIGN_START);
    gtk_widget_set_valign(widget, GTK_ALIGN_START);
    - gtk_box_pack_start(GTK_BOX(priv->authors_box), widget, TRUE, TRUE, 0);
    + gtk_box_pack_start(GTK_BOX(info->authors_box), widget, TRUE, TRUE, 0);
    gtk_widget_show(widget);
    }
    }
    @@ -217,9 +219,9 @@
    static void
    gplugin_gtk_plugin_info_finalize(GObject *obj) {
    - GPluginGtkPluginInfoPrivate *priv = gplugin_gtk_plugin_info_get_instance_private(GPLUGIN_GTK_PLUGIN_INFO(obj));
    + GPluginGtkPluginInfo *info = GPLUGIN_GTK_PLUGIN_INFO(obj);
    - g_clear_object(&priv->plugin);
    + g_clear_object(&info->plugin);
    G_OBJECT_CLASS(gplugin_gtk_plugin_info_parent_class)->finalize(obj);
    }
    @@ -252,20 +254,20 @@
    "/org/bitbucket/gplugin/gplugin-gtk/plugin-info.ui"
    );
    - gtk_widget_class_bind_template_child_private(widget_class, GPluginGtkPluginInfo, name);
    - gtk_widget_class_bind_template_child_private(widget_class, GPluginGtkPluginInfo, version);
    - gtk_widget_class_bind_template_child_private(widget_class, GPluginGtkPluginInfo, authors_box);
    - gtk_widget_class_bind_template_child_private(widget_class, GPluginGtkPluginInfo, website);
    - gtk_widget_class_bind_template_child_private(widget_class, GPluginGtkPluginInfo, summary);
    - gtk_widget_class_bind_template_child_private(widget_class, GPluginGtkPluginInfo, description);
    - gtk_widget_class_bind_template_child_private(widget_class, GPluginGtkPluginInfo, dependencies);
    - gtk_widget_class_bind_template_child_private(widget_class, GPluginGtkPluginInfo, expander);
    - gtk_widget_class_bind_template_child_private(widget_class, GPluginGtkPluginInfo, id);
    - gtk_widget_class_bind_template_child_private(widget_class, GPluginGtkPluginInfo, filename);
    - gtk_widget_class_bind_template_child_private(widget_class, GPluginGtkPluginInfo, abi_version);
    - gtk_widget_class_bind_template_child_private(widget_class, GPluginGtkPluginInfo, loader);
    - gtk_widget_class_bind_template_child_private(widget_class, GPluginGtkPluginInfo, internal);
    - gtk_widget_class_bind_template_child_private(widget_class, GPluginGtkPluginInfo, load_on_query);
    + gtk_widget_class_bind_template_child(widget_class, GPluginGtkPluginInfo, name);
    + gtk_widget_class_bind_template_child(widget_class, GPluginGtkPluginInfo, version);
    + gtk_widget_class_bind_template_child(widget_class, GPluginGtkPluginInfo, authors_box);
    + gtk_widget_class_bind_template_child(widget_class, GPluginGtkPluginInfo, website);
    + gtk_widget_class_bind_template_child(widget_class, GPluginGtkPluginInfo, summary);
    + gtk_widget_class_bind_template_child(widget_class, GPluginGtkPluginInfo, description);
    + gtk_widget_class_bind_template_child(widget_class, GPluginGtkPluginInfo, dependencies);
    + gtk_widget_class_bind_template_child(widget_class, GPluginGtkPluginInfo, expander);
    + gtk_widget_class_bind_template_child(widget_class, GPluginGtkPluginInfo, id);
    + gtk_widget_class_bind_template_child(widget_class, GPluginGtkPluginInfo, filename);
    + gtk_widget_class_bind_template_child(widget_class, GPluginGtkPluginInfo, abi_version);
    + gtk_widget_class_bind_template_child(widget_class, GPluginGtkPluginInfo, loader);
    + gtk_widget_class_bind_template_child(widget_class, GPluginGtkPluginInfo, internal);
    + gtk_widget_class_bind_template_child(widget_class, GPluginGtkPluginInfo, load_on_query);
    gtk_widget_class_bind_template_callback(widget_class, gplugin_gtk_plugin_info_expander_activate);
    }
    @@ -300,22 +302,19 @@
    gplugin_gtk_plugin_info_set_plugin(GPluginGtkPluginInfo *info,
    GPluginPlugin *plugin)
    {
    - GPluginGtkPluginInfoPrivate *priv = NULL;
    GPluginPlugin *orig_plugin;
    g_return_if_fail(GPLUGIN_GTK_IS_PLUGIN_INFO(info));
    - priv = gplugin_gtk_plugin_info_get_instance_private(info);
    -
    - orig_plugin = priv->plugin;
    + orig_plugin = info->plugin;
    if(GPLUGIN_IS_PLUGIN(plugin)) {
    - priv->plugin = GPLUGIN_PLUGIN(g_object_ref(G_OBJECT(plugin)));
    + info->plugin = GPLUGIN_PLUGIN(g_object_ref(G_OBJECT(plugin)));
    } else {
    - priv->plugin = NULL;
    + info->plugin = NULL;
    }
    g_object_unref(G_OBJECT(orig_plugin));
    - _gplugin_gtk_plugin_info_refresh(priv, plugin);
    + _gplugin_gtk_plugin_info_refresh(info, plugin);
    }
    /**
    @@ -329,11 +328,7 @@
    */
    GPluginPlugin *
    gplugin_gtk_plugin_info_get_plugin(GPluginGtkPluginInfo *info) {
    - GPluginGtkPluginInfoPrivate *priv = NULL;
    -
    g_return_val_if_fail(GPLUGIN_GTK_IS_PLUGIN_INFO(info), NULL);
    - priv = gplugin_gtk_plugin_info_get_instance_private(info);
    -
    - return (priv->plugin) ? GPLUGIN_PLUGIN(g_object_ref(G_OBJECT(priv->plugin))) : NULL;
    + return (info->plugin) ? GPLUGIN_PLUGIN(g_object_ref(G_OBJECT(info->plugin))) : NULL;
    }
    --- a/gplugin-gtk/gplugin-gtk-plugin-info.h Thu Jul 18 05:09:47 2019 -0500
    +++ b/gplugin-gtk/gplugin-gtk-plugin-info.h Thu Jul 18 05:25:28 2019 -0500
    @@ -22,16 +22,6 @@
    #ifndef GPLUGIN_GTK_PLUGIN_INFO_H
    #define GPLUGIN_GTK_PLUGIN_INFO_H
    -#define GPLUGIN_GTK_TYPE_PLUGIN_INFO (gplugin_gtk_plugin_info_get_type())
    -#define GPLUGIN_GTK_PLUGIN_INFO(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GPLUGIN_GTK_TYPE_PLUGIN_INFO, GPluginGtkPluginInfo))
    -#define GPLUGIN_GTK_PLUGIN_INFO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GPLUGIN_GTK_TYPE_PLUGIN_INFO, GPluginGtkPluginInfoClass))
    -#define GPLUGIN_GTK_IS_PLUGIN_INFO(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GPLUGIN_GTK_TYPE_PLUGIN_INFO))
    -#define GPLUGIN_GTK_IS_PLUGIN_INFO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GPLUGIN_GTK_TYPE_PLUGIN_INFO))
    -#define GPLUING_GTK_PLUGIN_INFO_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GPLUGIN_GTK_TYPE_PLUGIN_INFO, GPluginGtkPluginInfoClass))
    -
    -typedef struct _GPluginGtkPluginInfo GPluginGtkPluginInfo;
    -typedef struct _GPluginGtkPluginInfoClass GPluginGtkPluginInfoClass;
    -
    #include <glib.h>
    #include <glib-object.h>
    @@ -39,21 +29,10 @@
    #include <gplugin/gplugin.h>
    -struct _GPluginGtkPluginInfo {
    - GtkFrame parent;
    -
    - gpointer reserved[4];
    -};
    -
    -struct _GPluginGtkPluginInfoClass {
    - GtkFrameClass parent;
    -
    - gpointer reserved[4];
    -};
    -
    G_BEGIN_DECLS
    -GType gplugin_gtk_plugin_info_get_type(void);
    +#define GPLUGIN_GTK_TYPE_PLUGIN_INFO (gplugin_gtk_plugin_info_get_type())
    +G_DECLARE_FINAL_TYPE(GPluginGtkPluginInfo, gplugin_gtk_plugin_info, GPLUGIN_GTK, PLUGIN_INFO, GtkBox)
    GtkWidget *gplugin_gtk_plugin_info_new(void);
    --- a/gplugin-gtk/gplugin-gtk-store.c Thu Jul 18 05:09:47 2019 -0500
    +++ b/gplugin-gtk/gplugin-gtk-store.c Thu Jul 18 05:25:28 2019 -0500
    @@ -27,6 +27,10 @@
    * #GPluginGtkStore is a GtkTreeModel populated with gplugins.
    */
    +struct _GPluginGtkStore {
    + GtkListStore parent;
    +};
    +
    G_DEFINE_TYPE(GPluginGtkStore, gplugin_gtk_store, GTK_TYPE_LIST_STORE);
    /******************************************************************************
    --- a/gplugin-gtk/gplugin-gtk-store.h Thu Jul 18 05:09:47 2019 -0500
    +++ b/gplugin-gtk/gplugin-gtk-store.h Thu Jul 18 05:25:28 2019 -0500
    @@ -22,32 +22,15 @@
    #ifndef GPLUGIN_GTK_STORE_H
    #define GPLUGIN_GTK_STORE_H
    -#define GPLUGIN_GTK_TYPE_STORE (gplugin_gtk_store_get_type())
    -#define GPLUGIN_GTK_STORE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GPLUGIN_GTK_TYPE_STORE, GPluginGtkStore))
    -#define GPLUGIN_GTK_STORE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GPLUGIN_GTK_TYPE_STORE, GPluginGtkStoreClass))
    -#define GPLUGIN_GTK_IS_STORE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GPLUGIN_GTK_TYPE_STORE))
    -#define GPLUGIN_GTK_IS_STORE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GPLUGIN_GTK_TYPE_STORE))
    -#define GPLUING_GTK_STORE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GPLUGIN_GTK_TYPE_STORE, GPluginGtkStoreClass))
    -
    -typedef struct _GPluginGtkStore GPluginGtkStore;
    -typedef struct _GPluginGtkStoreClass GPluginGtkStoreClass;
    -
    #include <glib.h>
    #include <glib-object.h>
    #include <gtk/gtk.h>
    -struct _GPluginGtkStore {
    - GtkListStore parent;
    -
    - gpointer reserved[4];
    -};
    +G_BEGIN_DECLS
    -struct _GPluginGtkStoreClass {
    - GtkListStoreClass parent;
    -
    - gpointer reserved[4];
    -};
    +#define GPLUGIN_GTK_TYPE_STORE (gplugin_gtk_store_get_type())
    +G_DECLARE_FINAL_TYPE(GPluginGtkStore, gplugin_gtk_store, GPLUGIN_GTK, STORE, GtkListStore)
    typedef enum {
    GPLUGIN_GTK_STORE_LOADED_COLUMN,
    @@ -56,11 +39,6 @@
    GPLUGIN_GTK_STORE_N_COLUMNS,
    } GPluginGtkStoreColumns;
    -
    -G_BEGIN_DECLS
    -
    -GType gplugin_gtk_store_get_type(void);
    -
    GPluginGtkStore *gplugin_gtk_store_new(void);
    const GType *gplugin_gtk_get_store_column_types(void);
    --- a/gplugin-gtk/gplugin-gtk-view.c Thu Jul 18 05:09:47 2019 -0500
    +++ b/gplugin-gtk/gplugin-gtk-view.c Thu Jul 18 05:25:28 2019 -0500
    @@ -29,9 +29,11 @@
    /******************************************************************************
    * Structs
    *****************************************************************************/
    -typedef struct {
    +struct _GPluginGtkView {
    + GtkTreeView parent;
    +
    gboolean show_internal;
    -} GPluginGtkViewPrivate;
    +};
    /******************************************************************************
    * Enums
    @@ -46,7 +48,7 @@
    /******************************************************************************
    * GObject Stuff
    *****************************************************************************/
    -G_DEFINE_TYPE_WITH_PRIVATE(GPluginGtkView, gplugin_gtk_view, GTK_TYPE_TREE_VIEW);
    +G_DEFINE_TYPE(GPluginGtkView, gplugin_gtk_view, GTK_TYPE_TREE_VIEW);
    static void
    gplugin_gtk_view_set_property(GObject *obj, guint prop_id, const GValue *value,
    @@ -187,13 +189,9 @@
    gplugin_gtk_view_set_show_internal(GPluginGtkView *view,
    gboolean show_internal)
    {
    - GPluginGtkViewPrivate *priv = NULL;
    -
    g_return_if_fail(GPLUGIN_GTK_IS_VIEW(view));
    - priv = gplugin_gtk_view_get_instance_private(view);
    -
    - priv->show_internal = show_internal;
    + view->show_internal = show_internal;
    g_object_notify(G_OBJECT(view), "show-internal");
    }
    @@ -206,12 +204,8 @@
    */
    gboolean
    gplugin_gtk_view_get_show_internal(GPluginGtkView *view) {
    - GPluginGtkViewPrivate *priv = NULL;
    -
    g_return_val_if_fail(GPLUGIN_GTK_IS_VIEW(view), FALSE);
    - priv = gplugin_gtk_view_get_instance_private(view);
    -
    - return priv->show_internal;
    + return view->show_internal;
    }
    --- a/gplugin-gtk/gplugin-gtk-view.h Thu Jul 18 05:09:47 2019 -0500
    +++ b/gplugin-gtk/gplugin-gtk-view.h Thu Jul 18 05:25:28 2019 -0500
    @@ -22,36 +22,15 @@
    #ifndef GPLUGIN_GTK_VIEW_H
    #define GPLUGIN_GTK_VIEW_H
    -#define GPLUGIN_GTK_TYPE_VIEW (gplugin_gtk_view_get_type())
    -#define GPLUGIN_GTK_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GPLUGIN_GTK_TYPE_VIEW, GPluginGtkView))
    -#define GPLUGIN_GTK_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GPLUGIN_GTK_TYPE_VIEW, GPluginGtkViewClass))
    -#define GPLUGIN_GTK_IS_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GPLUGIN_GTK_TYPE_VIEW))
    -#define GPLUGIN_GTK_IS_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GPLUGIN_GTK_TYPE_VIEW))
    -#define GPLUING_GTK_VIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GPLUGIN_GTK_TYPE_VIEW, GPluginGtkViewClass))
    -
    -typedef struct _GPluginGtkView GPluginGtkView;
    -typedef struct _GPluginGtkViewClass GPluginGtkViewClass;
    -
    #include <glib.h>
    #include <glib-object.h>
    #include <gtk/gtk.h>
    -struct _GPluginGtkView {
    - GtkTreeView parent;
    -
    - gpointer reserved[4];
    -};
    -
    -struct _GPluginGtkViewClass {
    - GtkTreeViewClass parent;
    -
    - gpointer reserved[4];
    -};
    -
    G_BEGIN_DECLS
    -GType gplugin_gtk_view_get_type(void);
    +#define GPLUGIN_GTK_TYPE_VIEW (gplugin_gtk_view_get_type())
    +G_DECLARE_FINAL_TYPE(GPluginGtkView, gplugin_gtk_view, GPLUGIN_GTK, VIEW, GtkTreeView)
    GtkWidget *gplugin_gtk_view_new(void);