Removed g_type_class_add_private deprecation.

diff --git a/src/gdaex.c b/src/gdaex.c
index b2035c9ce43bf1ec8330f7b6fb4275968b217a35..f7b2523719fa51912c8ef094b655e76f99721dc7 100644 (file)
--- a/src/gdaex.c
+++ b/src/gdaex.c
@@ -67,8 +67,6 @@ static void gdaex_get_property (GObject *object,
                                GValue *value,
                                GParamSpec *pspec);
 
-#define GDAEX_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_GDAEX, GdaExPrivate))
-
 typedef struct _GdaExPrivate GdaExPrivate;
 struct _GdaExPrivate
        {
@@ -85,15 +83,13 @@ struct _GdaExPrivate
                GFileOutputStream *log_file;
        };
 
-G_DEFINE_TYPE (GdaEx, gdaex, G_TYPE_OBJECT)
+G_DEFINE_TYPE_WITH_PRIVATE (GdaEx, gdaex, G_TYPE_OBJECT)
 
 static void
 gdaex_class_init (GdaExClass *klass)
 {
        GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-       g_type_class_add_private (object_class, sizeof (GdaExPrivate));
-
        object_class->set_property = gdaex_set_property;
        object_class->get_property = gdaex_get_property;
 
@@ -135,7 +131,7 @@ gdaex_init (GdaEx *gdaex)
 {
        gchar *localedir;
 
-       GdaExPrivate *priv = GDAEX_GET_PRIVATE (gdaex);
+       GdaExPrivate *priv = gdaex_get_instance_private (gdaex);
 
        priv->tables_name_prefix = NULL;
        priv->debug = 0;
@@ -230,7 +226,7 @@ gdaex_set_dsn (GdaEx *gdaex,
                        return FALSE;
                }
 
-       priv = GDAEX_GET_PRIVATE (gdaex);
+       priv = gdaex_get_instance_private (gdaex);
 
        auth_string = NULL;
        new_user = NULL;
@@ -319,7 +315,7 @@ gdaex_set_cnc_string (GdaEx *gdaex,
                        return FALSE;
                }
 
-       priv = GDAEX_GET_PRIVATE (gdaex);
+       priv = gdaex_get_instance_private (gdaex);
 
        /* open database connection */
        error = NULL;
@@ -357,7 +353,7 @@ gdaex_set_gda_connection (GdaEx *gdaex,
        g_return_val_if_fail (IS_GDAEX (gdaex), FALSE);
        g_return_val_if_fail (GDA_IS_CONNECTION (conn), FALSE);
 
-       priv = GDAEX_GET_PRIVATE (gdaex);
+       priv = gdaex_get_instance_private (gdaex);
 
        priv->gda_conn = conn;
 
@@ -470,7 +466,7 @@ gdaex_log_handler (const gchar *log_domain,
 
        gchar *msg;
 
-       GdaExPrivate *priv = GDAEX_GET_PRIVATE ((GdaEx *)user_data);
+       GdaExPrivate *priv = gdaex_get_instance_private ((GdaEx *)user_data);
 
        msg = g_strdup_printf ("%s **: %s\n\n", log_domain, message);
 
@@ -488,7 +484,7 @@ gdaex_post_parse_options (GOptionContext *context,
                           gpointer user_data,
                           GError **error)
 {
-       GdaExPrivate *priv = GDAEX_GET_PRIVATE ((GdaEx *)user_data);
+       GdaExPrivate *priv = gdaex_get_instance_private ((GdaEx *)user_data);
 
        GError *my_error;
 
@@ -558,7 +554,7 @@ const GdaConnection
 {
        g_return_val_if_fail (IS_GDAEX (gdaex), NULL);
 
-       GdaExPrivate *priv = GDAEX_GET_PRIVATE (gdaex);
+       GdaExPrivate *priv = gdaex_get_instance_private (gdaex);
 
        return priv->gda_conn;
 }
@@ -574,7 +570,7 @@ const gchar
 {
        g_return_val_if_fail (IS_GDAEX (gdaex), NULL);
 
-       GdaExPrivate *priv = GDAEX_GET_PRIVATE (gdaex);
+       GdaExPrivate *priv = gdaex_get_instance_private (gdaex);
 
        return gda_server_provider_get_name (gda_connection_get_provider (priv->gda_conn));
 }
@@ -590,7 +586,7 @@ const GdaSqlParser
 {
        g_return_val_if_fail (IS_GDAEX (gdaex), NULL);
 
-       GdaExPrivate *priv = GDAEX_GET_PRIVATE (gdaex);
+       GdaExPrivate *priv = gdaex_get_instance_private (gdaex);
 
        return priv->gda_parser;
 }
@@ -605,7 +601,7 @@ const gchar
 {
        g_return_val_if_fail (IS_GDAEX (gdaex), NULL);
 
-       GdaExPrivate *priv = GDAEX_GET_PRIVATE (gdaex);
+       GdaExPrivate *priv = gdaex_get_instance_private (gdaex);
 
        return g_strdup (priv->tables_name_prefix);
 }
@@ -621,7 +617,7 @@ gdaex_set_tables_name_prefix (GdaEx *gdaex, const gchar *tables_name_prefix)
 {
        g_return_if_fail (IS_GDAEX (gdaex));
 
-       GdaExPrivate *priv = GDAEX_GET_PRIVATE (gdaex);
+       GdaExPrivate *priv = gdaex_get_instance_private (gdaex);
 
        if (tables_name_prefix == NULL)
                {
@@ -639,7 +635,7 @@ gdaex_set_tables_name_prefix_into_statement (GdaEx *gdaex, GdaStatement **stmt)
        GdaStatement *stmp;
        GdaSqlStatement *sstmt;
 
-       GdaExPrivate *priv = GDAEX_GET_PRIVATE (gdaex);
+       GdaExPrivate *priv = gdaex_get_instance_private (gdaex);
 
        stmp = *stmt;
        g_object_get (G_OBJECT (stmp), "structure", &sstmt, NULL);
@@ -787,7 +783,7 @@ GdaDataModel
 
        g_return_val_if_fail (IS_GDAEX (gdaex), NULL);
 
-       GdaExPrivate *priv = GDAEX_GET_PRIVATE (gdaex);
+       GdaExPrivate *priv = gdaex_get_instance_private (gdaex);
 
        error = NULL;
        stmt = gda_sql_parser_parse_string (priv->gda_parser, sql, NULL, &error);
@@ -3032,7 +3028,7 @@ gdaex_begin (GdaEx *gdaex)
 
        g_return_val_if_fail (IS_GDAEX (gdaex), FALSE);
 
-       GdaExPrivate *priv = GDAEX_GET_PRIVATE (gdaex);
+       GdaExPrivate *priv = gdaex_get_instance_private (gdaex);
 
        error = NULL;
        ret = gda_connection_begin_transaction (priv->gda_conn, "gdaex",
@@ -3085,7 +3081,7 @@ gdaex_execute (GdaEx *gdaex, const gchar *sql)
 
        g_return_val_if_fail (IS_GDAEX (gdaex), -1);
 
-       GdaExPrivate *priv = GDAEX_GET_PRIVATE (gdaex);
+       GdaExPrivate *priv = gdaex_get_instance_private (gdaex);
        GdaExClass *klass = GDAEX_GET_CLASS (gdaex);
 
        error = NULL;
@@ -3157,7 +3153,7 @@ GSList
 
        g_return_val_if_fail (IS_GDAEX (gdaex), NULL);
 
-       GdaExPrivate *priv = GDAEX_GET_PRIVATE (gdaex);
+       GdaExPrivate *priv = gdaex_get_instance_private (gdaex);
 
        ret = NULL;
 
@@ -3209,7 +3205,7 @@ gdaex_commit (GdaEx *gdaex)
 
        g_return_val_if_fail (IS_GDAEX (gdaex), FALSE);
 
-       priv = GDAEX_GET_PRIVATE (gdaex);
+       priv = gdaex_get_instance_private (gdaex);
 
        tstatus = gda_connection_get_transaction_status (priv->gda_conn);
 
@@ -3259,7 +3255,7 @@ gdaex_rollback (GdaEx *gdaex)
 
        g_return_val_if_fail (IS_GDAEX (gdaex), FALSE);
 
-       priv = GDAEX_GET_PRIVATE (gdaex);
+       priv = gdaex_get_instance_private (gdaex);
 
        tstatus = gda_connection_get_transaction_status (priv->gda_conn);
 
@@ -3300,7 +3296,7 @@ gdaex_free (GdaEx *gdaex)
 {
        g_return_if_fail (IS_GDAEX (gdaex));
 
-       GdaExPrivate *priv = GDAEX_GET_PRIVATE (gdaex);
+       GdaExPrivate *priv = gdaex_get_instance_private (gdaex);
 
        /* close connection */
        if (gda_connection_is_opened (priv->gda_conn))
@@ -3371,7 +3367,7 @@ const gchar
 
        g_return_val_if_fail (IS_GDAEX (gdaex), NULL);
 
-       priv = GDAEX_GET_PRIVATE (gdaex);
+       priv = gdaex_get_instance_private (gdaex);
 
        return (const gchar *)g_strdup (priv->guifile);
 }
@@ -3383,7 +3379,7 @@ GtkBuilder
 
        g_return_val_if_fail (IS_GDAEX (gdaex), NULL);
 
-       priv = GDAEX_GET_PRIVATE (gdaex);
+       priv = gdaex_get_instance_private (gdaex);
 
        return priv->gtkbuilder;
 }
@@ -3875,7 +3871,7 @@ const gchar
 
        gchar *ret;
 
-       priv = GDAEX_GET_PRIVATE (gdaex);
+       priv = gdaex_get_instance_private (gdaex);
 
        b = gdaex_get_gda_sqlbuilder_from_hashtable (gdaex,
                                                     sqltype,
@@ -4305,7 +4301,7 @@ gdaex_meta_store_update (GdaEx *gdaex, GdaMetaContext *mcontext)
 
        GError *error;
 
-       GdaExPrivate *priv = GDAEX_GET_PRIVATE (gdaex);
+       GdaExPrivate *priv = gdaex_get_instance_private (gdaex);
 
        error = NULL;
        ret = gda_connection_update_meta_store (priv->gda_conn, mcontext, &error);
@@ -4327,7 +4323,7 @@ GdaDataModel
 
        GdaMetaContext *mcontext;
 
-       GdaExPrivate *priv = GDAEX_GET_PRIVATE (gdaex);
+       GdaExPrivate *priv = gdaex_get_instance_private (gdaex);
 
        dm = NULL;
 
@@ -4368,7 +4364,7 @@ GdaDataModel
 
        GdaMetaContext *mcontext;
 
-       GdaExPrivate *priv = GDAEX_GET_PRIVATE (gdaex);
+       GdaExPrivate *priv = gdaex_get_instance_private (gdaex);
 
        dm = NULL;
 
@@ -4599,7 +4595,7 @@ JsonNode
 static void
 gdaex_create_connection_parser (GdaEx *gdaex)
 {
-       GdaExPrivate *priv = GDAEX_GET_PRIVATE (gdaex);
+       GdaExPrivate *priv = gdaex_get_instance_private (gdaex);
 
        priv->gda_parser = gda_connection_create_parser (priv->gda_conn);
        if (priv->gda_parser == NULL) /* @gda_conn doe snot provide its own parser => use default one */
@@ -4612,7 +4608,7 @@ static void
 gdaex_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
 {
        GdaEx *gdaex = GDAEX (object);
-       GdaExPrivate *priv = GDAEX_GET_PRIVATE (gdaex);
+       GdaExPrivate *priv = gdaex_get_instance_private (gdaex);
 
        switch (property_id)
                {
@@ -4626,7 +4622,7 @@ static void
 gdaex_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
        GdaEx *gdaex = GDAEX (object);
-       GdaExPrivate *priv = GDAEX_GET_PRIVATE (gdaex);
+       GdaExPrivate *priv = gdaex_get_instance_private (gdaex);
 
        switch (property_id)
                {

diff --git a/src/queryeditor.c b/src/queryeditor.c
index d08fac3532068327a2b9ccccd4e1b33e6d554850..9096b2e058b2ce8b04e4059aa6ef88184c6f516b 100644 (file)
--- a/src/queryeditor.c
+++ b/src/queryeditor.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2016 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2011-2020 Andrea Zagli <azagli@libero.it>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -189,8 +189,6 @@ static void gdaex_query_editor_on_txt1_btn_browse_clicked (gpointer instance, gp
 static void gdaex_query_editor_on_txt2_btn_browse_clicked (gpointer instance, gpointer user_data);
 
 
-#define GDAEX_QUERY_EDITOR_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_GDAEX_QUERY_EDITOR, GdaExQueryEditorPrivate))
-
 typedef struct _GdaExQueryEditorPrivate GdaExQueryEditorPrivate;
 struct _GdaExQueryEditorPrivate
        {
@@ -255,7 +253,7 @@ struct _GdaExQueryEditorPrivate
                GtkListStore *lstore_where_type;
        };
 
-G_DEFINE_TYPE (GdaExQueryEditor, gdaex_query_editor, G_TYPE_OBJECT)
+G_DEFINE_TYPE_WITH_PRIVATE (GdaExQueryEditor, gdaex_query_editor, G_TYPE_OBJECT)
 
 enum
        {
@@ -311,8 +309,6 @@ gdaex_query_editor_class_init (GdaExQueryEditorClass *klass)
        object_class->dispose = gdaex_query_editor_dispose;
        object_class->finalize = gdaex_query_editor_finalize;
 
-       g_type_class_add_private (object_class, sizeof (GdaExQueryEditorPrivate));
-
        /**
         * GdaExQueryEditor::iwidget-init:
         *
@@ -335,7 +331,7 @@ gdaex_query_editor_class_init (GdaExQueryEditorClass *klass)
 static void
 gdaex_query_editor_init (GdaExQueryEditor *gdaex_query_editor)
 {
-       GdaExQueryEditorPrivate *priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (gdaex_query_editor);
+       GdaExQueryEditorPrivate *priv = gdaex_query_editor_get_instance_private (gdaex_query_editor);
 
 }
 
@@ -353,7 +349,7 @@ gdaex_query_editor_load_modules (GdaExQueryEditor *gdaex_query_editor)
 
        if (g_module_supported ())
                {
-                       priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (gdaex_query_editor);
+                       priv = gdaex_query_editor_get_instance_private (gdaex_query_editor);
 
                        modulesdir = (gchar *)g_getenv ("LIBGDAEX_MODULESDIR");
                        if (modulesdir == NULL)
@@ -454,7 +450,7 @@ GdaExQueryEditor
 
        gdaex_query_editor = GDAEX_QUERY_EDITOR (g_object_new (gdaex_query_editor_get_type (), NULL));
 
-       priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (gdaex_query_editor);
+       priv = gdaex_query_editor_get_instance_private (gdaex_query_editor);
 
        gdaex_query_editor_clean (gdaex_query_editor);
 
@@ -573,7 +569,7 @@ GtkWidget
 
        g_return_val_if_fail (GDAEX_IS_QUERY_EDITOR (gdaex_query_editor), NULL);
 
-       priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (gdaex_query_editor);
+       priv = gdaex_query_editor_get_instance_private (gdaex_query_editor);
 
        if (priv->hpaned_main == NULL)
                {
@@ -594,7 +590,7 @@ gdaex_query_editor_set_show_visible (GdaExQueryEditor *qe, gboolean visibile)
 
        g_return_if_fail (GDAEX_IS_QUERY_EDITOR (qe));
 
-       priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       priv = gdaex_query_editor_get_instance_private (qe);
 
        wpage = gtk_notebook_get_nth_page (GTK_NOTEBOOK (priv->notebook), GDAEX_QE_PAGE_SHOW);
        if (visibile)
@@ -617,7 +613,7 @@ gdaex_query_editor_set_where_visible (GdaExQueryEditor *qe, gboolean visibile)
 
        g_return_if_fail (GDAEX_IS_QUERY_EDITOR (qe));
 
-       priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       priv = gdaex_query_editor_get_instance_private (qe);
 
        wpage = gtk_notebook_get_nth_page (GTK_NOTEBOOK (priv->notebook), GDAEX_QE_PAGE_WHERE);
        if (visibile)
@@ -640,7 +636,7 @@ gdaex_query_editor_set_order_visible (GdaExQueryEditor *qe, gboolean visibile)
 
        g_return_if_fail (GDAEX_IS_QUERY_EDITOR (qe));
 
-       priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       priv = gdaex_query_editor_get_instance_private (qe);
 
        wpage = gtk_notebook_get_nth_page (GTK_NOTEBOOK (priv->notebook), GDAEX_QE_PAGE_ORDER);
        if (visibile)
@@ -663,7 +659,7 @@ gdaex_query_editor_get_show_visible (GdaExQueryEditor *qe)
 
        g_return_val_if_fail (GDAEX_IS_QUERY_EDITOR (qe), FALSE);
 
-       priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       priv = gdaex_query_editor_get_instance_private (qe);
 
        wpage = gtk_notebook_get_nth_page (GTK_NOTEBOOK (priv->notebook), GDAEX_QE_PAGE_SHOW);
        return gtk_widget_get_visible (wpage);
@@ -678,7 +674,7 @@ gdaex_query_editor_get_where_visible (GdaExQueryEditor *qe)
 
        g_return_val_if_fail (GDAEX_IS_QUERY_EDITOR (qe), FALSE);
 
-       priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       priv = gdaex_query_editor_get_instance_private (qe);
 
        wpage = gtk_notebook_get_nth_page (GTK_NOTEBOOK (priv->notebook), GDAEX_QE_PAGE_WHERE);
        return gtk_widget_get_visible (wpage);
@@ -693,7 +689,7 @@ gdaex_query_editor_get_order_visible (GdaExQueryEditor *qe)
 
        g_return_val_if_fail (GDAEX_IS_QUERY_EDITOR (qe), FALSE);
 
-       priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       priv = gdaex_query_editor_get_instance_private (qe);
 
        wpage = gtk_notebook_get_nth_page (GTK_NOTEBOOK (priv->notebook), GDAEX_QE_PAGE_ORDER);
        return gtk_widget_get_visible (wpage);
@@ -721,7 +717,7 @@ gdaex_query_editor_table_add_field (GdaExQueryEditor *qe,
        g_return_val_if_fail (GDAEX_IS_QUERY_EDITOR (qe), FALSE);
        g_return_val_if_fail (table_name != NULL, FALSE);
 
-       priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       priv = gdaex_query_editor_get_instance_private (qe);
 
        table = g_hash_table_lookup (priv->tables, table_name);
        if (table == NULL)
@@ -864,7 +860,7 @@ gdaex_query_editor_add_relation_slist (GdaExQueryEditor *qe,
        g_return_val_if_fail (GDAEX_IS_QUERY_EDITOR (qe), FALSE);
        g_return_val_if_fail (fields_joined != NULL, FALSE);
 
-       priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       priv = gdaex_query_editor_get_instance_private (qe);
 
        create_relation = FALSE;
 
@@ -956,7 +952,7 @@ gdaex_query_editor_add_relation (GdaExQueryEditor *qe,
 
        g_return_val_if_fail (GDAEX_IS_QUERY_EDITOR (qe), FALSE);
 
-       priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       priv = gdaex_query_editor_get_instance_private (qe);
 
        fields_joined = NULL;
        va_start (fields, join_type);
@@ -1156,7 +1152,7 @@ static GdaExQueryEditorIWidget
 
        GdaExQueryEditorIWidget *iwidget;
 
-       priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       priv = gdaex_query_editor_get_instance_private (qe);
 
        iwidget = NULL;
        for (i = 0; i < priv->ar_modules->len; i++)
@@ -1228,7 +1224,7 @@ gdaex_query_editor_load_tables_from_xml (GdaExQueryEditor *qe,
 
        klass = GDAEX_QUERY_EDITOR_GET_CLASS (qe);
 
-       priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       priv = gdaex_query_editor_get_instance_private (qe);
 
        if (clean)
                {
@@ -1690,7 +1686,7 @@ gdaex_query_editor_clean_choices (GdaExQueryEditor *qe)
 
        g_return_if_fail (GDAEX_IS_QUERY_EDITOR (qe));
 
-       priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       priv = gdaex_query_editor_get_instance_private (qe);
 
        gtk_list_store_clear (priv->lstore_show);
        gtk_tree_store_clear (priv->tstore_where);
@@ -1770,7 +1766,7 @@ GdaExQueryEditorRelation
 
        GSList *relations;
 
-       priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       priv = gdaex_query_editor_get_instance_private (qe);
 
        if (priv->relations == NULL)
                {
@@ -1812,7 +1808,7 @@ gdaex_query_editor_add_table_relation_to_gdasqlbuilder (GdaExQueryEditor *qe,
 
        GdaExQueryEditorPrivate *priv;
 
-       priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       priv = gdaex_query_editor_get_instance_private (qe);
 
        /* check if table is part of a relation */
        relation = gdaex_query_editor_get_table_relation (qe, table_name);
@@ -1885,7 +1881,7 @@ gdaex_query_editor_sql_where (GdaExQueryEditor *qe,
 
        GtkTreeIter children;
 
-       priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       priv = gdaex_query_editor_get_instance_private (qe);
 
        id_ret = 0;
 
@@ -2169,7 +2165,7 @@ GdaSqlBuilder
 
        g_return_val_if_fail (GDAEX_IS_QUERY_EDITOR (qe), NULL);
 
-       priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       priv = gdaex_query_editor_get_instance_private (qe);
 
        sqlbuilder = gda_sql_builder_new (GDA_SQL_STATEMENT_SELECT);
 
@@ -2286,7 +2282,7 @@ const gchar
                        return ret;
                }
 
-       priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       priv = gdaex_query_editor_get_instance_private (qe);
 
        error = NULL;
        stmt = gda_sql_builder_get_statement (sqlbuilder, &error);
@@ -2469,7 +2465,7 @@ gdaex_query_editor_xml_where (GdaExQueryEditor *qe,
        xmlNode *xnode;
        GtkTreeIter children;
 
-       priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       priv = gdaex_query_editor_get_instance_private (qe);
 
        do
                {
@@ -2624,7 +2620,7 @@ xmlNode
 
        g_return_val_if_fail (GDAEX_IS_QUERY_EDITOR (qe), NULL);
 
-       priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       priv = gdaex_query_editor_get_instance_private (qe);
 
        ret = xmlNewNode (NULL, "gdaex_query_editor_choices");
 
@@ -2726,7 +2722,7 @@ gdaex_query_editor_load_choices_from_xml (GdaExQueryEditor *qe, xmlNode *root,
 
        g_return_if_fail (xmlStrEqual (root->name, "gdaex_query_editor_choices"));
 
-       priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       priv = gdaex_query_editor_get_instance_private (qe);
 
        if (clean)
                {
@@ -2989,7 +2985,7 @@ gdaex_query_editor_set_property (GObject *object,
                    GParamSpec *pspec)
 {
        GdaExQueryEditor *gdaex_query_editor = (GdaExQueryEditor *)object;
-       GdaExQueryEditorPrivate *priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (gdaex_query_editor);
+       GdaExQueryEditorPrivate *priv = gdaex_query_editor_get_instance_private (gdaex_query_editor);
 
        switch (property_id)
                {
@@ -3006,7 +3002,7 @@ gdaex_query_editor_get_property (GObject *object,
                    GParamSpec *pspec)
 {
        GdaExQueryEditor *gdaex_query_editor = (GdaExQueryEditor *)object;
-       GdaExQueryEditorPrivate *priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (gdaex_query_editor);
+       GdaExQueryEditorPrivate *priv = gdaex_query_editor_get_instance_private (gdaex_query_editor);
 
        switch (property_id)
                {
@@ -3020,7 +3016,7 @@ static void
 gdaex_query_editor_dispose (GObject *object)
 {
        GdaExQueryEditor *gdaex_query_editor = (GdaExQueryEditor *)object;
-       GdaExQueryEditorPrivate *priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (gdaex_query_editor);
+       GdaExQueryEditorPrivate *priv = gdaex_query_editor_get_instance_private (gdaex_query_editor);
 
        gtk_tree_store_clear (priv->tstore_fields);
        gtk_list_store_clear (priv->lstore_show);
@@ -3046,7 +3042,7 @@ static void
 gdaex_query_editor_finalize (GObject *object)
 {
        GdaExQueryEditor *gdaex_query_editor = (GdaExQueryEditor *)object;
-       GdaExQueryEditorPrivate *priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (gdaex_query_editor);
+       GdaExQueryEditorPrivate *priv = gdaex_query_editor_get_instance_private (gdaex_query_editor);
 
        gtk_widget_destroy (priv->hpaned_main);
 
@@ -3056,7 +3052,7 @@ gdaex_query_editor_finalize (GObject *object)
 static void
 gdaex_query_editor_clean (GdaExQueryEditor *gdaex_query_editor)
 {
-       GdaExQueryEditorPrivate *priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (gdaex_query_editor);
+       GdaExQueryEditorPrivate *priv = gdaex_query_editor_get_instance_private (gdaex_query_editor);
 
        if (priv->tables != NULL)
                {
@@ -3085,7 +3081,7 @@ _gdaex_query_editor_add_table (GdaExQueryEditor *qe,
        g_return_val_if_fail (GDAEX_IS_QUERY_EDITOR (qe), FALSE);
        g_return_val_if_fail (table_name != NULL, FALSE);
 
-       priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       priv = gdaex_query_editor_get_instance_private (qe);
 
        table = g_new0 (GdaExQueryEditorTable, 1);
 
@@ -3135,7 +3131,7 @@ gdaex_query_editor_refresh_gui (GdaExQueryEditor *qe)
 
        g_return_if_fail (GDAEX_IS_QUERY_EDITOR (qe));
 
-       priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       priv = gdaex_query_editor_get_instance_private (qe);
 
        gtk_tree_store_clear (priv->tstore_fields);
 
@@ -3177,7 +3173,7 @@ gdaex_query_editor_refresh_gui_add_fields (GdaExQueryEditor *qe,
        gpointer key, value;
        GdaExQueryEditorField *field;
 
-       priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       priv = gdaex_query_editor_get_instance_private (qe);
 
        g_hash_table_iter_init (&hiter, table->fields);
        while (g_hash_table_iter_next (&hiter, &key, &value))
@@ -3220,7 +3216,7 @@ gdaex_query_editor_refill_always_show (GdaExQueryEditor *qe)
        GdaExQueryEditorTable *table;
        GdaExQueryEditorField *field;
 
-       priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       priv = gdaex_query_editor_get_instance_private (qe);
 
        if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (priv->tstore_fields), &iter_table))
                {
@@ -3260,7 +3256,7 @@ gdaex_query_editor_refill_always_order (GdaExQueryEditor *qe)
        GdaExQueryEditorTable *table;
        GdaExQueryEditorField *field;
 
-       priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       priv = gdaex_query_editor_get_instance_private (qe);
 
        if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (priv->tstore_fields), &iter_table))
                {
@@ -3300,7 +3296,7 @@ gdaex_query_editor_store_remove_iter (GdaExQueryEditor *qe,
 
        g_return_if_fail (GTK_IS_LIST_STORE (store) || GTK_IS_TREE_STORE (store));
 
-       priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       priv = gdaex_query_editor_get_instance_private (qe);
 
        if (gtk_tree_selection_get_selected (sel, NULL, &iter))
                {
@@ -3354,7 +3350,7 @@ gdaex_query_editor_store_move_iter_up_down (GdaExQueryEditor *qe,
 
        g_return_if_fail (GTK_IS_LIST_STORE (store) || GTK_IS_TREE_STORE (store));
 
-       priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       priv = gdaex_query_editor_get_instance_private (qe);
 
        if (gtk_tree_selection_get_selected (sel, NULL, &iter))
                {
@@ -3465,7 +3461,7 @@ gdaex_query_editor_model_has_value (GtkTreeModel *model,
 static void
 gdaex_query_editor_remove_child_from_vbx_values (GdaExQueryEditor *qe)
 {
-       GdaExQueryEditorPrivate *priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       GdaExQueryEditorPrivate *priv = gdaex_query_editor_get_instance_private (qe);
 
        GList *children;
 
@@ -3580,7 +3576,7 @@ gdaex_query_editor_on_sel_fields_changed (GtkTreeSelection *treeselection,
        GValue *v_table_field;
 
        GdaExQueryEditor *qe = (GdaExQueryEditor *)user_data;
-       GdaExQueryEditorPrivate *priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       GdaExQueryEditorPrivate *priv = gdaex_query_editor_get_instance_private (qe);
 
        gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (priv->gtkbuilder, "button3")), FALSE);
        gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (priv->gtkbuilder, "button7")), FALSE);
@@ -3647,7 +3643,7 @@ gdaex_query_editor_on_trv_fields_row_activated (GtkTreeView *tree_view,
        guint page;
 
        qe = (GdaExQueryEditor *)user_data;
-       priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       priv = gdaex_query_editor_get_instance_private (qe);
 
        if (!gtk_tree_selection_get_selected (priv->sel_fields, NULL, &iter))
                {
@@ -3691,7 +3687,7 @@ gdaex_query_editor_on_cb_where_type_changed (GtkComboBox *widget,
        guint where_type;
 
        qe = (GdaExQueryEditor *)user_data;
-       priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       priv = gdaex_query_editor_get_instance_private (qe);
 
        if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (priv->cb_where_type), &iter))
                {
@@ -3732,7 +3728,7 @@ gdaex_query_editor_on_btn_cancel_clicked (GtkButton *button,
        GdaExQueryEditorPrivate *priv;
 
        qe = (GdaExQueryEditor *)user_data;
-       priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       priv = gdaex_query_editor_get_instance_private (qe);
 
        gdaex_query_editor_remove_child_from_vbx_values (qe);
        gtk_widget_hide (priv->vbx_values_container);
@@ -3770,7 +3766,7 @@ gdaex_query_editor_on_btn_save_clicked (GtkButton *button,
        gchar *asc_desc_visible;
 
        qe = (GdaExQueryEditor *)user_data;
-       priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       priv = gdaex_query_editor_get_instance_private (qe);
 
        val1 = NULL;
        val2 = NULL;
@@ -4005,7 +4001,7 @@ gdaex_query_editor_on_notebook_switch_page (GtkNotebook *notebook,
 {
        GdaExQueryEditorPrivate *priv;
 
-       priv = GDAEX_QUERY_EDITOR_GET_PRIVATE ((GdaExQueryEditor *)user_data);
+       priv = gdaex_query_editor_get_instance_private ((GdaExQueryEditor *)user_data);
 
        if (page_num != GDAEX_QE_PAGE_SHOW)
                {
@@ -4033,7 +4029,7 @@ gdaex_query_editor_show_add_iter (GdaExQueryEditor *qe, GtkTreeIter *iter)
 
        GtkWidget *wpage;
 
-       priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       priv = gdaex_query_editor_get_instance_private (qe);
 
        gtk_tree_model_get (GTK_TREE_MODEL (priv->tstore_fields), iter,
                            COL_FIELDS_TABLE_NAME, &table_name,
@@ -4072,7 +4068,7 @@ gdaex_query_editor_order_add_iter (GdaExQueryEditor *qe, GtkTreeIter *iter)
 
        GtkWidget *wpage;
 
-       priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       priv = gdaex_query_editor_get_instance_private (qe);
 
        gtk_tree_model_get (GTK_TREE_MODEL (priv->tstore_fields), iter,
                                                COL_FIELDS_TABLE_NAME, &table_name,
@@ -4112,7 +4108,7 @@ gdaex_query_editor_on_btn_show_add_clicked (GtkButton *button,
        GtkWidget *dialog;
 
        qe = (GdaExQueryEditor *)user_data;
-       priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       priv = gdaex_query_editor_get_instance_private (qe);
 
        if (gtk_tree_selection_get_selected (priv->sel_fields, NULL, &iter))
                {
@@ -4136,7 +4132,7 @@ gdaex_query_editor_on_btn_show_remove_clicked (GtkButton *button,
                                     gpointer user_data)
 {
        GdaExQueryEditor *qe = (GdaExQueryEditor *)user_data;
-       GdaExQueryEditorPrivate *priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       GdaExQueryEditorPrivate *priv = gdaex_query_editor_get_instance_private (qe);
 
        gdaex_query_editor_store_remove_iter (qe,
                                              priv->sel_show,
@@ -4148,7 +4144,7 @@ gdaex_query_editor_on_btn_show_up_clicked (GtkButton *button,
                                     gpointer user_data)
 {
        GdaExQueryEditor *qe = (GdaExQueryEditor *)user_data;
-       GdaExQueryEditorPrivate *priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       GdaExQueryEditorPrivate *priv = gdaex_query_editor_get_instance_private (qe);
 
        gdaex_query_editor_store_move_iter_up_down (qe,
                                              priv->sel_show,
@@ -4161,7 +4157,7 @@ gdaex_query_editor_on_btn_show_down_clicked (GtkButton *button,
                                     gpointer user_data)
 {
        GdaExQueryEditor *qe = (GdaExQueryEditor *)user_data;
-       GdaExQueryEditorPrivate *priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       GdaExQueryEditorPrivate *priv = gdaex_query_editor_get_instance_private (qe);
 
        gdaex_query_editor_store_move_iter_up_down (qe,
                                              priv->sel_show,
@@ -4174,7 +4170,7 @@ gdaex_query_editor_on_btn_show_clean_clicked (GtkButton *button,
                                     gpointer user_data)
 {
        GdaExQueryEditor *qe = (GdaExQueryEditor *)user_data;
-       GdaExQueryEditorPrivate *priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       GdaExQueryEditorPrivate *priv = gdaex_query_editor_get_instance_private (qe);
 
        gtk_list_store_clear (priv->lstore_show);
        gdaex_query_editor_refill_always_show (qe);
@@ -4196,7 +4192,7 @@ gdaex_query_editor_on_sel_show_changed (GtkTreeSelection *treeselection,
        GtkWidget *lbl;
 
        GdaExQueryEditor *qe = (GdaExQueryEditor *)user_data;
-       GdaExQueryEditorPrivate *priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       GdaExQueryEditorPrivate *priv = gdaex_query_editor_get_instance_private (qe);
 
        gtk_widget_hide (priv->vbx_values_container);
        gdaex_query_editor_remove_child_from_vbx_values (qe);
@@ -4286,7 +4282,7 @@ gdaex_query_editor_on_btn_where_add_clicked (GtkButton *button,
        GtkWidget *wpage;
 
        qe = (GdaExQueryEditor *)user_data;
-       priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       priv = gdaex_query_editor_get_instance_private (qe);
 
        if (gtk_tree_selection_get_selected (priv->sel_fields, NULL, &iter))
                {
@@ -4375,7 +4371,7 @@ gdaex_query_editor_on_btn_where_add_group_clicked (GtkButton *button,
        gchar *group;
 
        qe = (GdaExQueryEditor *)user_data;
-       priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       priv = gdaex_query_editor_get_instance_private (qe);
 
        if (gtk_tree_selection_get_selected (priv->sel_where, NULL, &iter_parent))
                {
@@ -4419,7 +4415,7 @@ gdaex_query_editor_on_btn_where_remove_clicked (GtkButton *button,
        GdaExQueryEditorPrivate *priv;
 
        qe = (GdaExQueryEditor *)user_data;
-       priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       priv = gdaex_query_editor_get_instance_private (qe);
 
        gdaex_query_editor_store_remove_iter (qe,
                                              priv->sel_where,
@@ -4434,7 +4430,7 @@ gdaex_query_editor_on_btn_where_up_clicked (GtkButton *button,
        GdaExQueryEditorPrivate *priv;
 
        qe = (GdaExQueryEditor *)user_data;
-       priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       priv = gdaex_query_editor_get_instance_private (qe);
 
        gdaex_query_editor_store_move_iter_up_down (qe,
                                              priv->sel_where,
@@ -4450,7 +4446,7 @@ gdaex_query_editor_on_btn_where_down_clicked (GtkButton *button,
        GdaExQueryEditorPrivate *priv;
 
        qe = (GdaExQueryEditor *)user_data;
-       priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       priv = gdaex_query_editor_get_instance_private (qe);
 
        gdaex_query_editor_store_move_iter_up_down (qe,
                                              priv->sel_where,
@@ -4463,7 +4459,7 @@ gdaex_query_editor_on_btn_where_clean_clicked (GtkButton *button,
                                     gpointer user_data)
 {
        GdaExQueryEditor *qe = (GdaExQueryEditor *)user_data;
-       GdaExQueryEditorPrivate *priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       GdaExQueryEditorPrivate *priv = gdaex_query_editor_get_instance_private (qe);
 
        gtk_tree_store_clear (priv->tstore_where);
 
@@ -4500,7 +4496,7 @@ gdaex_query_editor_on_sel_where_changed (GtkTreeSelection *treeselection,
        GtkCellRenderer *renderer;
 
        GdaExQueryEditor *qe = (GdaExQueryEditor *)user_data;
-       GdaExQueryEditorPrivate *priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       GdaExQueryEditorPrivate *priv = gdaex_query_editor_get_instance_private (qe);
 
        gtk_widget_hide (priv->vbx_values_container);
        gdaex_query_editor_remove_child_from_vbx_values (qe);
@@ -4895,7 +4891,7 @@ gdaex_query_editor_on_btn_order_add_clicked (GtkButton *button,
        GtkWidget *dialog;
 
        qe = (GdaExQueryEditor *)user_data;
-       priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       priv = gdaex_query_editor_get_instance_private (qe);
 
        if (gtk_tree_selection_get_selected (priv->sel_fields, NULL, &iter))
                {
@@ -4919,7 +4915,7 @@ gdaex_query_editor_on_btn_order_remove_clicked (GtkButton *button,
                                     gpointer user_data)
 {
        GdaExQueryEditor *qe = (GdaExQueryEditor *)user_data;
-       GdaExQueryEditorPrivate *priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       GdaExQueryEditorPrivate *priv = gdaex_query_editor_get_instance_private (qe);
 
        gdaex_query_editor_store_remove_iter (qe,
                                              priv->sel_order,
@@ -4931,7 +4927,7 @@ gdaex_query_editor_on_btn_order_up_clicked (GtkButton *button,
                                     gpointer user_data)
 {
        GdaExQueryEditor *qe = (GdaExQueryEditor *)user_data;
-       GdaExQueryEditorPrivate *priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       GdaExQueryEditorPrivate *priv = gdaex_query_editor_get_instance_private (qe);
 
        gdaex_query_editor_store_move_iter_up_down (qe,
                                              priv->sel_order,
@@ -4944,7 +4940,7 @@ gdaex_query_editor_on_btn_order_down_clicked (GtkButton *button,
                                     gpointer user_data)
 {
        GdaExQueryEditor *qe = (GdaExQueryEditor *)user_data;
-       GdaExQueryEditorPrivate *priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       GdaExQueryEditorPrivate *priv = gdaex_query_editor_get_instance_private (qe);
 
        gdaex_query_editor_store_move_iter_up_down (qe,
                                              priv->sel_order,
@@ -4957,7 +4953,7 @@ gdaex_query_editor_on_btn_order_clean_clicked (GtkButton *button,
                                     gpointer user_data)
 {
        GdaExQueryEditor *qe = (GdaExQueryEditor *)user_data;
-       GdaExQueryEditorPrivate *priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       GdaExQueryEditorPrivate *priv = gdaex_query_editor_get_instance_private (qe);
 
        gtk_list_store_clear (priv->lstore_order);
        gdaex_query_editor_refill_always_order (qe);
@@ -4982,7 +4978,7 @@ gdaex_query_editor_on_sel_order_changed (GtkTreeSelection *treeselection,
        GdaExQueryEditorField *field;
 
        GdaExQueryEditor *qe = (GdaExQueryEditor *)user_data;
-       GdaExQueryEditorPrivate *priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
+       GdaExQueryEditorPrivate *priv = gdaex_query_editor_get_instance_private (qe);
 
        gtk_widget_hide (priv->vbx_values_container);
        gdaex_query_editor_remove_child_from_vbx_values (qe);

diff --git a/src/queryeditorcheck.c b/src/queryeditorcheck.c
index dd99f01907926bf1d7fb715fa8965e4b29122fa2..be80f1a9e318e567dea97d4b422cdeb7d7d54b12 100644 (file)
--- a/src/queryeditorcheck.c
+++ b/src/queryeditorcheck.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2016-2020 Andrea Zagli <azagli@libero.it>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -48,25 +48,23 @@ static const gchar *gdaex_query_editor_check_get_value_visible (GdaExQueryEditor
 static const gchar *gdaex_query_editor_check_get_value_sql (GdaExQueryEditorIWidget *iwidget);
 static void gdaex_query_editor_check_set_value (GdaExQueryEditorIWidget *iwidget, const gchar *value);
 
-#define GDAEX_QUERY_EDITOR_CHECK_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_CHECK_BUTTON, GdaExQueryEditorCheckPrivate))
-
 typedef struct _GdaExQueryEditorCheckPrivate GdaExQueryEditorCheckPrivate;
 struct _GdaExQueryEditorCheckPrivate
        {
                gpointer foo;
        };
 
-G_DEFINE_TYPE_WITH_CODE (GdaExQueryEditorCheck, gdaex_query_editor_check, GTK_TYPE_CHECK_BUTTON,
-                         G_IMPLEMENT_INTERFACE (GDAEX_QUERY_EDITOR_TYPE_IWIDGET,
-                                                gdaex_query_editor_check_gdaex_query_editor_iwidget_interface_init));
+G_DEFINE_TYPE_EXTENDED (GdaExQueryEditorCheck, gdaex_query_editor_check, GTK_TYPE_CHECK_BUTTON,
+                        0,
+                        G_ADD_PRIVATE (GdaExQueryEditorCheck)
+                        G_IMPLEMENT_INTERFACE (GDAEX_QUERY_EDITOR_TYPE_IWIDGET,
+                                               gdaex_query_editor_check_gdaex_query_editor_iwidget_interface_init));
 
 static void
 gdaex_query_editor_check_class_init (GdaExQueryEditorCheckClass *klass)
 {
        GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-       g_type_class_add_private (object_class, sizeof (GdaExQueryEditorCheckPrivate));
-
        object_class->set_property = gdaex_query_editor_check_set_property;
        object_class->get_property = gdaex_query_editor_check_get_property;
 }
@@ -74,7 +72,7 @@ gdaex_query_editor_check_class_init (GdaExQueryEditorCheckClass *klass)
 static void
 gdaex_query_editor_check_init (GdaExQueryEditorCheck *check)
 {
-       GdaExQueryEditorCheckPrivate *priv = GDAEX_QUERY_EDITOR_CHECK_GET_PRIVATE (check);
+       GdaExQueryEditorCheckPrivate *priv = gdaex_query_editor_check_get_instance_private (check);
 }
 
 static void
@@ -103,7 +101,7 @@ static void
 gdaex_query_editor_check_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
 {
        GdaExQueryEditorCheck *check = GDAEX_QUERY_EDITOR_CHECK (object);
-       GdaExQueryEditorCheckPrivate *priv = GDAEX_QUERY_EDITOR_CHECK_GET_PRIVATE (check);
+       GdaExQueryEditorCheckPrivate *priv = gdaex_query_editor_check_get_instance_private (check);
 
        switch (property_id)
                {
@@ -117,7 +115,7 @@ static void
 gdaex_query_editor_check_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
        GdaExQueryEditorCheck *check = GDAEX_QUERY_EDITOR_CHECK (object);
-       GdaExQueryEditorCheckPrivate *priv = GDAEX_QUERY_EDITOR_CHECK_GET_PRIVATE (check);
+       GdaExQueryEditorCheckPrivate *priv = gdaex_query_editor_check_get_instance_private (check);
 
        switch (property_id)
                {

diff --git a/src/queryeditorentry.c b/src/queryeditorentry.c
index 3430c7a43ca78f4a72c4ba11222ddb6d7789a5a4..2ce61291838086b36658a007909409c95d2d72bd 100644 (file)
--- a/src/queryeditorentry.c
+++ b/src/queryeditorentry.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2016 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2011-2020 Andrea Zagli <azagli@libero.it>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -44,25 +44,23 @@ static const gchar *gdaex_query_editor_entry_get_value_visible (GdaExQueryEditor
 static const gchar *gdaex_query_editor_entry_get_value_sql (GdaExQueryEditorIWidget *iwidget);
 static void gdaex_query_editor_entry_set_value (GdaExQueryEditorIWidget *iwidget, const gchar *value);
 
-#define GDAEX_QUERY_EDITOR_ENTRY_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_ENTRY, GdaExQueryEditorEntryPrivate))
-
 typedef struct _GdaExQueryEditorEntryPrivate GdaExQueryEditorEntryPrivate;
 struct _GdaExQueryEditorEntryPrivate
        {
                gpointer foo;
        };
 
-G_DEFINE_TYPE_WITH_CODE (GdaExQueryEditorEntry, gdaex_query_editor_entry, GTK_TYPE_ENTRY,
-                         G_IMPLEMENT_INTERFACE (GDAEX_QUERY_EDITOR_TYPE_IWIDGET,
-                                                gdaex_query_editor_entry_gdaex_query_editor_iwidget_interface_init));
+G_DEFINE_TYPE_EXTENDED (GdaExQueryEditorEntry, gdaex_query_editor_entry, GTK_TYPE_ENTRY,
+                        0,
+                        G_ADD_PRIVATE (GdaExQueryEditorEntry)
+                        G_IMPLEMENT_INTERFACE (GDAEX_QUERY_EDITOR_TYPE_IWIDGET,
+                                               gdaex_query_editor_entry_gdaex_query_editor_iwidget_interface_init));
 
 static void
 gdaex_query_editor_entry_class_init (GdaExQueryEditorEntryClass *klass)
 {
        GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-       g_type_class_add_private (object_class, sizeof (GdaExQueryEditorEntryPrivate));
-
        object_class->set_property = gdaex_query_editor_entry_set_property;
        object_class->get_property = gdaex_query_editor_entry_get_property;
 }
@@ -70,7 +68,7 @@ gdaex_query_editor_entry_class_init (GdaExQueryEditorEntryClass *klass)
 static void
 gdaex_query_editor_entry_init (GdaExQueryEditorEntry *entry)
 {
-       GdaExQueryEditorEntryPrivate *priv = GDAEX_QUERY_EDITOR_ENTRY_GET_PRIVATE (entry);
+       GdaExQueryEditorEntryPrivate *priv = gdaex_query_editor_entry_get_instance_private (entry);
 }
 
 static void
@@ -99,7 +97,7 @@ static void
 gdaex_query_editor_entry_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
 {
        GdaExQueryEditorEntry *entry = GDAEX_QUERY_EDITOR_ENTRY (object);
-       GdaExQueryEditorEntryPrivate *priv = GDAEX_QUERY_EDITOR_ENTRY_GET_PRIVATE (entry);
+       GdaExQueryEditorEntryPrivate *priv = gdaex_query_editor_entry_get_instance_private (entry);
 
        switch (property_id)
                {
@@ -113,7 +111,7 @@ static void
 gdaex_query_editor_entry_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
        GdaExQueryEditorEntry *entry = GDAEX_QUERY_EDITOR_ENTRY (object);
-       GdaExQueryEditorEntryPrivate *priv = GDAEX_QUERY_EDITOR_ENTRY_GET_PRIVATE (entry);
+       GdaExQueryEditorEntryPrivate *priv = gdaex_query_editor_entry_get_instance_private (entry);
 
        switch (property_id)
                {

diff --git a/src/queryeditorentrydate.c b/src/queryeditorentrydate.c
index f62f9e4af3637157bf1fc1a4f383350a68a8108d..36f5483f329dfb3dd59691c01ebdb88f3014f948 100644 (file)
--- a/src/queryeditorentrydate.c
+++ b/src/queryeditorentrydate.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2016-2020 Andrea Zagli <azagli@libero.it>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -46,25 +46,23 @@ static const gchar *gdaex_query_editor_entry_date_get_value_visible (GdaExQueryE
 static const gchar *gdaex_query_editor_entry_date_get_value_sql (GdaExQueryEditorIWidget *iwidget);
 static void gdaex_query_editor_entry_date_set_value (GdaExQueryEditorIWidget *iwidget, const gchar *value);
 
-#define GDAEX_QUERY_EDITOR_ENTRY_DATE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDAEX_QUERY_EDITOR_TYPE_ENTRY_DATE, GdaExQueryEditorEntryDatePrivate))
-
 typedef struct _GdaExQueryEditorEntryDatePrivate GdaExQueryEditorEntryDatePrivate;
 struct _GdaExQueryEditorEntryDatePrivate
        {
                gchar *format;
        };
 
-G_DEFINE_TYPE_WITH_CODE (GdaExQueryEditorEntryDate, gdaex_query_editor_entry_date, GTK_TYPE_ENTRY,
-                         G_IMPLEMENT_INTERFACE (GDAEX_QUERY_EDITOR_TYPE_IWIDGET,
-                                                gdaex_query_editor_entry_date_gdaex_query_editor_iwidget_interface_init));
+G_DEFINE_TYPE_EXTENDED (GdaExQueryEditorEntryDate, gdaex_query_editor_entry_date, GTK_TYPE_ENTRY,
+                        0,
+                        G_ADD_PRIVATE (GdaExQueryEditorEntryDate)
+                        G_IMPLEMENT_INTERFACE (GDAEX_QUERY_EDITOR_TYPE_IWIDGET,
+                                               gdaex_query_editor_entry_date_gdaex_query_editor_iwidget_interface_init));
 
 static void
 gdaex_query_editor_entry_date_class_init (GdaExQueryEditorEntryDateClass *klass)
 {
        GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-       g_type_class_add_private (object_class, sizeof (GdaExQueryEditorEntryDatePrivate));
-
        object_class->set_property = gdaex_query_editor_entry_date_set_property;
        object_class->get_property = gdaex_query_editor_entry_date_get_property;
 }
@@ -72,7 +70,7 @@ gdaex_query_editor_entry_date_class_init (GdaExQueryEditorEntryDateClass *klass)
 static void
 gdaex_query_editor_entry_date_init (GdaExQueryEditorEntryDate *entry)
 {
-       GdaExQueryEditorEntryDatePrivate *priv = GDAEX_QUERY_EDITOR_ENTRY_DATE_GET_PRIVATE (entry);
+       GdaExQueryEditorEntryDatePrivate *priv = gdaex_query_editor_entry_date_get_instance_private (entry);
 
        priv->format = NULL;
 }
@@ -102,7 +100,7 @@ gdaex_query_editor_entry_date_new ()
 void
 gdaex_query_editor_entry_date_set_format (GdaExQueryEditorEntryDate *entry, const gchar *format)
 {
-       GdaExQueryEditorEntryDatePrivate *priv = GDAEX_QUERY_EDITOR_ENTRY_DATE_GET_PRIVATE (entry);
+       GdaExQueryEditorEntryDatePrivate *priv = gdaex_query_editor_entry_date_get_instance_private (entry);
 
        if (priv->format != NULL)
                {
@@ -113,7 +111,7 @@ gdaex_query_editor_entry_date_set_format (GdaExQueryEditorEntryDate *entry, cons
 gchar
 *gdaex_query_editor_entry_date_get_format (GdaExQueryEditorEntryDate* entry)
 {
-       GdaExQueryEditorEntryDatePrivate *priv = GDAEX_QUERY_EDITOR_ENTRY_DATE_GET_PRIVATE (entry);
+       GdaExQueryEditorEntryDatePrivate *priv = gdaex_query_editor_entry_date_get_instance_private (entry);
 
        return g_strdup (priv->format);
 }
@@ -122,7 +120,7 @@ static void
 gdaex_query_editor_entry_date_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
 {
        GdaExQueryEditorEntryDate *entry = GDAEX_QUERY_EDITOR_ENTRY_DATE (object);
-       GdaExQueryEditorEntryDatePrivate *priv = GDAEX_QUERY_EDITOR_ENTRY_DATE_GET_PRIVATE (entry);
+       GdaExQueryEditorEntryDatePrivate *priv = gdaex_query_editor_entry_date_get_instance_private (entry);
 
        switch (property_id)
                {
@@ -136,7 +134,7 @@ static void
 gdaex_query_editor_entry_date_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
        GdaExQueryEditorEntryDate *entry = GDAEX_QUERY_EDITOR_ENTRY_DATE (object);
-       GdaExQueryEditorEntryDatePrivate *priv = GDAEX_QUERY_EDITOR_ENTRY_DATE_GET_PRIVATE (entry);
+       GdaExQueryEditorEntryDatePrivate *priv = gdaex_query_editor_entry_date_get_instance_private (entry);
 
        switch (property_id)
                {
@@ -164,7 +162,7 @@ static const gchar
        gchar *ret;
        GDateTime *gdt;
 
-       GdaExQueryEditorEntryDatePrivate *priv = GDAEX_QUERY_EDITOR_ENTRY_DATE_GET_PRIVATE (GDAEX_QUERY_EDITOR_ENTRY_DATE (iwidget));
+       GdaExQueryEditorEntryDatePrivate *priv = gdaex_query_editor_entry_date_get_instance_private (GDAEX_QUERY_EDITOR_ENTRY_DATE (iwidget));
 
        gdt = zak_utils_get_gdatetime_from_string (gtk_entry_get_text (GTK_ENTRY (iwidget)), priv->format);
        ret = g_strdup (zak_utils_gdatetime_to_sql (gdt, NULL));

diff --git a/src/sqlbuilder.c b/src/sqlbuilder.c
index e478638f5ec37bd198b4cd0150f8d89875abdad7..ebde3e51cb6ade63934f38f16806b5fbf76a956f 100644 (file)
--- a/src/sqlbuilder.c
+++ b/src/sqlbuilder.c
@@ -1,7 +1,7 @@
 /*
  *  sql_builder.c
  *
- *  Copyright (C) 2010-2019 Andrea Zagli <azagli@libero.it>
+ *  Copyright (C) 2010-2020 Andrea Zagli <azagli@libero.it>
  *
  *  This file is part of libgdaex.
  *
@@ -44,8 +44,6 @@ static void gdaex_sql_builder_get_property (GObject *object,
                                GParamSpec *pspec);
 
 
-#define GDAEX_SQLBUILDER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDAEX_TYPE_SQLBUILDER, GdaExSqlBuilderPrivate))
-
 typedef struct _GdaExSqlBuilderField GdaExSqlBuilderField;
 struct _GdaExSqlBuilderField
 {
@@ -72,15 +70,13 @@ struct _GdaExSqlBuilderPrivate
        GdaSqlBuilderId id_where;
 };
 
-G_DEFINE_TYPE (GdaExSqlBuilder, gdaex_sql_builder, G_TYPE_OBJECT)
+G_DEFINE_TYPE_WITH_PRIVATE (GdaExSqlBuilder, gdaex_sql_builder, G_TYPE_OBJECT)
 
 static void
 gdaex_sql_builder_class_init (GdaExSqlBuilderClass *klass)
 {
        GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-       g_type_class_add_private (object_class, sizeof (GdaExSqlBuilderPrivate));
-
        object_class->set_property = gdaex_sql_builder_set_property;
        object_class->get_property = gdaex_sql_builder_get_property;
 }
@@ -88,7 +84,7 @@ gdaex_sql_builder_class_init (GdaExSqlBuilderClass *klass)
 static void
 gdaex_sql_builder_init (GdaExSqlBuilder *gdaex_sql_builder)
 {
-       GdaExSqlBuilderPrivate *priv = GDAEX_SQLBUILDER_GET_PRIVATE (gdaex_sql_builder);
+       GdaExSqlBuilderPrivate *priv = gdaex_sql_builder_get_instance_private (gdaex_sql_builder);
 
 }
 
@@ -103,7 +99,7 @@ GdaExSqlBuilder
 {
        GdaExSqlBuilder *gdaex_sql_builder = GDAEX_SQLBUILDER (g_object_new (gdaex_sql_builder_get_type (), NULL));
 
-       GdaExSqlBuilderPrivate *priv = GDAEX_SQLBUILDER_GET_PRIVATE (gdaex_sql_builder);
+       GdaExSqlBuilderPrivate *priv = gdaex_sql_builder_get_instance_private (gdaex_sql_builder);
 
        priv->stmt_type = stmt_type;
        priv->sqlb = gda_sql_builder_new (priv->stmt_type);
@@ -116,7 +112,7 @@ GdaExSqlBuilder
 static GdaExSqlBuilderField
 *gdaex_sql_builder_get_field (GdaExSqlBuilder *sqlb, GdaExSqlBuilderTable *table, const gchar *field_name, const gchar *field_alias, GValue *gval, gboolean add)
 {
-       GdaExSqlBuilderPrivate *priv = GDAEX_SQLBUILDER_GET_PRIVATE (sqlb);
+       GdaExSqlBuilderPrivate *priv = gdaex_sql_builder_get_instance_private (sqlb);
 
        GdaExSqlBuilderField *f;
 
@@ -154,7 +150,7 @@ static GdaExSqlBuilderField
 static GdaExSqlBuilderTable
 *gdaex_sql_builder_get_table (GdaExSqlBuilder *sqlb, const gchar *table_name, const gchar *table_alias, gboolean add)
 {
-       GdaExSqlBuilderPrivate *priv = GDAEX_SQLBUILDER_GET_PRIVATE (sqlb);
+       GdaExSqlBuilderPrivate *priv = gdaex_sql_builder_get_instance_private (sqlb);
 
        GdaExSqlBuilderTable *t;
 
@@ -219,7 +215,7 @@ gdaex_sql_builder_from_v (GdaExSqlBuilder *sqlb, ...)
        gchar *table_name;
        gchar *table_alias;
 
-       GdaExSqlBuilderPrivate *priv = GDAEX_SQLBUILDER_GET_PRIVATE (sqlb);
+       GdaExSqlBuilderPrivate *priv = gdaex_sql_builder_get_instance_private (sqlb);
 
        va_start (ap, sqlb);
        do
@@ -276,7 +272,7 @@ gdaex_sql_builder_join (GdaExSqlBuilder *sqlb,
        gchar *tmp;
        GdaSqlOperatorType op;
 
-       GdaExSqlBuilderPrivate *priv = GDAEX_SQLBUILDER_GET_PRIVATE (sqlb);
+       GdaExSqlBuilderPrivate *priv = gdaex_sql_builder_get_instance_private (sqlb);
 
        if (priv->stmt_type != GDA_SQL_STATEMENT_SELECT) return;
 
@@ -443,7 +439,7 @@ gdaex_sql_builder_fields (GdaExSqlBuilder *sqlb, ...)
 
        GdaExSqlBuilderTable *t;
 
-       GdaExSqlBuilderPrivate *priv = GDAEX_SQLBUILDER_GET_PRIVATE (sqlb);
+       GdaExSqlBuilderPrivate *priv = gdaex_sql_builder_get_instance_private (sqlb);
 
        va_start (ap, sqlb);
        do
@@ -512,7 +508,7 @@ gdaex_sql_builder_where (GdaExSqlBuilder *sqlb, GdaSqlOperatorType op, ...)
        GdaSqlBuilderId id_expr2;
        GdaSqlBuilderId id_cond;
 
-       GdaExSqlBuilderPrivate *priv = GDAEX_SQLBUILDER_GET_PRIVATE (sqlb);
+       GdaExSqlBuilderPrivate *priv = gdaex_sql_builder_get_instance_private (sqlb);
 
        if (priv->stmt_type == GDA_SQL_STATEMENT_INSERT)
                {
@@ -784,7 +780,7 @@ gdaex_sql_builder_order (GdaExSqlBuilder *sqlb, ...)
        GdaExSqlBuilderTable *t;
        GdaExSqlBuilderField *f;
 
-       GdaExSqlBuilderPrivate *priv = GDAEX_SQLBUILDER_GET_PRIVATE (sqlb);
+       GdaExSqlBuilderPrivate *priv = gdaex_sql_builder_get_instance_private (sqlb);
 
        va_start (ap, sqlb);
        do
@@ -835,7 +831,7 @@ gdaex_sql_builder_order (GdaExSqlBuilder *sqlb, ...)
 GdaSqlBuilder
 *gdaex_sql_builder_get_gda_sql_builder (GdaExSqlBuilder *sqlb)
 {
-       GdaExSqlBuilderPrivate *priv = GDAEX_SQLBUILDER_GET_PRIVATE (sqlb);
+       GdaExSqlBuilderPrivate *priv = gdaex_sql_builder_get_instance_private (sqlb);
 
        return priv->sqlb;
 }
@@ -856,7 +852,7 @@ gchar
        GError *error;
        GdaStatement *stmt;
 
-       GdaExSqlBuilderPrivate *priv = GDAEX_SQLBUILDER_GET_PRIVATE (sqlb);
+       GdaExSqlBuilderPrivate *priv = gdaex_sql_builder_get_instance_private (sqlb);
 
        ret = NULL;
 
@@ -1092,7 +1088,7 @@ static void
 gdaex_sql_builder_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
 {
        GdaExSqlBuilder *gdaex_sql_builder = GDAEX_SQLBUILDER (object);
-       GdaExSqlBuilderPrivate *priv = GDAEX_SQLBUILDER_GET_PRIVATE (gdaex_sql_builder);
+       GdaExSqlBuilderPrivate *priv = gdaex_sql_builder_get_instance_private (gdaex_sql_builder);
 
        switch (property_id)
                {
@@ -1106,7 +1102,7 @@ static void
 gdaex_sql_builder_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
        GdaExSqlBuilder *gdaex_sql_builder = GDAEX_SQLBUILDER (object);
-       GdaExSqlBuilderPrivate *priv = GDAEX_SQLBUILDER_GET_PRIVATE (gdaex_sql_builder);
+       GdaExSqlBuilderPrivate *priv = gdaex_sql_builder_get_instance_private (gdaex_sql_builder);
 
        switch (property_id)
                {