Type cast.

diff --git a/src/form.c b/src/form.c
index aa73cf3765b0f9c5db098abac74597c9a4cbd61a..30d1251541559a6f9c0dd1acf83a17b6b51e58d1 100644 (file)
--- a/src/form.c
+++ b/src/form.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2015-2025 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
@@ -16,6 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "formelementcheck.h"
 #ifdef HAVE_CONFIG_H
        #include <config.h>
 #endif
@@ -38,7 +39,7 @@ static void zak_form_gtk_form_get_property (GObject *object,
 static void zak_form_gtk_form_dispose (GObject *gobject);
 static void zak_form_gtk_form_finalize (GObject *gobject);
 
-static void zak_form_gtk_form_element_added (ZakFormGtkForm *form, ZakFormGtkFormElement *element);
+static void zak_form_gtk_form_element_added (ZakFormForm *form, ZakFormElement *element);
 
 #define ZAK_FORM_GTK_FORM_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ZAK_FORM_GTK_TYPE_FORM, ZakFormGtkFormPrivate))
 
@@ -313,9 +314,9 @@ zak_form_gtk_form_finalize (GObject *gobject)
 }
 
 static void
-zak_form_gtk_form_element_added (ZakFormGtkForm *form, ZakFormGtkFormElement *element)
+zak_form_gtk_form_element_added (ZakFormForm *form, ZakFormElement *element)
 {
        ZakFormGtkFormPrivate *priv = ZAK_FORM_GTK_FORM_GET_PRIVATE (form);
 
-       zak_form_gtk_form_element_set_gtkbuilder (element, priv->builder);
+       zak_form_gtk_form_element_set_gtkbuilder (ZAK_FORM_GTK_FORM_ELEMENT (element), priv->builder);
 }

diff --git a/src/formelement.c b/src/formelement.c
index 71e27bb5326afa32a118863a36a07ab0c439bf52..2a4ec26f7b1705f4c45cd692f648788cb4514d46 100644 (file)
--- a/src/formelement.c
+++ b/src/formelement.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2020 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2015-2025 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,14 +48,14 @@ static void zak_form_gtk_form_element_get_property (GObject *object,
 static void zak_form_gtk_form_element_dispose (GObject *gobject);
 static void zak_form_gtk_form_element_finalize (GObject *gobject);
 
-static gboolean zak_form_gtk_form_element_get_visible (ZakFormGtkFormElement *element);
-static void zak_form_gtk_form_element_set_visible (ZakFormGtkFormElement *element, gboolean visible);
+static gboolean zak_form_gtk_form_element_get_visible (ZakFormElement *element);
+static void zak_form_gtk_form_element_set_visible (ZakFormElement *element, gboolean visible);
 
-static gboolean zak_form_gtk_form_element_get_editable (ZakFormGtkFormElement *element);
-static void zak_form_gtk_form_element_set_editable (ZakFormGtkFormElement *element, gboolean visible);
+static gboolean zak_form_gtk_form_element_get_editable (ZakFormElement *element);
+static void zak_form_gtk_form_element_set_editable (ZakFormElement *element, gboolean visible);
 
 static void zak_form_gtk_form_element_xml_parsing (ZakFormElement *element, xmlNode *xmlnode);
-static void zak_form_gtk_form_element_get_xml (ZakFormGtkFormElement *element, xmlNode *xroot, const gchar *version);
+static void zak_form_gtk_form_element_get_xml (ZakFormElement *element, xmlNode *xroot, const gchar *version);
 
 #define ZAK_FORM_GTK_FORM_ELEMENT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ZAK_FORM_GTK_TYPE_FORM_ELEMENT, ZakFormGtkFormElementPrivate))
 
@@ -425,7 +425,7 @@ zak_form_gtk_form_element_finalize (GObject *gobject)
 }
 
 static gboolean
-zak_form_gtk_form_element_get_visible (ZakFormGtkFormElement *element)
+zak_form_gtk_form_element_get_visible (ZakFormElement *element)
 {
        ZakFormGtkFormElementPrivate *priv = ZAK_FORM_GTK_FORM_ELEMENT_GET_PRIVATE (element);
 
@@ -433,7 +433,7 @@ zak_form_gtk_form_element_get_visible (ZakFormGtkFormElement *element)
 }
 
 static void
