[libgda] GdaWebRecordset: ported to G_DECLARE/G_DEFINE

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit d32dbadeabfb3ca031dcb5e02dc3d2a74ab33208
Author: Daniel Espinosa <esodan gmail com>
Date:   Fri Apr 5 15:12:56 2019 -0600

    GdaWebRecordset: ported to G_DECLARE/G_DEFINE

 providers/web/gda-web-recordset.c | 110 ++++++++++++++------------------------
 providers/web/gda-web-recordset.h |  16 +-----
 2 files changed, 42 insertions(+), 84 deletions(-)
---
diff --git a/providers/web/gda-web-recordset.c b/providers/web/gda-web-recordset.c
index 67e62f769..14cbfad42 100644
--- a/providers/web/gda-web-recordset.c
+++ b/providers/web/gda-web-recordset.c
@@ -34,8 +34,7 @@
 #define _GDA_PSTMT(x) ((GdaPStmt*)(x))
 
 static void gda_web_recordset_class_init (GdaWebRecordsetClass *klass);
-static void gda_web_recordset_init       (GdaWebRecordset *recset,
-                                            GdaWebRecordsetClass *klass);
+static void gda_web_recordset_init       (GdaWebRecordset *recset);
 static void gda_web_recordset_dispose   (GObject *object);
 
 /* virtual methods */
@@ -43,24 +42,24 @@ static gint     gda_web_recordset_fetch_nb_rows (GdaDataSelect *model);
 static gboolean gda_web_recordset_fetch_random (GdaDataSelect *model, GdaRow **prow, gint rownum, GError 
**error);
 
 
-struct _GdaWebRecordsetPrivate {
+typedef struct {
        GdaConnection *cnc;
        
        GdaDataModel *real_model;
        GdaRow       *prow;
-};
-static GObjectClass *parent_class = NULL;
+} GdaWebRecordsetPrivate;
+
+G_DEFINE_TYPE_WITH_PRIVATE(GdaWebRecordset, gda_web_recordset, GDA_TYPE_DATA_SELECT)
 
 /*
  * Object init and finalize
  */
 static void
-gda_web_recordset_init (GdaWebRecordset *recset,
-                          G_GNUC_UNUSED GdaWebRecordsetClass *klass)
+gda_web_recordset_init (GdaWebRecordset *recset)
 {
        g_return_if_fail (GDA_IS_WEB_RECORDSET (recset));
-       recset->priv = g_new0 (GdaWebRecordsetPrivate, 1);
-       recset->priv->cnc = NULL;
+  GdaWebRecordsetPrivate *priv = gda_web_recordset_get_instance_private (recset);
+       priv->cnc = NULL;
 }
 
 static void
@@ -69,8 +68,6 @@ gda_web_recordset_class_init (GdaWebRecordsetClass *klass)
        GObjectClass *object_class = G_OBJECT_CLASS (klass);
        GdaDataSelectClass *pmodel_class = GDA_DATA_SELECT_CLASS (klass);
 
-       parent_class = g_type_class_peek_parent (klass);
-
        object_class->dispose = gda_web_recordset_dispose;
        pmodel_class->fetch_nb_rows = gda_web_recordset_fetch_nb_rows;
        pmodel_class->fetch_random = gda_web_recordset_fetch_random;
@@ -86,54 +83,22 @@ gda_web_recordset_dispose (GObject *object)
        GdaWebRecordset *recset = (GdaWebRecordset *) object;
 
        g_return_if_fail (GDA_IS_WEB_RECORDSET (recset));
+  GdaWebRecordsetPrivate *priv = gda_web_recordset_get_instance_private (recset);
 
-       if (recset->priv) {
-               if (recset->priv->cnc) 
-                       g_object_unref (recset->priv->cnc);
-               if (recset->priv->real_model)
-                       g_object_unref (recset->priv->real_model);
-               if (recset->priv->prow)
-                       g_object_unref (recset->priv->prow);
+       if (priv->cnc)
+               g_object_unref (priv->cnc);
+       if (priv->real_model)
+               g_object_unref (priv->real_model);
+       if (priv->prow)
+               g_object_unref (priv->prow);
 
-               g_free (recset->priv);
-               recset->priv = NULL;
-       }
-
-       parent_class->dispose (object);
+       G_OBJECT_CLASS (gda_web_recordset_parent_class)->dispose (object);
 }
 
 /*
  * Public functions
  */
 
