[epiphany] node-filter: Use G_DECLARE_FINAL_TYPE

[Michael Catanzaro <mcatanzaro src gnome org>]

commit b49195e90262b004c3639e92c3c4c007c3c56fe9
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Sat Feb 27 15:03:28 2016 -0600

    node-filter: Use G_DECLARE_FINAL_TYPE

 lib/ephy-node-filter.c |   32 ++++++++++++++------------------
 lib/ephy-node-filter.h |   24 ++----------------------
 2 files changed, 16 insertions(+), 40 deletions(-)
---
diff --git a/lib/ephy-node-filter.c b/lib/ephy-node-filter.c
index d1ea341..e981d7d 100644
--- a/lib/ephy-node-filter.c
+++ b/lib/ephy-node-filter.c
@@ -34,10 +34,10 @@ enum
        LAST_SIGNAL
 };
 
-#define EPHY_NODE_FILTER_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_NODE_FILTER, 
EphyNodeFilterPrivate))
-
-struct _EphyNodeFilterPrivate
+struct _EphyNodeFilter
 {
+       GObject parent_instance;
+
        GPtrArray *levels;
 };
 
@@ -85,16 +85,12 @@ ephy_node_filter_class_init (EphyNodeFilterClass *klass)
                              0, NULL, NULL, NULL,
                              G_TYPE_NONE,
                              0);
-
-       g_type_class_add_private (object_class, sizeof (EphyNodeFilterPrivate));
 }
 
 static void
 ephy_node_filter_init (EphyNodeFilter *filter)
 {
-       filter->priv = EPHY_NODE_FILTER_GET_PRIVATE (filter);
-
-       filter->priv->levels = g_ptr_array_new ();
+       filter->levels = g_ptr_array_new ();
 }
 
 static void
@@ -104,7 +100,7 @@ ephy_node_filter_finalize (GObject *object)
 
        ephy_node_filter_empty (filter);
 
-       g_ptr_array_free (filter->priv->levels, TRUE);
+       g_ptr_array_free (filter->levels, TRUE);
 
        G_OBJECT_CLASS (ephy_node_filter_parent_class)->finalize (object);
 }
@@ -120,12 +116,12 @@ ephy_node_filter_add_expression (EphyNodeFilter *filter,
                                 EphyNodeFilterExpression *exp,
                                 int level)
 {
-       while (level >= (int)filter->priv->levels->len)
-               g_ptr_array_add (filter->priv->levels, NULL);
+       while (level >= (int)filter->levels->len)
+               g_ptr_array_add (filter->levels, NULL);
 
        /* FIXME bogosity! This only works because g_list_append (x, data) == x */
-       g_ptr_array_index (filter->priv->levels, level) =
-               g_list_append (g_ptr_array_index (filter->priv->levels, level), exp);
+       g_ptr_array_index (filter->levels, level) =
+               g_list_append (g_ptr_array_index (filter->levels, level), exp);
 }
 
 void
@@ -133,11 +129,11 @@ ephy_node_filter_empty (EphyNodeFilter *filter)
 {
        int i;
        
-       for (i = filter->priv->levels->len - 1; i >= 0; i--)
+       for (i = filter->levels->len - 1; i >= 0; i--)
        {
                GList *list, *l;
 
-               list = g_ptr_array_index (filter->priv->levels, i);
+               list = g_ptr_array_index (filter->levels, i);
 
                for (l = list; l != NULL; l = g_list_next (l))
                {
@@ -150,7 +146,7 @@ ephy_node_filter_empty (EphyNodeFilter *filter)
 
                g_list_free (list);
 
-               g_ptr_array_remove_index (filter->priv->levels, i);
+               g_ptr_array_remove_index (filter->levels, i);
        }
 }
 
@@ -172,13 +168,13 @@ ephy_node_filter_evaluate (EphyNodeFilter *filter,
 {
        guint i;
 
-       for (i = 0; i < filter->priv->levels->len; i++) {
+       for (i = 0; i < filter->levels->len; i++) {
                GList *l, *list;
                gboolean handled;
 
                handled = FALSE;
 
-               list = g_ptr_array_index (filter->priv->levels, i);
+               list = g_ptr_array_index (filter->levels, i);
 
                for (l = list; l != NULL; l = g_list_next (l)) {
                        if (ephy_node_filter_expression_evaluate (l->data, node) == TRUE) {
diff --git a/lib/ephy-node-filter.h b/lib/ephy-node-filter.h
index 1102f36..a047221 100644
--- a/lib/ephy-node-filter.h
+++ b/lib/ephy-node-filter.h
@@ -25,27 +25,9 @@
 
 G_BEGIN_DECLS
 
-#define EPHY_TYPE_NODE_FILTER         (ephy_node_filter_get_type ())
-#define EPHY_NODE_FILTER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_NODE_FILTER, 
EphyNodeFilter))
-#define EPHY_NODE_FILTER_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_NODE_FILTER, 
EphyNodeFilterClass))
-#define EPHY_IS_NODE_FILTER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_NODE_FILTER))
-#define EPHY_IS_NODE_FILTER_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_NODE_FILTER))
-#define EPHY_NODE_FILTER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_NODE_FILTER, 
EphyNodeFilterClass))
+#define EPHY_TYPE_NODE_FILTER (ephy_node_filter_get_type ())
 
-typedef struct _EphyNodeFilterPrivate EphyNodeFilterPrivate;
-
-typedef struct
-{
-       GObject parent;
-
-       /*< private >*/
-       EphyNodeFilterPrivate *priv;
-} EphyNodeFilter;
-
-typedef struct
-{
-       GObjectClass parent;
-} EphyNodeFilterClass;
+G_DECLARE_FINAL_TYPE (EphyNodeFilter, ephy_node_filter, EPHY, NODE_FILTER, GObject)
 
 typedef enum
 {
@@ -73,8 +55,6 @@ typedef struct _EphyNodeFilterExpression EphyNodeFilterExpression;
  * next level, the result is TRUE. Otherwise, it's FALSE.
  */
 
-GType           ephy_node_filter_get_type       (void);
-
 EphyNodeFilter *ephy_node_filter_new            (void);
 
 void            ephy_node_filter_add_expression (EphyNodeFilter *filter,