-zak_form_gtk_form_element_set_visible (ZakFormGtkFormElement *element, gboolean visible)
+zak_form_gtk_form_element_set_visible (ZakFormElement *element, gboolean visible)
 {
        ZakFormGtkFormElementPrivate *priv = ZAK_FORM_GTK_FORM_ELEMENT_GET_PRIVATE (element);
 
@@ -446,7 +446,7 @@ zak_form_gtk_form_element_set_visible (ZakFormGtkFormElement *element, gboolean
 }
 
 static gboolean
-zak_form_gtk_form_element_get_editable (ZakFormGtkFormElement *element)
+zak_form_gtk_form_element_get_editable (ZakFormElement *element)
 {
        ZakFormGtkFormElementPrivate *priv = ZAK_FORM_GTK_FORM_ELEMENT_GET_PRIVATE (element);
 
@@ -454,7 +454,7 @@ zak_form_gtk_form_element_get_editable (ZakFormGtkFormElement *element)
 }
 
 static void
-zak_form_gtk_form_element_set_editable (ZakFormGtkFormElement *element, gboolean editable)
+zak_form_gtk_form_element_set_editable (ZakFormElement *element, gboolean editable)
 {
        ZakFormGtkFormElementPrivate *priv = ZAK_FORM_GTK_FORM_ELEMENT_GET_PRIVATE (element);
 
@@ -489,22 +489,22 @@ zak_form_gtk_form_element_xml_parsing (ZakFormElement *element, xmlNode *xmlnode
 }
 
 static void
-zak_form_gtk_form_element_get_xml (ZakFormGtkFormElement *element, xmlNode *xroot, const gchar *version)
+zak_form_gtk_form_element_get_xml (ZakFormElement *element, xmlNode *xroot, const gchar *version)
 {
        xmlNode *xnode;
 
        ZakFormGtkFormElementPrivate *priv = ZAK_FORM_GTK_FORM_ELEMENT_GET_PRIVATE ((ZakFormGtkFormElement *)element);
 
        xnode = xmlNewNode (NULL, (const xmlChar *)"widget");
-       xmlNodeSetContent (xnode, (xmlChar *)zak_form_gtk_form_element_get_widget_name (element));
+       xmlNodeSetContent (xnode, (xmlChar *)zak_form_gtk_form_element_get_widget_name (ZAK_FORM_GTK_FORM_ELEMENT(element)));
        xmlAddChild (xroot, xnode);
 
        xnode = xmlNewNode (NULL, (const xmlChar *)"label");
-       xmlNodeSetContent (xnode, (xmlChar *)zak_form_gtk_form_element_get_label_name (element));
+       xmlNodeSetContent (xnode, (xmlChar *)zak_form_gtk_form_element_get_label_name (ZAK_FORM_GTK_FORM_ELEMENT(element)));
        xmlAddChild (xroot, xnode);
 
-       if (ZAK_FORM_GTK_FORM_ELEMENT_GET_CLASS (element)->get_xml!= NULL)
+       if (ZAK_FORM_GTK_FORM_ELEMENT_GET_CLASS (element)->get_xml != NULL)
                {
-                       ZAK_FORM_GTK_FORM_ELEMENT_GET_CLASS (element)->get_xml (element, version, xroot);
+                       ZAK_FORM_GTK_FORM_ELEMENT_GET_CLASS (element)->get_xml (element, xroot, version);
                }
 }

diff --git a/src/formelementcheck.c b/src/formelementcheck.c
index 776d50d55d350575d28c49db91b107ae40857398..51a9f132cc42a23fdbc56c47550475e6a9588320 100644 (file)
--- a/src/formelementcheck.c
+++ b/src/formelementcheck.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2020 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2015-2025 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
@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "formelement.h"
+#include "formelementcombo.h"
 #ifdef HAVE_CONFIG_H
        #include <config.h>
 #endif
@@ -39,10 +41,10 @@ static void zak_form_gtk_form_element_check_get_property (GObject *object,
 static void zak_form_gtk_form_element_check_dispose (GObject *gobject);
 static void zak_form_gtk_form_element_check_finalize (GObject *gobject);
 
-static GValue *zak_form_gtk_form_element_check_get_value (ZakFormGtkFormElementCheck *element);
-static gboolean zak_form_gtk_form_element_check_set_value (ZakFormGtkFormElementCheck *element, GValue *value);
+static GValue *zak_form_gtk_form_element_check_get_value (ZakFormElement *element);
+static gboolean zak_form_gtk_form_element_check_set_value (ZakFormElement *element, GValue *value);
 
-static void zak_form_gtk_form_element_check_get_xml (ZakFormGtkFormElement *element, const gchar *version, xmlNode *xnode);
+static void zak_form_gtk_form_element_check_get_xml (ZakFormElement *element, xmlNode *xnode, const gchar *version);
 
 #define ZAK_FORM_GTK_FORM_ELEMENT_CHECK_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ZAK_FORM_GTK_TYPE_FORM_ELEMENT_CHECK, ZakFormGtkFormElementCheckPrivate))
 
@@ -170,7 +172,7 @@ zak_form_gtk_form_element_check_finalize (GObject *gobject)
 }
 
 static GValue
-*zak_form_gtk_form_element_check_get_value (ZakFormGtkFormElementCheck *element)
+*zak_form_gtk_form_element_check_get_value (ZakFormElement *element)
 {
        GValue *ret;
 
@@ -193,7 +195,7 @@ static GValue
 }
 
 static gboolean
-zak_form_gtk_form_element_check_set_value (ZakFormGtkFormElementCheck *element, GValue *value)
+zak_form_gtk_form_element_check_set_value (ZakFormElement *element, GValue *value)
 {
        GtkWidget *w;
 
@@ -209,7 +211,7 @@ zak_form_gtk_form_element_check_set_value (ZakFormGtkFormElementCheck *element,
 }
 
 static void
-zak_form_gtk_form_element_check_get_xml (ZakFormGtkFormElement *element, const gchar *version, xmlNode *xnode)
+zak_form_gtk_form_element_check_get_xml (ZakFormElement *element, xmlNode *xnode, const gchar *version)
 {
        xmlSetProp (xnode, (const xmlChar *)"type", (const xmlChar *)"zak_form_gtk_form_element_check");
 }

diff --git a/src/formelementcombo.c b/src/formelementcombo.c
index 695b0e5b67c068827bfb03f91b4508bd1d8ae745..bdf95e9dcf446ce131e9f38f4ec24fa2c2023bf7 100644 (file)
--- a/src/formelementcombo.c
+++ b/src/formelementcombo.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2020 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2016-2025 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
@@ -45,10 +45,10 @@ static void zak_form_gtk_form_element_combo_get_property (GObject *object,
 static void zak_form_gtk_form_element_combo_dispose (GObject *gobject);
 static void zak_form_gtk_form_element_combo_finalize (GObject *gobject);
 
-static GValue *zak_form_gtk_form_element_combo_get_value (ZakFormGtkFormElementCombo *element);
-static gboolean zak_form_gtk_form_element_combo_set_value (ZakFormGtkFormElementCombo *element, GValue *value);
+static GValue *zak_form_gtk_form_element_combo_get_value (ZakFormElement *element);
+static gboolean zak_form_gtk_form_element_combo_set_value (ZakFormElement *element, GValue *value);
 
-static void zak_form_gtk_form_element_combo_get_xml (ZakFormGtkFormElement *element, const gchar *version, xmlNode *xnode);
+static void zak_form_gtk_form_element_combo_get_xml (ZakFormElement *element, xmlNode *xnode, const gchar *version);
 
 #define ZAK_FORM_GTK_FORM_ELEMENT_COMBO_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ZAK_FORM_GTK_TYPE_FORM_ELEMENT_COMBO, ZakFormGtkFormElementComboPrivate))
 
@@ -234,7 +234,7 @@ zak_form_gtk_form_element_combo_finalize (GObject *gobject)
 }
 
 static GValue
-*zak_form_gtk_form_element_combo_get_value (ZakFormGtkFormElementCombo *element)
+*zak_form_gtk_form_element_combo_get_value (ZakFormElement *element)
 {
        GValue *ret;
 
@@ -277,7 +277,7 @@ static GValue
 }
 
 static gboolean
-zak_form_gtk_form_element_combo_set_value (ZakFormGtkFormElementCombo *element, GValue *value)
+zak_form_gtk_form_element_combo_set_value (ZakFormElement *element, GValue *value)
 {
        GtkWidget *w;
 
@@ -327,13 +327,13 @@ zak_form_gtk_form_element_combo_set_value (ZakFormGtkFormElementCombo *element,
 }
 
 static void
-zak_form_gtk_form_element_combo_get_xml (ZakFormGtkFormElement *element, const gchar *version, xmlNode *xnode)
+zak_form_gtk_form_element_combo_get_xml (ZakFormElement *element, xmlNode *xnode, const gchar *version)
 {
        xmlNode *xnode_cur;
 
        xmlSetProp (xnode, (const xmlChar *)"type", (const xmlChar *)"zak_form_gtk_form_element_combo");
 
        xnode_cur = xmlNewNode (NULL, (const xmlChar *)"column-field");
-       xmlNodeSetContent (xnode_cur, (xmlChar *)g_strdup_printf ("%d", zak_form_gtk_form_element_combo_get_column_field (element)));
+       xmlNodeSetContent (xnode_cur, (xmlChar *)g_strdup_printf ("%d", zak_form_gtk_form_element_combo_get_column_field (ZAK_FORM_GTK_FORM_ELEMENT_COMBO(element))));
        xmlAddChild (xnode, xnode_cur);
 }

diff --git a/src/formelemententry.c b/src/formelemententry.c
index 7bef22b75e63be0e26878701aab5e52ba2af359e..ffcd6b75db34c2dfc47e7bd981474a22065c872d 100644 (file)
--- a/src/formelemententry.c
+++ b/src/formelemententry.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2020 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2015-2025 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
@@ -39,10 +39,10 @@ static void zak_form_gtk_form_element_entry_get_property (GObject *object,
 static void zak_form_gtk_form_element_entry_dispose (GObject *gobject);
 static void zak_form_gtk_form_element_entry_finalize (GObject *gobject);
 
-static GValue *zak_form_gtk_form_element_entry_get_value (ZakFormGtkFormElementEntry *element);
-static gboolean zak_form_gtk_form_element_entry_set_value (ZakFormGtkFormElementEntry *element, GValue *value);
+static GValue *zak_form_gtk_form_element_entry_get_value (ZakFormElement *element);
+static gboolean zak_form_gtk_form_element_entry_set_value (ZakFormElement *element, GValue *value);
 
-static void zak_form_gtk_form_element_entry_get_xml (ZakFormGtkFormElement *element, const gchar *version, xmlNode *xnode);
+static void zak_form_gtk_form_element_entry_get_xml (ZakFormElement *element, xmlNode *node, const gchar *version);
 
 #define ZAK_FORM_GTK_FORM_ELEMENT_ENTRY_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ZAK_FORM_GTK_TYPE_FORM_ELEMENT_ENTRY, ZakFormGtkFormElementEntryPrivate))
 
@@ -59,7 +59,7 @@ zak_form_gtk_form_element_entry_class_init (ZakFormGtkFormElementEntryClass *kla
 {
        GObjectClass *object_class = G_OBJECT_CLASS (klass);
        ZakFormElementClass *elem_class = ZAK_FORM_ELEMENT_CLASS (klass);
-       ZakFormGtkFormElementClass *gtk_elem_class = ZAK_FORM_ELEMENT_CLASS (klass);
+       ZakFormGtkFormElementClass *gtk_elem_class = ZAK_FORM_GTK_FORM_ELEMENT_CLASS (klass);
 
        object_class->set_property = zak_form_gtk_form_element_entry_set_property;
        object_class->get_property = zak_form_gtk_form_element_entry_get_property;
@@ -170,7 +170,7 @@ zak_form_gtk_form_element_entry_finalize (GObject *gobject)
 }
 
 static GValue
-*zak_form_gtk_form_element_entry_get_value (ZakFormGtkFormElementEntry *element)
+*zak_form_gtk_form_element_entry_get_value (ZakFormElement *element)
 {
        GValue *ret;
 
@@ -184,7 +184,7 @@ static GValue
 }
 
 static gboolean
-zak_form_gtk_form_element_entry_set_value (ZakFormGtkFormElementEntry *element, GValue *value)
+zak_form_gtk_form_element_entry_set_value (ZakFormElement *element, GValue *value)
 {
        GtkWidget *w;
 
@@ -196,7 +196,7 @@ zak_form_gtk_form_element_entry_set_value (ZakFormGtkFormElementEntry *element,
 }
 
 static void
-zak_form_gtk_form_element_entry_get_xml (ZakFormGtkFormElement *element, const gchar *version, xmlNode *xnode)
+zak_form_gtk_form_element_entry_get_xml (ZakFormElement *element, xmlNode *xnode, const gchar *version)
 {
        xmlSetProp (xnode, (const xmlChar *)"type", (const xmlChar *)"zak_form_gtk_form_element_entry");
 }

diff --git a/src/formelementlabel.c b/src/formelementlabel.c
index d01dd0a94d258391fe6f7df20a7697dcd9d8d877..307794d56da7f3a5b277f2b92677927c653f9869 100644 (file)
--- a/src/formelementlabel.c
+++ b/src/formelementlabel.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2017 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2015-2025 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
@@ -39,10 +39,10 @@ static void zak_form_gtk_form_element_label_get_property (GObject *object,
 static void zak_form_gtk_form_element_label_dispose (GObject *gobject);
 static void zak_form_gtk_form_element_label_finalize (GObject *gobject);
 
-static GValue *zak_form_gtk_form_element_label_get_value (ZakFormGtkFormElementLabel *element);
-static gboolean zak_form_gtk_form_element_label_set_value (ZakFormGtkFormElementLabel *element, GValue *value);
+static GValue *zak_form_gtk_form_element_label_get_value (ZakFormElement *element);
+static gboolean zak_form_gtk_form_element_label_set_value (ZakFormElement *element, GValue *value);
 
-static void zak_form_gtk_form_element_label_get_xml (ZakFormGtkFormElement *element, const gchar *version, xmlNode *xnode);
+static void zak_form_gtk_form_element_label_get_xml (ZakFormElement *element, xmlNode *xnode, const gchar *version);
 
 #define ZAK_FORM_GTK_FORM_ELEMENT_LABEL_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ZAK_FORM_GTK_TYPE_FORM_ELEMENT_LABEL, ZakFormGtkFormElementLabelPrivate))
 
@@ -170,7 +170,7 @@ zak_form_gtk_form_element_label_finalize (GObject *gobject)
 }
 
 static GValue
-*zak_form_gtk_form_element_label_get_value (ZakFormGtkFormElementLabel *element)
+*zak_form_gtk_form_element_label_get_value (ZakFormElement *element)
 {
        GtkWidget *w;
 
@@ -180,7 +180,7 @@ static GValue
 }
 
 static gboolean
-zak_form_gtk_form_element_label_set_value (ZakFormGtkFormElementLabel *element, GValue *value)
+zak_form_gtk_form_element_label_set_value (ZakFormElement *element, GValue *value)
 {
        GtkWidget *w;
 
@@ -192,7 +192,7 @@ zak_form_gtk_form_element_label_set_value (ZakFormGtkFormElementLabel *element,
 }
 
 static void
-zak_form_gtk_form_element_label_get_xml (ZakFormGtkFormElement *element, const gchar *version, xmlNode *xnode)
+zak_form_gtk_form_element_label_get_xml (ZakFormElement *element, xmlNode *xnode, const gchar *version)
 {
        xmlSetProp (xnode, (const xmlChar *)"type", (const xmlChar *)"zak_form_gtk_form_element_label");
 }

diff --git a/src/formelementradio.c b/src/formelementradio.c
index 5cd32ebecb426c133db002eb3b48a8a498449bd8..71c736d29148d739322f9d5ce566d14889817371 100644 (file)
--- a/src/formelementradio.c
+++ b/src/formelementradio.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2020 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2015-2025 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
@@ -45,10 +45,10 @@ static void zak_form_gtk_form_element_radio_get_property (GObject *object,
 static void zak_form_gtk_form_element_radio_dispose (GObject *gobject);
 static void zak_form_gtk_form_element_radio_finalize (GObject *gobject);
 
-static GValue *zak_form_gtk_form_element_radio_get_value (ZakFormGtkFormElementRadio *element);
-static gboolean zak_form_gtk_form_element_radio_set_value (ZakFormGtkFormElementRadio *element, GValue *value);
+static GValue *zak_form_gtk_form_element_radio_get_value (ZakFormElement *element);
+static gboolean zak_form_gtk_form_element_radio_set_value (ZakFormElement *element, GValue *value);
 
-static void zak_form_gtk_form_element_radio_get_xml (ZakFormGtkFormElement *element, const gchar *version, xmlNode *xnode);
+static void zak_form_gtk_form_element_radio_get_xml (ZakFormElement *element, xmlNode *xnode, const gchar *version);
 
 #define ZAK_FORM_GTK_FORM_ELEMENT_RADIO_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ZAK_FORM_GTK_TYPE_FORM_ELEMENT_RADIO, ZakFormGtkFormElementRadioPrivate))
 
@@ -242,7 +242,7 @@ zak_form_gtk_form_element_radio_finalize (GObject *gobject)
 }
 
 static GValue
-*zak_form_gtk_form_element_radio_get_value (ZakFormGtkFormElementRadio *element)
+*zak_form_gtk_form_element_radio_get_value (ZakFormElement *element)
 {
        GValue *ret;
 
@@ -276,7 +276,7 @@ static GValue
 }
 
 static gboolean
-zak_form_gtk_form_element_radio_set_value (ZakFormGtkFormElementRadio *element, GValue *value)
+zak_form_gtk_form_element_radio_set_value (ZakFormElement *element, GValue *value)
 {
        GtkWidget *w;
 
@@ -300,13 +300,13 @@ zak_form_gtk_form_element_radio_set_value (ZakFormGtkFormElementRadio *element,
 }
 
 static void
-zak_form_gtk_form_element_radio_get_xml (ZakFormGtkFormElement *element, const gchar *version, xmlNode *xnode)
+zak_form_gtk_form_element_radio_get_xml (ZakFormElement *element, xmlNode *xnode, const gchar *version)
 {
        xmlNode *xnode_cur;
 
        xmlSetProp (xnode, (const xmlChar *)"type", (const xmlChar *)"zak_form_gtk_form_element_radio");
 
        xnode_cur = xmlNewNode (NULL, (const xmlChar *)"return-value");
-       xmlNodeSetContent (xnode_cur, (xmlChar *)zak_form_gtk_form_element_radio_get_return_value (element));
+       xmlNodeSetContent (xnode_cur, (xmlChar *)zak_form_gtk_form_element_radio_get_return_value (ZAK_FORM_GTK_FORM_ELEMENT_RADIO(element)));
        xmlAddChild (xnode, xnode_cur);
 }

diff --git a/src/formelementspin.c b/src/formelementspin.c
index 24fe2aa1f431cef073946fe7721c104351a76a8d..1fab17ab8f722cc304a85f84eae8b57218848e74 100644 (file)
--- a/src/formelementspin.c
+++ b/src/formelementspin.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2020 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2015-2025 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
@@ -39,10 +39,10 @@ static void zak_form_gtk_form_element_spin_get_property (GObject *object,
 static void zak_form_gtk_form_element_spin_dispose (GObject *gobject);
 static void zak_form_gtk_form_element_spin_finalize (GObject *gobject);
 
-static GValue *zak_form_gtk_form_element_spin_get_value (ZakFormGtkFormElementSpin *element);
-static gboolean zak_form_gtk_form_element_spin_set_value (ZakFormGtkFormElementSpin *element, GValue *value);
+static GValue *zak_form_gtk_form_element_spin_get_value (ZakFormElement *element);
+static gboolean zak_form_gtk_form_element_spin_set_value (ZakFormElement *element, GValue *value);
 
-static void zak_form_gtk_form_element_spin_get_xml (ZakFormGtkFormElement *element, const gchar *version, xmlNode *xnode);
+static void zak_form_gtk_form_element_spin_get_xml (ZakFormElement *element, xmlNode *xnode, const gchar *version);
 
 #define ZAK_FORM_GTK_FORM_ELEMENT_SPIN_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ZAK_FORM_GTK_TYPE_FORM_ELEMENT_SPIN, ZakFormGtkFormElementSpinPrivate))
 
@@ -170,7 +170,7 @@ zak_form_gtk_form_element_spin_finalize (GObject *gobject)
 }
 
 static GValue
-*zak_form_gtk_form_element_spin_get_value (ZakFormGtkFormElementSpin *element)
+*zak_form_gtk_form_element_spin_get_value (ZakFormElement *element)
 {
        GValue *ret;
 
@@ -184,7 +184,7 @@ static GValue
 }
 
 static gboolean
-zak_form_gtk_form_element_spin_set_value (ZakFormGtkFormElementSpin *element, GValue *value)
+zak_form_gtk_form_element_spin_set_value (ZakFormElement *element, GValue *value)
 {
        GtkWidget *w;
 
@@ -196,7 +196,7 @@ zak_form_gtk_form_element_spin_set_value (ZakFormGtkFormElementSpin *element, GV
 }
 
 static void
-zak_form_gtk_form_element_spin_get_xml (ZakFormGtkFormElement *element, const gchar *version, xmlNode *xnode)
+zak_form_gtk_form_element_spin_get_xml (ZakFormElement *element, xmlNode *xnode, const gchar *version)
 {
        xmlSetProp (xnode, (const xmlChar *)"type", (const xmlChar *)"zak_form_gtk_form_element_spin");
 }

diff --git a/src/formelementtextview.c b/src/formelementtextview.c
index 84eeaa2de240f4d0f82a31b2ebe0641f96fdd6a1..09db520997d3101867d0ca414e6c1d8cd22e02e6 100644 (file)
--- a/src/formelementtextview.c
+++ b/src/formelementtextview.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2020 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2015-2025 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
@@ -39,10 +39,10 @@ static void zak_form_gtk_form_element_textview_get_property (GObject *object,
 static void zak_form_gtk_form_element_textview_dispose (GObject *gobject);
 static void zak_form_gtk_form_element_textview_finalize (GObject *gobject);
 
-static GValue *zak_form_gtk_form_element_textview_get_value (ZakFormGtkFormElementTextview *element);
-static gboolean zak_form_gtk_form_element_textview_set_value (ZakFormGtkFormElementTextview *element, GValue *value);
+static GValue *zak_form_gtk_form_element_textview_get_value (ZakFormElement *element);
+static gboolean zak_form_gtk_form_element_textview_set_value (ZakFormElement *element, GValue *value);
 
-static void zak_form_gtk_form_element_textview_get_xml (ZakFormGtkFormElement *element, const gchar *version, xmlNode *xnode);
+static void zak_form_gtk_form_element_textview_get_xml (ZakFormElement *element, xmlNode *xnode, const gchar *version);
 
 #define ZAK_FORM_GTK_FORM_ELEMENT_TEXTVIEW_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ZAK_FORM_GTK_TYPE_FORM_ELEMENT_TEXTVIEW, ZakFormGtkFormElementTextviewPrivate))
 
@@ -170,7 +170,7 @@ zak_form_gtk_form_element_textview_finalize (GObject *gobject)
 }
 
 static GValue
-*zak_form_gtk_form_element_textview_get_value (ZakFormGtkFormElementTextview *element)
+*zak_form_gtk_form_element_textview_get_value (ZakFormElement *element)
 {
        GValue *ret;
 
@@ -190,7 +190,7 @@ static GValue
 }
 
 static gboolean
-zak_form_gtk_form_element_textview_set_value (ZakFormGtkFormElementTextview *element, GValue *value)
+zak_form_gtk_form_element_textview_set_value (ZakFormElement *element, GValue *value)
 {
        GtkWidget *w;
 
@@ -205,7 +205,7 @@ zak_form_gtk_form_element_textview_set_value (ZakFormGtkFormElementTextview *ele
 }
 
 static void
-zak_form_gtk_form_element_textview_get_xml (ZakFormGtkFormElement *element, const gchar *version, xmlNode *xnode)
+zak_form_gtk_form_element_textview_get_xml (ZakFormElement *element, xmlNode *xnode, const gchar *version)
 {
        xmlSetProp (xnode, (const xmlChar *)"type", (const xmlChar *)"zak_form_gtk_form_element_textview");
 }