-GType
-gda_web_recordset_get_type (void)
-{
-       static GType type = 0;
-
-       if (G_UNLIKELY (type == 0)) {
-               static GMutex registering;
-               static const GTypeInfo info = {
-                       sizeof (GdaWebRecordsetClass),
-                       (GBaseInitFunc) NULL,
-                       (GBaseFinalizeFunc) NULL,
-                       (GClassInitFunc) gda_web_recordset_class_init,
-                       NULL,
-                       NULL,
-                       sizeof (GdaWebRecordset),
-                       0,
-                       (GInstanceInitFunc) gda_web_recordset_init,
-                       0
-               };
-               g_mutex_lock (&registering);
-               if (type == 0)
-                       type = g_type_register_static (GDA_TYPE_DATA_SELECT, "GdaWebRecordset", &info, 0);
-               g_mutex_unlock (&registering);
-       }
-
-       return type;
-}
-
 /*
  * the @ps struct is modified and transferred to the new data model created in
  * this function
@@ -144,11 +109,11 @@ gda_web_recordset_new (GdaConnection *cnc, GdaWebPStmt *ps, GdaSet *exec_params,
                       const gchar *session_id, xmlNodePtr data_node, GError **error)
 {
        GdaWebRecordset *model;
-        gint i;
+  gint i;
        WebConnectionData *cdata;
 
-        g_return_val_if_fail (GDA_IS_CONNECTION (cnc), NULL);
-        g_return_val_if_fail (ps != NULL, NULL);
+  g_return_val_if_fail (GDA_IS_CONNECTION (cnc), NULL);
+  g_return_val_if_fail (ps != NULL, NULL);
 
        cdata = (WebConnectionData*) gda_connection_internal_get_provider_data_error (cnc, error);
        if (!cdata)
@@ -265,11 +230,12 @@ gda_web_recordset_new (GdaConnection *cnc, GdaWebPStmt *ps, GdaSet *exec_params,
         }
 
        /* create data model */
-        model = g_object_new (GDA_TYPE_WEB_RECORDSET, 
-                             "prepared-stmt", ps, 
-                             "model-usage", GDA_DATA_MODEL_ACCESS_RANDOM, 
-                             "exec-params", exec_params, NULL);
-        model->priv->cnc = cnc;
+  model = g_object_new (GDA_TYPE_WEB_RECORDSET,
+      "prepared-stmt", ps,
+      "model-usage", GDA_DATA_MODEL_ACCESS_RANDOM,
+      "exec-params", exec_params, NULL);
+  GdaWebRecordsetPrivate *priv = gda_web_recordset_get_instance_private (model);
+  priv->cnc = cnc;
        g_object_ref (cnc);
 
         return GDA_DATA_MODEL (model);
@@ -290,6 +256,7 @@ gda_web_recordset_store (GdaWebRecordset *rs, xmlNodePtr data_node, GError **err
        g_return_val_if_fail (GDA_IS_WEB_RECORDSET (rs), FALSE);
        g_return_val_if_fail (data_node, FALSE);
        g_return_val_if_fail (!strcmp ((gchar*) data_node->name, "gda_array"), FALSE);
+  GdaWebRecordsetPrivate *priv = gda_web_recordset_get_instance_private (rs);
 
        /* modify the @data_node tree to set the correct data types */
        ncols = gda_data_model_get_n_columns ((GdaDataModel*) rs);
@@ -316,7 +283,7 @@ gda_web_recordset_store (GdaWebRecordset *rs, xmlNodePtr data_node, GError **err
                             _("Can't import data from web server"));
                return FALSE;
        }
-       rs->priv->real_model = data;
+       priv->real_model = data;
 
        return TRUE;
 }
@@ -332,9 +299,10 @@ gda_web_recordset_fetch_nb_rows (GdaDataSelect *model)
        imodel = GDA_WEB_RECORDSET (model);
        if (gda_data_select_get_advertized_nrows (model) >= 0)
                return gda_data_select_get_advertized_nrows (model);
+  GdaWebRecordsetPrivate *priv = gda_web_recordset_get_instance_private (imodel);
 
-       if (imodel->priv->real_model)
-               gda_data_select_set_advertized_nrows (model, gda_data_model_get_n_rows 
(imodel->priv->real_model));
+       if (priv->real_model)
+               gda_data_select_set_advertized_nrows (model, gda_data_model_get_n_rows (priv->real_model));
 
        return gda_data_select_get_advertized_nrows (model);
 }
@@ -360,26 +328,28 @@ gda_web_recordset_fetch_random (GdaDataSelect *model, GdaRow **prow, gint rownum
        GdaWebRecordset *imodel;
 
        imodel = GDA_WEB_RECORDSET (model);
+  GdaWebRecordsetPrivate *priv = gda_web_recordset_get_instance_private (imodel);
 
-       if (*prow)
-                return TRUE;
+       if (*prow) {
+    return TRUE;
+  }
 
-       if (imodel->priv->real_model) {
+       if (priv->real_model) {
                gint i, ncols;
                ncols = gda_data_model_get_n_columns ((GdaDataModel*) model);
-               if (!imodel->priv->prow)
-                       imodel->priv->prow = gda_row_new (ncols);
+               if (!priv->prow)
+                       priv->prow = gda_row_new (ncols);
                for (i = 0; i < ncols; i++) {
                        const GValue *cvalue;
                        GValue *pvalue;
-                       cvalue = gda_data_model_get_value_at (imodel->priv->real_model, i, rownum, error);
+                       cvalue = gda_data_model_get_value_at (priv->real_model, i, rownum, error);
                        if (!cvalue)
                                return FALSE;
-                       pvalue = gda_row_get_value (imodel->priv->prow, i);
+                       pvalue = gda_row_get_value (priv->prow, i);
                        gda_value_reset_with_type (pvalue, G_VALUE_TYPE (cvalue));
                        g_value_copy (cvalue, pvalue);
                }
-               *prow = imodel->priv->prow;
+               *prow = priv->prow;
                return TRUE;
        }
 
diff --git a/providers/web/gda-web-recordset.h b/providers/web/gda-web-recordset.h
index 2442f4190..7f951d51e 100644
--- a/providers/web/gda-web-recordset.h
+++ b/providers/web/gda-web-recordset.h
@@ -27,25 +27,13 @@
 G_BEGIN_DECLS
 
 #define GDA_TYPE_WEB_RECORDSET            (gda_web_recordset_get_type())
-#define GDA_WEB_RECORDSET(obj)            (G_TYPE_CHECK_INSTANCE_CAST (obj, GDA_TYPE_WEB_RECORDSET, 
GdaWebRecordset))
-#define GDA_WEB_RECORDSET_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST (klass, GDA_TYPE_WEB_RECORDSET, 
GdaWebRecordsetClass))
-#define GDA_IS_WEB_RECORDSET(obj)         (G_TYPE_CHECK_INSTANCE_TYPE (obj, GDA_TYPE_WEB_RECORDSET))
-#define GDA_IS_WEB_RECORDSET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDA_TYPE_WEB_RECORDSET))
-
-typedef struct _GdaWebRecordset        GdaWebRecordset;
-typedef struct _GdaWebRecordsetClass   GdaWebRecordsetClass;
-typedef struct _GdaWebRecordsetPrivate GdaWebRecordsetPrivate;
-
-struct _GdaWebRecordset {
-       GdaDataSelect           model;
-       GdaWebRecordsetPrivate *priv;
-};
+
+G_DECLARE_DERIVABLE_TYPE(GdaWebRecordset, gda_web_recordset, GDA, WEB_RECORDSET, GdaDataSelect)
 
 struct _GdaWebRecordsetClass {
        GdaDataSelectClass      parent_class;
 };
 
-GType         gda_web_recordset_get_type  (void) G_GNUC_CONST;
 GdaDataModel *gda_web_recordset_new       (GdaConnection *cnc, GdaWebPStmt *ps, GdaSet *exec_params,
                                           GdaDataModelAccessFlags flags, GType *col_types,
                                           const gchar *session_id, xmlNodePtr data_node, GError **error);