From: Andrea Zagli Date: Tue, 15 Dec 2020 08:09:39 +0000 (+0100) Subject: Removed g_type_class_add_private deprecations. X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=2fac54d4a74f2d9bbc904354062f8828c34d6db7;p=zakform%2Flibzakform Removed g_type_class_add_private deprecations. --- diff --git a/src/formelementarray.c b/src/formelementarray.c index 3bbd81d..9f14e1e 100644 --- a/src/formelementarray.c +++ b/src/formelementarray.c @@ -55,8 +55,6 @@ static gboolean zak_form_element_array_is_valid (ZakFormElement *element); static void zak_form_element_array_get_xml (ZakFormElement *element, xmlNode *xnode, const gchar *version); -#define ZAK_FORM_ELEMENT_ARRAY_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ZAK_FORM_TYPE_ELEMENT_ARRAY, ZakFormElementArrayPrivate)) - typedef struct _ZakFormElementArrayPrivate ZakFormElementArrayPrivate; struct _ZakFormElementArrayPrivate { @@ -64,7 +62,7 @@ struct _ZakFormElementArrayPrivate GPtrArray *ar_elements; }; -G_DEFINE_TYPE (ZakFormElementArray, zak_form_element_array, ZAK_FORM_TYPE_ELEMENT) +G_DEFINE_TYPE_WITH_PRIVATE (ZakFormElementArray, zak_form_element_array, ZAK_FORM_TYPE_ELEMENT) static void zak_form_element_array_class_init (ZakFormElementArrayClass *klass) @@ -90,8 +88,6 @@ zak_form_element_array_class_init (ZakFormElementArrayClass *klass) elem_class->is_valid = zak_form_element_array_is_valid; elem_class->get_xml = zak_form_element_array_get_xml; - g_type_class_add_private (object_class, sizeof (ZakFormElementArrayPrivate)); - /** * ZakFormElementArray::element-add: * @element: @@ -111,7 +107,7 @@ zak_form_element_array_class_init (ZakFormElementArrayClass *klass) static void zak_form_element_array_init (ZakFormElementArray *zak_form_element_array) { - ZakFormElementArrayPrivate *priv = ZAK_FORM_ELEMENT_ARRAY_GET_PRIVATE (zak_form_element_array); + ZakFormElementArrayPrivate *priv = zak_form_element_array_get_instance_private (zak_form_element_array); priv->handler_name = NULL; priv->ar_elements = g_ptr_array_new (); @@ -150,7 +146,7 @@ zak_form_element_array_xml_parsing (ZakFormElement *element, xmlNodePtr xmlnode) ZakFormElementConstructorFunc element_constructor; - ZakFormElementArrayPrivate *priv = ZAK_FORM_ELEMENT_ARRAY_GET_PRIVATE (element); + ZakFormElementArrayPrivate *priv = zak_form_element_array_get_instance_private (ZAK_FORM_ELEMENT_ARRAY (element)); cur = xmlnode->children; while (cur != NULL) @@ -218,7 +214,7 @@ void zak_form_element_array_add_element (ZakFormElement *element, ZakFormElement *element_to_add) { ZakFormElementArrayClass *klass = ZAK_FORM_ELEMENT_ARRAY_GET_CLASS (element); - ZakFormElementArrayPrivate *priv = ZAK_FORM_ELEMENT_ARRAY_GET_PRIVATE (element); + ZakFormElementArrayPrivate *priv = zak_form_element_array_get_instance_private (ZAK_FORM_ELEMENT_ARRAY (element)); g_ptr_array_add (priv->ar_elements, element_to_add); @@ -234,7 +230,7 @@ zak_form_element_array_add_element (ZakFormElement *element, ZakFormElement *ele GPtrArray *zak_form_element_array_get_elements (ZakFormElement *element) { - ZakFormElementArrayPrivate *priv = ZAK_FORM_ELEMENT_ARRAY_GET_PRIVATE (ZAK_FORM_ELEMENT_ARRAY (element)); + ZakFormElementArrayPrivate *priv = zak_form_element_array_get_instance_private (ZAK_FORM_ELEMENT_ARRAY (element)); return priv->ar_elements; } @@ -253,7 +249,7 @@ ZakFormElement guint i; - ZakFormElementArrayPrivate *priv = ZAK_FORM_ELEMENT_ARRAY_GET_PRIVATE (element); + ZakFormElementArrayPrivate *priv = zak_form_element_array_get_instance_private (ZAK_FORM_ELEMENT_ARRAY (element)); ret = NULL; for (i = 0; i < priv->ar_elements->len; i++) @@ -281,7 +277,7 @@ zak_form_element_array_set_property (GObject *object, GParamSpec *pspec) { ZakFormElementArray *zak_form_element_array = (ZakFormElementArray *)object; - ZakFormElementArrayPrivate *priv = ZAK_FORM_ELEMENT_ARRAY_GET_PRIVATE (zak_form_element_array); + ZakFormElementArrayPrivate *priv = zak_form_element_array_get_instance_private (zak_form_element_array); switch (property_id) { @@ -298,7 +294,7 @@ zak_form_element_array_get_property (GObject *object, GParamSpec *pspec) { ZakFormElementArray *zak_form_element_array = (ZakFormElementArray *)object; - ZakFormElementArrayPrivate *priv = ZAK_FORM_ELEMENT_ARRAY_GET_PRIVATE (zak_form_element_array); + ZakFormElementArrayPrivate *priv = zak_form_element_array_get_instance_private (zak_form_element_array); switch (property_id) { @@ -312,7 +308,7 @@ static void zak_form_element_array_dispose (GObject *gobject) { ZakFormElementArray *zak_form_element_array = (ZakFormElementArray *)gobject; - ZakFormElementArrayPrivate *priv = ZAK_FORM_ELEMENT_ARRAY_GET_PRIVATE (zak_form_element_array); + ZakFormElementArrayPrivate *priv = zak_form_element_array_get_instance_private (zak_form_element_array); @@ -324,7 +320,7 @@ static void zak_form_element_array_finalize (GObject *gobject) { ZakFormElementArray *zak_form_element_array = (ZakFormElementArray *)gobject; - ZakFormElementArrayPrivate *priv = ZAK_FORM_ELEMENT_ARRAY_GET_PRIVATE (zak_form_element_array); + ZakFormElementArrayPrivate *priv = zak_form_element_array_get_instance_private (zak_form_element_array); @@ -339,7 +335,7 @@ static GValue GString *str; guint i; - ZakFormElementArrayPrivate *priv = ZAK_FORM_ELEMENT_ARRAY_GET_PRIVATE (element); + ZakFormElementArrayPrivate *priv = zak_form_element_array_get_instance_private (element); str = g_string_new ("{"); @@ -377,7 +373,7 @@ zak_form_element_array_set_value (ZakFormElementArray *element, GValue *value) ZakFormElement *form_element; - ZakFormElementArrayPrivate *priv = ZAK_FORM_ELEMENT_ARRAY_GET_PRIVATE (element); + ZakFormElementArrayPrivate *priv = zak_form_element_array_get_instance_private (element); splitted = g_strsplit (g_value_get_string (value), "},{", -1); @@ -448,7 +444,7 @@ zak_form_element_array_set_as_original_value (ZakFormElement *element) { guint i; - ZakFormElementArrayPrivate *priv = ZAK_FORM_ELEMENT_ARRAY_GET_PRIVATE (element); + ZakFormElementArrayPrivate *priv = zak_form_element_array_get_instance_private (ZAK_FORM_ELEMENT_ARRAY (element)); for (i = 0; i < priv->ar_elements->len; i++) { @@ -465,7 +461,7 @@ zak_form_element_array_is_changed (ZakFormElement *element) gboolean ret; - ZakFormElementArrayPrivate *priv = ZAK_FORM_ELEMENT_ARRAY_GET_PRIVATE (element); + ZakFormElementArrayPrivate *priv = zak_form_element_array_get_instance_private (ZAK_FORM_ELEMENT_ARRAY (element)); ret = FALSE; @@ -488,7 +484,7 @@ zak_form_element_array_set_visible (ZakFormElement *element, gboolean visible) { guint i; - ZakFormElementArrayPrivate *priv = ZAK_FORM_ELEMENT_ARRAY_GET_PRIVATE (element); + ZakFormElementArrayPrivate *priv = zak_form_element_array_get_instance_private (ZAK_FORM_ELEMENT_ARRAY (element)); for (i = 0; i < priv->ar_elements->len; i++) { @@ -501,7 +497,7 @@ zak_form_element_array_set_visible (ZakFormElement *element, gboolean visible) static gboolean zak_form_element_array_get_visible (ZakFormElement *element) { - ZakFormElementArrayPrivate *priv = ZAK_FORM_ELEMENT_ARRAY_GET_PRIVATE (element); + ZakFormElementArrayPrivate *priv = zak_form_element_array_get_instance_private (ZAK_FORM_ELEMENT_ARRAY (element)); ZakFormElement *form_element = (ZakFormElement *)g_ptr_array_index (priv->ar_elements, 0); @@ -513,7 +509,7 @@ zak_form_element_array_set_editable (ZakFormElement *element, gboolean editable) { guint i; - ZakFormElementArrayPrivate *priv = ZAK_FORM_ELEMENT_ARRAY_GET_PRIVATE (element); + ZakFormElementArrayPrivate *priv = zak_form_element_array_get_instance_private (ZAK_FORM_ELEMENT_ARRAY (element)); for (i = 0; i < priv->ar_elements->len; i++) { @@ -526,7 +522,7 @@ zak_form_element_array_set_editable (ZakFormElement *element, gboolean editable) static gboolean zak_form_element_array_get_editable (ZakFormElement *element) { - ZakFormElementArrayPrivate *priv = ZAK_FORM_ELEMENT_ARRAY_GET_PRIVATE (element); + ZakFormElementArrayPrivate *priv = zak_form_element_array_get_instance_private (ZAK_FORM_ELEMENT_ARRAY (element)); ZakFormElement *form_element = (ZakFormElement *)g_ptr_array_index (priv->ar_elements, 0); @@ -538,7 +534,7 @@ zak_form_element_array_clear (ZakFormElement *element) { guint i; - ZakFormElementArrayPrivate *priv = ZAK_FORM_ELEMENT_ARRAY_GET_PRIVATE (element); + ZakFormElementArrayPrivate *priv = zak_form_element_array_get_instance_private (ZAK_FORM_ELEMENT_ARRAY (element)); for (i = 0; i < priv->ar_elements->len; i++) { @@ -555,7 +551,7 @@ zak_form_element_array_is_valid (ZakFormElement *element) gboolean ret; - ZakFormElementArrayPrivate *priv = ZAK_FORM_ELEMENT_ARRAY_GET_PRIVATE (element); + ZakFormElementArrayPrivate *priv = zak_form_element_array_get_instance_private (ZAK_FORM_ELEMENT_ARRAY (element)); ret = TRUE; @@ -579,7 +575,7 @@ zak_form_element_array_get_xml (ZakFormElement *element, xmlNode *xnode, const g xmlNode *cur; - ZakFormElementArrayPrivate *priv = ZAK_FORM_ELEMENT_ARRAY_GET_PRIVATE (element); + ZakFormElementArrayPrivate *priv = zak_form_element_array_get_instance_private (ZAK_FORM_ELEMENT_ARRAY (element)); xmlSetProp (xnode, (const xmlChar *)"type", (const xmlChar *)"zak_form_element_array"); diff --git a/src/formelementfilterluc.c b/src/formelementfilterluc.c index 69bd721..10d4cb7 100644 --- a/src/formelementfilterluc.c +++ b/src/formelementfilterluc.c @@ -60,15 +60,13 @@ struct _ZakFormElementFilterLuc /* Other members, including private data. */ }; -#define ZAK_FORM_ELEMENT_FILTER_LUC_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ZAK_FORM_TYPE_ELEMENT_FILTER_LUC, ZakFormElementFilterLucPrivate)) - typedef struct _ZakFormElementFilterLucPrivate ZakFormElementFilterLucPrivate; struct _ZakFormElementFilterLucPrivate { guint type; }; -G_DEFINE_TYPE (ZakFormElementFilterLuc, zak_form_element_filter_luc, ZAK_FORM_TYPE_ELEMENT_FILTER) +G_DEFINE_TYPE_WITH_PRIVATE (ZakFormElementFilterLuc, zak_form_element_filter_luc, ZAK_FORM_TYPE_ELEMENT_FILTER) static void zak_form_element_filter_luc_class_init (ZakFormElementFilterLucClass *class) @@ -84,14 +82,12 @@ zak_form_element_filter_luc_class_init (ZakFormElementFilterLucClass *class) parent_class->xml_parsing = zak_form_element_filter_luc_xml_parsing; parent_class->filter = zak_form_element_filter_luc_filter; parent_class->get_xml = zak_form_element_filter_luc_get_xml; - - g_type_class_add_private (object_class, sizeof (ZakFormElementFilterLucPrivate)); } static void zak_form_element_filter_luc_init (ZakFormElementFilterLuc *zak_form_element) { - ZakFormElementFilterLucPrivate *priv = ZAK_FORM_ELEMENT_FILTER_LUC_GET_PRIVATE (zak_form_element); + ZakFormElementFilterLucPrivate *priv = zak_form_element_filter_luc_get_instance_private (zak_form_element); } /** @@ -120,7 +116,7 @@ zak_form_element_filter_luc_xml_parsing (ZakFormElementFilter *filter, xmlNode * { gchar *content; - ZakFormElementFilterLucPrivate *priv = ZAK_FORM_ELEMENT_FILTER_LUC_GET_PRIVATE (filter); + ZakFormElementFilterLucPrivate *priv = zak_form_element_filter_luc_get_instance_private (ZAK_FORM_ELEMENT_FILTER_LUC (filter)); content = (gchar *)xmlNodeGetContent (xnode); if (g_strcmp0 (content, "lower") == 0) @@ -147,7 +143,7 @@ zak_form_element_filter_luc_set_property (GObject *object, GParamSpec *pspec) { ZakFormElementFilterLuc *zak_form_element = (ZakFormElementFilterLuc *)object; - ZakFormElementFilterLucPrivate *priv = ZAK_FORM_ELEMENT_FILTER_LUC_GET_PRIVATE (zak_form_element); + ZakFormElementFilterLucPrivate *priv = zak_form_element_filter_luc_get_instance_private (zak_form_element); switch (property_id) { @@ -164,7 +160,7 @@ zak_form_element_filter_luc_get_property (GObject *object, GParamSpec *pspec) { ZakFormElementFilterLuc *zak_form_element = (ZakFormElementFilterLuc *)object; - ZakFormElementFilterLucPrivate *priv = ZAK_FORM_ELEMENT_FILTER_LUC_GET_PRIVATE (zak_form_element); + ZakFormElementFilterLucPrivate *priv = zak_form_element_filter_luc_get_instance_private (zak_form_element); switch (property_id) { @@ -178,7 +174,7 @@ static void zak_form_element_filter_luc_dispose (GObject *gobject) { ZakFormElementFilterLuc *zak_form_element = (ZakFormElementFilterLuc *)gobject; - ZakFormElementFilterLucPrivate *priv = ZAK_FORM_ELEMENT_FILTER_LUC_GET_PRIVATE (zak_form_element); + ZakFormElementFilterLucPrivate *priv = zak_form_element_filter_luc_get_instance_private (zak_form_element); @@ -190,7 +186,7 @@ static void zak_form_element_filter_luc_finalize (GObject *gobject) { ZakFormElementFilterLuc *zak_form_element = (ZakFormElementFilterLuc *)gobject; - ZakFormElementFilterLucPrivate *priv = ZAK_FORM_ELEMENT_FILTER_LUC_GET_PRIVATE (zak_form_element); + ZakFormElementFilterLucPrivate *priv = zak_form_element_filter_luc_get_instance_private (zak_form_element); @@ -209,7 +205,7 @@ static gchar GString *str; ZakFormElementFilterLuc *zak_form_element = ZAK_FORM_ELEMENT_FILTER_LUC (filter_luc); - ZakFormElementFilterLucPrivate *priv = ZAK_FORM_ELEMENT_FILTER_LUC_GET_PRIVATE (zak_form_element); + ZakFormElementFilterLucPrivate *priv = zak_form_element_filter_luc_get_instance_private (zak_form_element); g_return_val_if_fail (value != NULL, g_strdup ("")); @@ -251,7 +247,7 @@ static void zak_form_element_filter_luc_get_xml (ZakFormElementFilter *filter, xmlNode *xnode, const gchar *version) { ZakFormElementFilterLuc *zak_form_element = ZAK_FORM_ELEMENT_FILTER_LUC (filter); - ZakFormElementFilterLucPrivate *priv = ZAK_FORM_ELEMENT_FILTER_LUC_GET_PRIVATE (zak_form_element); + ZakFormElementFilterLucPrivate *priv = zak_form_element_filter_luc_get_instance_private (zak_form_element); xmlSetProp (xnode, (const xmlChar *)"type", (const xmlChar *)"zak_form_element_filter_luc"); diff --git a/src/formelementfiltertrim.c b/src/formelementfiltertrim.c index 1e4f7cf..d7f576e 100644 --- a/src/formelementfiltertrim.c +++ b/src/formelementfiltertrim.c @@ -49,15 +49,13 @@ struct _ZakFormElementFilterTrim /* Other members, including private data. */ }; -#define ZAK_FORM_ELEMENT_FILTER_TRIM_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ZAK_FORM_TYPE_ELEMENT_FILTER_TRIM, ZakFormElementFilterTrimPrivate)) - typedef struct _ZakFormElementFilterTrimPrivate ZakFormElementFilterTrimPrivate; struct _ZakFormElementFilterTrimPrivate { gpointer nothing; }; -G_DEFINE_TYPE (ZakFormElementFilterTrim, zak_form_element_filter_trim, ZAK_FORM_TYPE_ELEMENT_FILTER) +G_DEFINE_TYPE_WITH_PRIVATE (ZakFormElementFilterTrim, zak_form_element_filter_trim, ZAK_FORM_TYPE_ELEMENT_FILTER) static void zak_form_element_filter_trim_class_init (ZakFormElementFilterTrimClass *class) @@ -73,14 +71,12 @@ zak_form_element_filter_trim_class_init (ZakFormElementFilterTrimClass *class) parent_class->xml_parsing = zak_form_element_filter_trim_xml_parsing; parent_class->filter = zak_form_element_filter_trim_filter; parent_class->get_xml = zak_form_element_filter_trim_get_xml; - - g_type_class_add_private (object_class, sizeof (ZakFormElementFilterTrimPrivate)); } static void zak_form_element_filter_trim_init (ZakFormElementFilterTrim *zak_form_element) { - ZakFormElementFilterTrimPrivate *priv = ZAK_FORM_ELEMENT_FILTER_TRIM_GET_PRIVATE (zak_form_element); + ZakFormElementFilterTrimPrivate *priv = zak_form_element_filter_trim_get_instance_private (zak_form_element); } /** @@ -123,7 +119,7 @@ zak_form_element_filter_trim_set_property (GObject *object, GParamSpec *pspec) { ZakFormElementFilterTrim *zak_form_element = (ZakFormElementFilterTrim *)object; - ZakFormElementFilterTrimPrivate *priv = ZAK_FORM_ELEMENT_FILTER_TRIM_GET_PRIVATE (zak_form_element); + ZakFormElementFilterTrimPrivate *priv = zak_form_element_filter_trim_get_instance_private (zak_form_element); switch (property_id) { @@ -140,7 +136,7 @@ zak_form_element_filter_trim_get_property (GObject *object, GParamSpec *pspec) { ZakFormElementFilterTrim *zak_form_element = (ZakFormElementFilterTrim *)object; - ZakFormElementFilterTrimPrivate *priv = ZAK_FORM_ELEMENT_FILTER_TRIM_GET_PRIVATE (zak_form_element); + ZakFormElementFilterTrimPrivate *priv = zak_form_element_filter_trim_get_instance_private (zak_form_element); switch (property_id) { @@ -154,7 +150,7 @@ static void zak_form_element_filter_trim_dispose (GObject *gobject) { ZakFormElementFilterTrim *zak_form_element = (ZakFormElementFilterTrim *)gobject; - ZakFormElementFilterTrimPrivate *priv = ZAK_FORM_ELEMENT_FILTER_TRIM_GET_PRIVATE (zak_form_element); + ZakFormElementFilterTrimPrivate *priv = zak_form_element_filter_trim_get_instance_private (zak_form_element); @@ -166,7 +162,7 @@ static void zak_form_element_filter_trim_finalize (GObject *gobject) { ZakFormElementFilterTrim *zak_form_element = (ZakFormElementFilterTrim *)gobject; - ZakFormElementFilterTrimPrivate *priv = ZAK_FORM_ELEMENT_FILTER_TRIM_GET_PRIVATE (zak_form_element); + ZakFormElementFilterTrimPrivate *priv = zak_form_element_filter_trim_get_instance_private (zak_form_element); @@ -194,7 +190,7 @@ static void zak_form_element_filter_trim_get_xml (ZakFormElementFilter *filter, xmlNode *xnode, const gchar *version) { ZakFormElementFilterTrim *zak_form_element = ZAK_FORM_ELEMENT_FILTER_TRIM (filter); - ZakFormElementFilterTrimPrivate *priv = ZAK_FORM_ELEMENT_FILTER_TRIM_GET_PRIVATE (zak_form_element); + ZakFormElementFilterTrimPrivate *priv = zak_form_element_filter_trim_get_instance_private (zak_form_element); xmlSetProp (xnode, (const xmlChar *)"type", (const xmlChar *)"zak_form_element_filter_trim"); } diff --git a/src/formelementvalidatordate.c b/src/formelementvalidatordate.c index 1f9f93f..7c2ba05 100644 --- a/src/formelementvalidatordate.c +++ b/src/formelementvalidatordate.c @@ -53,8 +53,6 @@ struct _ZakFormElementValidatorDate /* Other members, including private data. */ }; -#define ZAK_FORM_ELEMENT_VALIDATOR_DATE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ZAK_FORM_TYPE_ELEMENT_VALIDATOR_DATE, ZakFormElementValidatorDatePrivate)) - typedef struct _ZakFormElementValidatorDatePrivate ZakFormElementValidatorDatePrivate; struct _ZakFormElementValidatorDatePrivate { @@ -63,7 +61,7 @@ struct _ZakFormElementValidatorDatePrivate gchar *format; }; -G_DEFINE_TYPE (ZakFormElementValidatorDate, zak_form_element_validator_date, ZAK_FORM_TYPE_ELEMENT_VALIDATOR) +G_DEFINE_TYPE_WITH_PRIVATE (ZakFormElementValidatorDate, zak_form_element_validator_date, ZAK_FORM_TYPE_ELEMENT_VALIDATOR) static void zak_form_element_validator_date_class_init (ZakFormElementValidatorDateClass *class) @@ -79,14 +77,12 @@ zak_form_element_validator_date_class_init (ZakFormElementValidatorDateClass *cl parent_class->xml_parsing = zak_form_element_validator_date_xml_parsing; parent_class->validate = zak_form_element_validator_date_validate; parent_class->get_xml = zak_form_element_validator_date_get_xml; - - g_type_class_add_private (object_class, sizeof (ZakFormElementValidatorDatePrivate)); } static void zak_form_element_validator_date_init (ZakFormElementValidatorDate *zak_form_element) { - ZakFormElementValidatorDatePrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_DATE_GET_PRIVATE (zak_form_element); + ZakFormElementValidatorDatePrivate *priv = zak_form_element_validator_date_get_instance_private (zak_form_element); priv->compare_type = ZAK_FORM_COMPARE_TYPE_NONE; priv->compare_value = NULL; @@ -117,7 +113,7 @@ ZakFormElementValidatorDate void zak_form_element_validator_date_set_compare_type (ZakFormElementValidatorDate *validator, ZakFormCompareType type) { - ZakFormElementValidatorDatePrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_DATE_GET_PRIVATE (validator); + ZakFormElementValidatorDatePrivate *priv = zak_form_element_validator_date_get_instance_private (validator); priv->compare_type = type; } @@ -130,7 +126,7 @@ zak_form_element_validator_date_set_compare_type (ZakFormElementValidatorDate *v ZakFormCompareType zak_form_element_validator_date_get_compare_type (ZakFormElementValidatorDate *validator) { - ZakFormElementValidatorDatePrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_DATE_GET_PRIVATE (validator); + ZakFormElementValidatorDatePrivate *priv = zak_form_element_validator_date_get_instance_private (validator); return priv->compare_type; } @@ -144,7 +140,7 @@ zak_form_element_validator_date_get_compare_type (ZakFormElementValidatorDate *v void zak_form_element_validator_date_set_compare_value (ZakFormElementValidatorDate *validator, const gchar *value) { - ZakFormElementValidatorDatePrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_DATE_GET_PRIVATE (validator); + ZakFormElementValidatorDatePrivate *priv = zak_form_element_validator_date_get_instance_private (validator); if (priv->compare_value != NULL) { @@ -168,7 +164,7 @@ gchar { gchar *ret; - ZakFormElementValidatorDatePrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_DATE_GET_PRIVATE (validator); + ZakFormElementValidatorDatePrivate *priv = zak_form_element_validator_date_get_instance_private (validator); if (priv->compare_value == NULL) { @@ -191,7 +187,7 @@ gchar void zak_form_element_validator_date_set_format (ZakFormElementValidatorDate *validator, const gchar *format) { - ZakFormElementValidatorDatePrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_DATE_GET_PRIVATE (validator); + ZakFormElementValidatorDatePrivate *priv = zak_form_element_validator_date_get_instance_private (validator); if (priv->format != NULL) { @@ -208,7 +204,7 @@ zak_form_element_validator_date_set_format (ZakFormElementValidatorDate *validat gchar *zak_form_element_validator_date_get_format (ZakFormElementValidatorDate *validator) { - ZakFormElementValidatorDatePrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_DATE_GET_PRIVATE (validator); + ZakFormElementValidatorDatePrivate *priv = zak_form_element_validator_date_get_instance_private (validator); return g_strdup (priv->format); } @@ -224,7 +220,7 @@ zak_form_element_validator_date_xml_parsing (ZakFormElementValidator *validator, { gchar *prop; - ZakFormElementValidatorDatePrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_DATE_GET_PRIVATE (ZAK_FORM_ELEMENT_VALIDATOR_DATE (validator)); + ZakFormElementValidatorDatePrivate *priv = zak_form_element_validator_date_get_instance_private (ZAK_FORM_ELEMENT_VALIDATOR_DATE (validator)); prop = (gchar *)xmlGetProp (xnode, (const xmlChar *)"type_comp"); zak_form_element_validator_date_set_compare_type (ZAK_FORM_ELEMENT_VALIDATOR_DATE (validator), zak_form_get_compare_type_from_string (prop)); @@ -247,7 +243,7 @@ zak_form_element_validator_date_set_property (GObject *object, GParamSpec *pspec) { ZakFormElementValidatorDate *zak_form_element = (ZakFormElementValidatorDate *)object; - ZakFormElementValidatorDatePrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_DATE_GET_PRIVATE (zak_form_element); + ZakFormElementValidatorDatePrivate *priv = zak_form_element_validator_date_get_instance_private (zak_form_element); switch (property_id) { @@ -264,7 +260,7 @@ zak_form_element_validator_date_get_property (GObject *object, GParamSpec *pspec) { ZakFormElementValidatorDate *zak_form_element = (ZakFormElementValidatorDate *)object; - ZakFormElementValidatorDatePrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_DATE_GET_PRIVATE (zak_form_element); + ZakFormElementValidatorDatePrivate *priv = zak_form_element_validator_date_get_instance_private (zak_form_element); switch (property_id) { @@ -278,7 +274,7 @@ static void zak_form_element_validator_date_dispose (GObject *gobject) { ZakFormElementValidatorDate *zak_form_element = (ZakFormElementValidatorDate *)gobject; - ZakFormElementValidatorDatePrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_DATE_GET_PRIVATE (zak_form_element); + ZakFormElementValidatorDatePrivate *priv = zak_form_element_validator_date_get_instance_private (zak_form_element); @@ -290,7 +286,7 @@ static void zak_form_element_validator_date_finalize (GObject *gobject) { ZakFormElementValidatorDate *zak_form_element = (ZakFormElementValidatorDate *)gobject; - ZakFormElementValidatorDatePrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_DATE_GET_PRIVATE (zak_form_element); + ZakFormElementValidatorDatePrivate *priv = zak_form_element_validator_date_get_instance_private (zak_form_element); g_free (priv->format); @@ -310,7 +306,7 @@ zak_form_element_validator_date_validate (ZakFormElementValidator *validator_dat gint comp; gchar *msg; - ZakFormElementValidatorDatePrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_DATE_GET_PRIVATE (validator_date); + ZakFormElementValidatorDatePrivate *priv = zak_form_element_validator_date_get_instance_private (ZAK_FORM_ELEMENT_VALIDATOR_DATE (validator_date)); g_return_val_if_fail (value != NULL, FALSE); @@ -397,7 +393,7 @@ static void zak_form_element_validator_date_get_xml (ZakFormElementValidator *validator, xmlNode *xnode, const gchar *version) { ZakFormElementValidatorDate *validator_date = ZAK_FORM_ELEMENT_VALIDATOR_DATE (validator); - ZakFormElementValidatorDatePrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_DATE_GET_PRIVATE (validator_date); + ZakFormElementValidatorDatePrivate *priv = zak_form_element_validator_date_get_instance_private (validator_date); xmlSetProp (xnode, (const xmlChar *)"type", (const xmlChar *)"zak_form_element_validator_date"); diff --git a/src/formelementvalidatorisnumber.c b/src/formelementvalidatorisnumber.c index 07fee20..15216a9 100644 --- a/src/formelementvalidatorisnumber.c +++ b/src/formelementvalidatorisnumber.c @@ -54,8 +54,6 @@ struct _ZakFormElementValidatorIsNumber /* Other members, including private data. */ }; -#define ZAK_FORM_ELEMENT_VALIDATOR_IS_NUMBER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ZAK_FORM_TYPE_ELEMENT_VALIDATOR_IS_NUMBER, ZakFormElementValidatorIsNumberPrivate)) - typedef struct _ZakFormElementValidatorIsNumberPrivate ZakFormElementValidatorIsNumberPrivate; struct _ZakFormElementValidatorIsNumberPrivate { @@ -64,7 +62,7 @@ struct _ZakFormElementValidatorIsNumberPrivate gboolean plusminus; }; -G_DEFINE_TYPE (ZakFormElementValidatorIsNumber, zak_form_element_validator_is_number, ZAK_FORM_TYPE_ELEMENT_VALIDATOR) +G_DEFINE_TYPE_WITH_PRIVATE (ZakFormElementValidatorIsNumber, zak_form_element_validator_is_number, ZAK_FORM_TYPE_ELEMENT_VALIDATOR) static void zak_form_element_validator_is_number_class_init (ZakFormElementValidatorIsNumberClass *class) @@ -80,14 +78,12 @@ zak_form_element_validator_is_number_class_init (ZakFormElementValidatorIsNumber parent_class->xml_parsing = zak_form_element_validator_is_number_xml_parsing; parent_class->validate = zak_form_element_validator_is_number_validate; parent_class->get_xml = zak_form_element_validator_is_number_get_xml; - - g_type_class_add_private (object_class, sizeof (ZakFormElementValidatorIsNumberPrivate)); } static void zak_form_element_validator_is_number_init (ZakFormElementValidatorIsNumber *zak_form_element) { - ZakFormElementValidatorIsNumberPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_IS_NUMBER_GET_PRIVATE (zak_form_element); + ZakFormElementValidatorIsNumberPrivate *priv = zak_form_element_validator_is_number_get_instance_private (zak_form_element); priv->decimals_separator = ','; priv->thousands_separator = '.'; @@ -118,7 +114,7 @@ ZakFormElementValidatorIsNumber void zak_form_element_validator_is_number_set_decimals_separator (ZakFormElementValidatorIsNumber *validator, gchar decimals_separator) { - ZakFormElementValidatorIsNumberPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_IS_NUMBER_GET_PRIVATE (ZAK_FORM_ELEMENT_VALIDATOR_IS_NUMBER (validator)); + ZakFormElementValidatorIsNumberPrivate *priv = zak_form_element_validator_is_number_get_instance_private (ZAK_FORM_ELEMENT_VALIDATOR_IS_NUMBER (validator)); priv->decimals_separator = decimals_separator; } @@ -132,7 +128,7 @@ zak_form_element_validator_is_number_set_decimals_separator (ZakFormElementValid gchar zak_form_element_validator_is_number_get_decimals_separator (ZakFormElementValidatorIsNumber *validator) { - ZakFormElementValidatorIsNumberPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_IS_NUMBER_GET_PRIVATE (ZAK_FORM_ELEMENT_VALIDATOR_IS_NUMBER (validator)); + ZakFormElementValidatorIsNumberPrivate *priv = zak_form_element_validator_is_number_get_instance_private (ZAK_FORM_ELEMENT_VALIDATOR_IS_NUMBER (validator)); return priv->decimals_separator; } @@ -146,7 +142,7 @@ zak_form_element_validator_is_number_get_decimals_separator (ZakFormElementValid void zak_form_element_validator_is_number_set_thousands_separator (ZakFormElementValidatorIsNumber *validator, gchar thousands_separator) { - ZakFormElementValidatorIsNumberPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_IS_NUMBER_GET_PRIVATE (ZAK_FORM_ELEMENT_VALIDATOR_IS_NUMBER (validator)); + ZakFormElementValidatorIsNumberPrivate *priv = zak_form_element_validator_is_number_get_instance_private (ZAK_FORM_ELEMENT_VALIDATOR_IS_NUMBER (validator)); priv->thousands_separator = thousands_separator; } @@ -160,7 +156,7 @@ zak_form_element_validator_is_number_set_thousands_separator (ZakFormElementVali gchar zak_form_element_validator_is_number_get_thousands_separator (ZakFormElementValidatorIsNumber *validator) { - ZakFormElementValidatorIsNumberPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_IS_NUMBER_GET_PRIVATE (ZAK_FORM_ELEMENT_VALIDATOR_IS_NUMBER (validator)); + ZakFormElementValidatorIsNumberPrivate *priv = zak_form_element_validator_is_number_get_instance_private (ZAK_FORM_ELEMENT_VALIDATOR_IS_NUMBER (validator)); return priv->thousands_separator; } @@ -174,7 +170,7 @@ zak_form_element_validator_is_number_get_thousands_separator (ZakFormElementVali void zak_form_element_validator_is_number_set_plusminus (ZakFormElementValidatorIsNumber *validator, gboolean plusminus) { - ZakFormElementValidatorIsNumberPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_IS_NUMBER_GET_PRIVATE (ZAK_FORM_ELEMENT_VALIDATOR_IS_NUMBER (validator)); + ZakFormElementValidatorIsNumberPrivate *priv = zak_form_element_validator_is_number_get_instance_private (ZAK_FORM_ELEMENT_VALIDATOR_IS_NUMBER (validator)); priv->plusminus = plusminus; } @@ -188,7 +184,7 @@ zak_form_element_validator_is_number_set_plusminus (ZakFormElementValidatorIsNum gboolean zak_form_element_validator_is_number_get_plusminus (ZakFormElementValidatorIsNumber *validator) { - ZakFormElementValidatorIsNumberPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_IS_NUMBER_GET_PRIVATE (ZAK_FORM_ELEMENT_VALIDATOR_IS_NUMBER (validator)); + ZakFormElementValidatorIsNumberPrivate *priv = zak_form_element_validator_is_number_get_instance_private (ZAK_FORM_ELEMENT_VALIDATOR_IS_NUMBER (validator)); return priv->plusminus; } @@ -204,7 +200,7 @@ zak_form_element_validator_is_number_xml_parsing (ZakFormElementValidator *valid { gchar *prop; - ZakFormElementValidatorIsNumberPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_IS_NUMBER_GET_PRIVATE (ZAK_FORM_ELEMENT_VALIDATOR_IS_NUMBER (validator)); + ZakFormElementValidatorIsNumberPrivate *priv = zak_form_element_validator_is_number_get_instance_private (ZAK_FORM_ELEMENT_VALIDATOR_IS_NUMBER (validator)); prop = (gchar *)xmlGetProp (xnode, (const xmlChar *)"thousands_separator"); if (prop != NULL) @@ -239,7 +235,7 @@ zak_form_element_validator_is_number_set_property (GObject *object, GParamSpec *pspec) { ZakFormElementValidatorIsNumber *zak_form_element = (ZakFormElementValidatorIsNumber *)object; - ZakFormElementValidatorIsNumberPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_IS_NUMBER_GET_PRIVATE (zak_form_element); + ZakFormElementValidatorIsNumberPrivate *priv = zak_form_element_validator_is_number_get_instance_private (zak_form_element); switch (property_id) { @@ -256,7 +252,7 @@ zak_form_element_validator_is_number_get_property (GObject *object, GParamSpec *pspec) { ZakFormElementValidatorIsNumber *zak_form_element = (ZakFormElementValidatorIsNumber *)object; - ZakFormElementValidatorIsNumberPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_IS_NUMBER_GET_PRIVATE (zak_form_element); + ZakFormElementValidatorIsNumberPrivate *priv = zak_form_element_validator_is_number_get_instance_private (zak_form_element); switch (property_id) { @@ -270,7 +266,7 @@ static void zak_form_element_validator_is_number_dispose (GObject *gobject) { ZakFormElementValidatorIsNumber *zak_form_element = (ZakFormElementValidatorIsNumber *)gobject; - ZakFormElementValidatorIsNumberPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_IS_NUMBER_GET_PRIVATE (zak_form_element); + ZakFormElementValidatorIsNumberPrivate *priv = zak_form_element_validator_is_number_get_instance_private (zak_form_element); @@ -282,7 +278,7 @@ static void zak_form_element_validator_is_number_finalize (GObject *gobject) { ZakFormElementValidatorIsNumber *zak_form_element = (ZakFormElementValidatorIsNumber *)gobject; - ZakFormElementValidatorIsNumberPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_IS_NUMBER_GET_PRIVATE (zak_form_element); + ZakFormElementValidatorIsNumberPrivate *priv = zak_form_element_validator_is_number_get_instance_private (zak_form_element); GObjectClass *parent_class = g_type_class_peek_parent (G_OBJECT_GET_CLASS (gobject)); parent_class->finalize (gobject); @@ -301,7 +297,7 @@ zak_form_element_validator_is_number_validate (ZakFormElementValidator *validato ZakFormElementValidatorRegex *validator; - ZakFormElementValidatorIsNumberPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_IS_NUMBER_GET_PRIVATE (validator_is_number); + ZakFormElementValidatorIsNumberPrivate *priv = zak_form_element_validator_is_number_get_instance_private (ZAK_FORM_ELEMENT_VALIDATOR_IS_NUMBER (validator_is_number)); g_return_val_if_fail (value != NULL, FALSE); @@ -350,7 +346,7 @@ static void zak_form_element_validator_is_number_get_xml (ZakFormElementValidator *validator, xmlNode *xnode, const gchar *version) { ZakFormElementValidatorIsNumber *validator_isnumber = ZAK_FORM_ELEMENT_VALIDATOR_IS_NUMBER (validator); - ZakFormElementValidatorIsNumberPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_IS_NUMBER_GET_PRIVATE (validator_isnumber); + ZakFormElementValidatorIsNumberPrivate *priv = zak_form_element_validator_is_number_get_instance_private (validator_isnumber); xmlSetProp (xnode, (const xmlChar *)"type", (const xmlChar *)"zak_form_element_validator_isnumber"); diff --git a/src/formelementvalidatornotempty.c b/src/formelementvalidatornotempty.c index cb219be..3c7ac71 100644 --- a/src/formelementvalidatornotempty.c +++ b/src/formelementvalidatornotempty.c @@ -55,15 +55,13 @@ struct _ZakFormElementValidatorNotempty /* Other members, including private data. */ }; -#define ZAK_FORM_ELEMENT_VALIDATOR_NOTEMPTY_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ZAK_FORM_TYPE_ELEMENT_VALIDATOR_NOTEMPTY, ZakFormElementValidatorNotemptyPrivate)) - typedef struct _ZakFormElementValidatorNotemptyPrivate ZakFormElementValidatorNotemptyPrivate; struct _ZakFormElementValidatorNotemptyPrivate { gchar *as_empty_string; }; -G_DEFINE_TYPE (ZakFormElementValidatorNotempty, zak_form_element_validator_notempty, ZAK_FORM_TYPE_ELEMENT_VALIDATOR) +G_DEFINE_TYPE_WITH_PRIVATE (ZakFormElementValidatorNotempty, zak_form_element_validator_notempty, ZAK_FORM_TYPE_ELEMENT_VALIDATOR) static void zak_form_element_validator_notempty_class_init (ZakFormElementValidatorNotemptyClass *class) @@ -80,8 +78,6 @@ zak_form_element_validator_notempty_class_init (ZakFormElementValidatorNotemptyC parent_class->validate = zak_form_element_validator_notempty_validate; parent_class->get_xml = zak_form_element_validator_notempty_get_xml; - g_type_class_add_private (object_class, sizeof (ZakFormElementValidatorNotemptyPrivate)); - g_object_class_install_property (object_class, PROP_AS_EMPTY_STRING, g_param_spec_string ("as-empty-string", "As empty string", @@ -93,7 +89,7 @@ zak_form_element_validator_notempty_class_init (ZakFormElementValidatorNotemptyC static void zak_form_element_validator_notempty_init (ZakFormElementValidatorNotempty *zak_form_element) { - ZakFormElementValidatorNotemptyPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_NOTEMPTY_GET_PRIVATE (zak_form_element); + ZakFormElementValidatorNotemptyPrivate *priv = zak_form_element_validator_notempty_get_instance_private (zak_form_element); } /** @@ -120,7 +116,7 @@ ZakFormElementValidatorNotempty static gboolean zak_form_element_validator_notempty_xml_parsing (ZakFormElementValidator *validator, xmlNode *xnode) { - ZakFormElementValidatorNotemptyPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_NOTEMPTY_GET_PRIVATE (validator); + ZakFormElementValidatorNotemptyPrivate *priv = zak_form_element_validator_notempty_get_instance_private (ZAK_FORM_ELEMENT_VALIDATOR_NOTEMPTY (validator)); if (priv->as_empty_string != NULL) { @@ -147,7 +143,7 @@ zak_form_element_validator_notempty_xml_parsing (ZakFormElementValidator *valida void zak_form_element_validator_notempty_set_as_empty_string (ZakFormElementValidatorNotempty *validator, const gchar *as_empty_string) { - ZakFormElementValidatorNotemptyPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_NOTEMPTY_GET_PRIVATE (validator); + ZakFormElementValidatorNotemptyPrivate *priv = zak_form_element_validator_notempty_get_instance_private (validator); if (priv->as_empty_string != NULL) { @@ -172,7 +168,7 @@ zak_form_element_validator_notempty_set_as_empty_string (ZakFormElementValidator gchar *zak_form_element_validator_notempty_get_as_empty_string (ZakFormElementValidatorNotempty *validator) { - ZakFormElementValidatorNotemptyPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_NOTEMPTY_GET_PRIVATE (validator); + ZakFormElementValidatorNotemptyPrivate *priv = zak_form_element_validator_notempty_get_instance_private (validator); return g_strdup (priv->as_empty_string); } @@ -185,7 +181,7 @@ zak_form_element_validator_notempty_set_property (GObject *object, GParamSpec *pspec) { ZakFormElementValidatorNotempty *validator = (ZakFormElementValidatorNotempty *)object; - ZakFormElementValidatorNotemptyPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_NOTEMPTY_GET_PRIVATE (validator); + ZakFormElementValidatorNotemptyPrivate *priv = zak_form_element_validator_notempty_get_instance_private (validator); switch (property_id) { @@ -206,7 +202,7 @@ zak_form_element_validator_notempty_get_property (GObject *object, GParamSpec *pspec) { ZakFormElementValidatorNotempty *validator = (ZakFormElementValidatorNotempty *)object; - ZakFormElementValidatorNotemptyPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_NOTEMPTY_GET_PRIVATE (validator); + ZakFormElementValidatorNotemptyPrivate *priv = zak_form_element_validator_notempty_get_instance_private (validator); switch (property_id) { @@ -224,7 +220,7 @@ static void zak_form_element_validator_notempty_dispose (GObject *gobject) { ZakFormElementValidatorNotempty *validator = (ZakFormElementValidatorNotempty *)gobject; - ZakFormElementValidatorNotemptyPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_NOTEMPTY_GET_PRIVATE (validator); + ZakFormElementValidatorNotemptyPrivate *priv = zak_form_element_validator_notempty_get_instance_private (validator); @@ -236,7 +232,7 @@ static void zak_form_element_validator_notempty_finalize (GObject *gobject) { ZakFormElementValidatorNotempty *validator = (ZakFormElementValidatorNotempty *)gobject; - ZakFormElementValidatorNotemptyPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_NOTEMPTY_GET_PRIVATE (validator); + ZakFormElementValidatorNotemptyPrivate *priv = zak_form_element_validator_notempty_get_instance_private (validator); @@ -250,7 +246,7 @@ zak_form_element_validator_notempty_validate (ZakFormElementValidator *validator { gboolean ret; - ZakFormElementValidatorNotemptyPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_NOTEMPTY_GET_PRIVATE (validator); + ZakFormElementValidatorNotemptyPrivate *priv = zak_form_element_validator_notempty_get_instance_private (ZAK_FORM_ELEMENT_VALIDATOR_NOTEMPTY (validator)); g_return_val_if_fail (value != NULL, FALSE); @@ -263,7 +259,7 @@ static void zak_form_element_validator_notempty_get_xml (ZakFormElementValidator *validator, xmlNode *xnode, const gchar *version) { ZakFormElementValidatorNotempty *validator_notempty = ZAK_FORM_ELEMENT_VALIDATOR_NOTEMPTY (validator); - ZakFormElementValidatorNotemptyPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_NOTEMPTY_GET_PRIVATE (validator_notempty); + ZakFormElementValidatorNotemptyPrivate *priv = zak_form_element_validator_notempty_get_instance_private (validator_notempty); xmlSetProp (xnode, (const xmlChar *)"type", (const xmlChar *)"zak_form_element_validator_notempty"); diff --git a/src/formelementvalidatornumber.c b/src/formelementvalidatornumber.c index 77ace76..6304386 100644 --- a/src/formelementvalidatornumber.c +++ b/src/formelementvalidatornumber.c @@ -53,8 +53,6 @@ struct _ZakFormElementValidatorNumber /* Other members, including private data. */ }; -#define ZAK_FORM_ELEMENT_VALIDATOR_NUMBER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ZAK_FORM_TYPE_ELEMENT_VALIDATOR_NUMBER, ZakFormElementValidatorNumberPrivate)) - typedef struct _ZakFormElementValidatorNumberPrivate ZakFormElementValidatorNumberPrivate; struct _ZakFormElementValidatorNumberPrivate { @@ -62,7 +60,7 @@ struct _ZakFormElementValidatorNumberPrivate gdouble compare_value; }; -G_DEFINE_TYPE (ZakFormElementValidatorNumber, zak_form_element_validator_number, ZAK_FORM_TYPE_ELEMENT_VALIDATOR) +G_DEFINE_TYPE_WITH_PRIVATE (ZakFormElementValidatorNumber, zak_form_element_validator_number, ZAK_FORM_TYPE_ELEMENT_VALIDATOR) static void zak_form_element_validator_number_class_init (ZakFormElementValidatorNumberClass *class) @@ -78,14 +76,12 @@ zak_form_element_validator_number_class_init (ZakFormElementValidatorNumberClass parent_class->xml_parsing = zak_form_element_validator_number_xml_parsing; parent_class->validate = zak_form_element_validator_number_validate; parent_class->get_xml = zak_form_element_validator_number_get_xml; - - g_type_class_add_private (object_class, sizeof (ZakFormElementValidatorNumberPrivate)); } static void zak_form_element_validator_number_init (ZakFormElementValidatorNumber *zak_form_element) { - ZakFormElementValidatorNumberPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_NUMBER_GET_PRIVATE (zak_form_element); + ZakFormElementValidatorNumberPrivate *priv = zak_form_element_validator_number_get_instance_private (zak_form_element); priv->compare_type = ZAK_FORM_COMPARE_TYPE_NONE; priv->compare_value = 0.0; @@ -115,7 +111,7 @@ ZakFormElementValidatorNumber void zak_form_element_validator_number_set_compare_type (ZakFormElementValidatorNumber *validator, ZakFormCompareType type) { - ZakFormElementValidatorNumberPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_NUMBER_GET_PRIVATE (validator); + ZakFormElementValidatorNumberPrivate *priv = zak_form_element_validator_number_get_instance_private (validator); priv->compare_type = type; } @@ -128,7 +124,7 @@ zak_form_element_validator_number_set_compare_type (ZakFormElementValidatorNumbe ZakFormCompareType zak_form_element_validator_number_get_compare_type (ZakFormElementValidatorNumber *validator) { - ZakFormElementValidatorNumberPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_NUMBER_GET_PRIVATE (validator); + ZakFormElementValidatorNumberPrivate *priv = zak_form_element_validator_number_get_instance_private (validator); return priv->compare_type; } @@ -142,7 +138,7 @@ zak_form_element_validator_number_get_compare_type (ZakFormElementValidatorNumbe void zak_form_element_validator_number_set_compare_value (ZakFormElementValidatorNumber *validator, const gchar *value) { - ZakFormElementValidatorNumberPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_NUMBER_GET_PRIVATE (validator); + ZakFormElementValidatorNumberPrivate *priv = zak_form_element_validator_number_get_instance_private (validator); if (value != NULL) { @@ -164,7 +160,7 @@ gchar { gchar *ret; - ZakFormElementValidatorNumberPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_NUMBER_GET_PRIVATE (validator); + ZakFormElementValidatorNumberPrivate *priv = zak_form_element_validator_number_get_instance_private (validator); ret = g_strdup_printf ("%f", priv->compare_value); @@ -182,7 +178,7 @@ zak_form_element_validator_number_xml_parsing (ZakFormElementValidator *validato { gchar *prop; - ZakFormElementValidatorNumberPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_NUMBER_GET_PRIVATE (ZAK_FORM_ELEMENT_VALIDATOR_NUMBER (validator)); + ZakFormElementValidatorNumberPrivate *priv = zak_form_element_validator_number_get_instance_private (ZAK_FORM_ELEMENT_VALIDATOR_NUMBER (validator)); prop = (gchar *)xmlGetProp (xnode, (const xmlChar *)"type_comp"); zak_form_element_validator_number_set_compare_type (ZAK_FORM_ELEMENT_VALIDATOR_NUMBER (validator), zak_form_get_compare_type_from_string (prop)); @@ -203,7 +199,7 @@ zak_form_element_validator_number_set_property (GObject *object, GParamSpec *pspec) { ZakFormElementValidatorNumber *zak_form_element = (ZakFormElementValidatorNumber *)object; - ZakFormElementValidatorNumberPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_NUMBER_GET_PRIVATE (zak_form_element); + ZakFormElementValidatorNumberPrivate *priv = zak_form_element_validator_number_get_instance_private (zak_form_element); switch (property_id) { @@ -220,7 +216,7 @@ zak_form_element_validator_number_get_property (GObject *object, GParamSpec *pspec) { ZakFormElementValidatorNumber *zak_form_element = (ZakFormElementValidatorNumber *)object; - ZakFormElementValidatorNumberPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_NUMBER_GET_PRIVATE (zak_form_element); + ZakFormElementValidatorNumberPrivate *priv = zak_form_element_validator_number_get_instance_private (zak_form_element); switch (property_id) { @@ -234,7 +230,7 @@ static void zak_form_element_validator_number_dispose (GObject *gobject) { ZakFormElementValidatorNumber *zak_form_element = (ZakFormElementValidatorNumber *)gobject; - ZakFormElementValidatorNumberPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_NUMBER_GET_PRIVATE (zak_form_element); + ZakFormElementValidatorNumberPrivate *priv = zak_form_element_validator_number_get_instance_private (zak_form_element); @@ -246,7 +242,7 @@ static void zak_form_element_validator_number_finalize (GObject *gobject) { ZakFormElementValidatorNumber *zak_form_element = (ZakFormElementValidatorNumber *)gobject; - ZakFormElementValidatorNumberPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_NUMBER_GET_PRIVATE (zak_form_element); + ZakFormElementValidatorNumberPrivate *priv = zak_form_element_validator_number_get_instance_private (zak_form_element); GObjectClass *parent_class = g_type_class_peek_parent (G_OBJECT_GET_CLASS (gobject)); parent_class->finalize (gobject); @@ -262,7 +258,7 @@ zak_form_element_validator_number_validate (ZakFormElementValidator *validator_n gchar *msg; - ZakFormElementValidatorNumberPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_NUMBER_GET_PRIVATE (validator_number); + ZakFormElementValidatorNumberPrivate *priv = zak_form_element_validator_number_get_instance_private (ZAK_FORM_ELEMENT_VALIDATOR_NUMBER (validator_number)); g_return_val_if_fail (value != NULL, FALSE); @@ -303,7 +299,7 @@ static void zak_form_element_validator_number_get_xml (ZakFormElementValidator *validator, xmlNode *xnode, const gchar *version) { ZakFormElementValidatorNumber *validator_number = ZAK_FORM_ELEMENT_VALIDATOR_NUMBER (validator); - ZakFormElementValidatorNumberPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_NUMBER_GET_PRIVATE (validator_number); + ZakFormElementValidatorNumberPrivate *priv = zak_form_element_validator_number_get_instance_private (validator_number); xmlSetProp (xnode, (const xmlChar *)"type", (const xmlChar *)"zak_form_element_validator_number"); diff --git a/src/formelementvalidatorregex.c b/src/formelementvalidatorregex.c index 23a7b2b..96f1e3f 100644 --- a/src/formelementvalidatorregex.c +++ b/src/formelementvalidatorregex.c @@ -55,15 +55,13 @@ struct _ZakFormElementValidatorRegex /* Other members, including private data. */ }; -#define ZAK_FORM_ELEMENT_VALIDATOR_REGEX_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ZAK_FORM_TYPE_ELEMENT_VALIDATOR_REGEX, ZakFormElementValidatorRegexPrivate)) - typedef struct _ZakFormElementValidatorRegexPrivate ZakFormElementValidatorRegexPrivate; struct _ZakFormElementValidatorRegexPrivate { gchar *regex; }; -G_DEFINE_TYPE (ZakFormElementValidatorRegex, zak_form_element_validator_regex, ZAK_FORM_TYPE_ELEMENT_VALIDATOR) +G_DEFINE_TYPE_WITH_PRIVATE (ZakFormElementValidatorRegex, zak_form_element_validator_regex, ZAK_FORM_TYPE_ELEMENT_VALIDATOR) static void zak_form_element_validator_regex_class_init (ZakFormElementValidatorRegexClass *class) @@ -80,8 +78,6 @@ zak_form_element_validator_regex_class_init (ZakFormElementValidatorRegexClass * parent_class->validate = zak_form_element_validator_regex_validate; parent_class->get_xml = zak_form_element_validator_regex_get_xml; - g_type_class_add_private (object_class, sizeof (ZakFormElementValidatorRegexPrivate)); - g_object_class_install_property (object_class, PROP_REGEX, g_param_spec_string ("regex", "Regex", @@ -93,7 +89,7 @@ zak_form_element_validator_regex_class_init (ZakFormElementValidatorRegexClass * static void zak_form_element_validator_regex_init (ZakFormElementValidatorRegex *zak_form_element) { - ZakFormElementValidatorRegexPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_REGEX_GET_PRIVATE (zak_form_element); + ZakFormElementValidatorRegexPrivate *priv = zak_form_element_validator_regex_get_instance_private (zak_form_element); priv->regex = NULL; } @@ -110,7 +106,7 @@ ZakFormElementValidatorRegex zak_form_element_validator_regex = ZAK_FORM_ELEMENT_VALIDATOR_REGEX (g_object_new (zak_form_element_validator_regex_get_type (), NULL)); - ZakFormElementValidatorRegexPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_REGEX_GET_PRIVATE (zak_form_element_validator_regex); + ZakFormElementValidatorRegexPrivate *priv = zak_form_element_validator_regex_get_instance_private (zak_form_element_validator_regex); return zak_form_element_validator_regex; } @@ -145,7 +141,7 @@ zak_form_element_validator_regex_xml_parsing (ZakFormElementValidator *validator void zak_form_element_validator_regex_set_regex (ZakFormElementValidatorRegex *validator, const gchar *regex) { - ZakFormElementValidatorRegexPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_REGEX_GET_PRIVATE (validator); + ZakFormElementValidatorRegexPrivate *priv = zak_form_element_validator_regex_get_instance_private (validator); if (priv->regex != NULL) { @@ -162,7 +158,7 @@ zak_form_element_validator_regex_set_regex (ZakFormElementValidatorRegex *valida gchar *zak_form_element_validator_regex_get_regex (ZakFormElementValidatorRegex *validator) { - ZakFormElementValidatorRegexPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_REGEX_GET_PRIVATE (validator); + ZakFormElementValidatorRegexPrivate *priv = zak_form_element_validator_regex_get_instance_private (validator); return g_strdup (priv->regex); } @@ -175,7 +171,7 @@ zak_form_element_validator_regex_set_property (GObject *object, GParamSpec *pspec) { ZakFormElementValidatorRegex *zak_form_element = (ZakFormElementValidatorRegex *)object; - ZakFormElementValidatorRegexPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_REGEX_GET_PRIVATE (zak_form_element); + ZakFormElementValidatorRegexPrivate *priv = zak_form_element_validator_regex_get_instance_private (zak_form_element); switch (property_id) { @@ -196,7 +192,7 @@ zak_form_element_validator_regex_get_property (GObject *object, GParamSpec *pspec) { ZakFormElementValidatorRegex *zak_form_element = (ZakFormElementValidatorRegex *)object; - ZakFormElementValidatorRegexPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_REGEX_GET_PRIVATE (zak_form_element); + ZakFormElementValidatorRegexPrivate *priv = zak_form_element_validator_regex_get_instance_private (zak_form_element); switch (property_id) { @@ -214,7 +210,7 @@ static void zak_form_element_validator_regex_dispose (GObject *gobject) { ZakFormElementValidatorRegex *zak_form_element = (ZakFormElementValidatorRegex *)gobject; - ZakFormElementValidatorRegexPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_REGEX_GET_PRIVATE (zak_form_element); + ZakFormElementValidatorRegexPrivate *priv = zak_form_element_validator_regex_get_instance_private (zak_form_element); @@ -226,7 +222,7 @@ static void zak_form_element_validator_regex_finalize (GObject *gobject) { ZakFormElementValidatorRegex *zak_form_element = (ZakFormElementValidatorRegex *)gobject; - ZakFormElementValidatorRegexPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_REGEX_GET_PRIVATE (zak_form_element); + ZakFormElementValidatorRegexPrivate *priv = zak_form_element_validator_regex_get_instance_private (zak_form_element); @@ -245,7 +241,7 @@ zak_form_element_validator_regex_validate (ZakFormElementValidator *validator_re g_return_val_if_fail (value != NULL, FALSE); - ZakFormElementValidatorRegexPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_REGEX_GET_PRIVATE (validator_regex); + ZakFormElementValidatorRegexPrivate *priv = zak_form_element_validator_regex_get_instance_private (ZAK_FORM_ELEMENT_VALIDATOR_REGEX (validator_regex)); if (priv->regex == NULL) { @@ -275,7 +271,7 @@ static void zak_form_element_validator_regex_get_xml (ZakFormElementValidator *validator, xmlNode *xnode, const gchar *version) { ZakFormElementValidatorRegex *validator_regex = ZAK_FORM_ELEMENT_VALIDATOR_REGEX (validator); - ZakFormElementValidatorRegexPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_REGEX_GET_PRIVATE (validator_regex); + ZakFormElementValidatorRegexPrivate *priv = zak_form_element_validator_regex_get_instance_private (validator_regex); xmlSetProp (xnode, (const xmlChar *)"type", (const xmlChar *)"zak_form_element_validator_regex"); diff --git a/src/formvalidatorcompare.c b/src/formvalidatorcompare.c index 32f2f29..64b93cd 100644 --- a/src/formvalidatorcompare.c +++ b/src/formvalidatorcompare.c @@ -54,8 +54,6 @@ struct _ZakFormValidatorCompare /* Other members, including private data. */ }; -#define ZAK_FORM_VALIDATOR_COMPARE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ZAK_FORM_TYPE_VALIDATOR_COMPARE, ZakFormValidatorComparePrivate)) - typedef struct _ZakFormValidatorComparePrivate ZakFormValidatorComparePrivate; struct _ZakFormValidatorComparePrivate { @@ -65,7 +63,7 @@ struct _ZakFormValidatorComparePrivate ZakFormElement *v2; }; -G_DEFINE_TYPE (ZakFormValidatorCompare, zak_form_validator_compare, ZAK_FORM_TYPE_VALIDATOR) +G_DEFINE_TYPE_WITH_PRIVATE (ZakFormValidatorCompare, zak_form_validator_compare, ZAK_FORM_TYPE_VALIDATOR) static void zak_form_validator_compare_class_init (ZakFormValidatorCompareClass *class) @@ -81,14 +79,12 @@ zak_form_validator_compare_class_init (ZakFormValidatorCompareClass *class) parent_class->xml_parsing = zak_form_validator_compare_xml_parsing; parent_class->validate = zak_form_validator_compare_validate; parent_class->get_xml = zak_form_validator_compare_get_xml; - - g_type_class_add_private (object_class, sizeof (ZakFormValidatorComparePrivate)); } static void zak_form_validator_compare_init (ZakFormValidatorCompare *validator) { - ZakFormValidatorComparePrivate *priv = ZAK_FORM_VALIDATOR_COMPARE_GET_PRIVATE (validator); + ZakFormValidatorComparePrivate *priv = zak_form_validator_compare_get_instance_private (validator); priv->v1 = NULL; priv->v2 = NULL; @@ -121,7 +117,7 @@ zak_form_validator_compare_xml_parsing (ZakFormValidator *validator, xmlNode *xn { gchar *prop; - ZakFormValidatorComparePrivate *priv = ZAK_FORM_VALIDATOR_COMPARE_GET_PRIVATE (validator); + ZakFormValidatorComparePrivate *priv = zak_form_validator_compare_get_instance_private (ZAK_FORM_VALIDATOR_COMPARE (validator)); prop = (gchar *)xmlGetProp (xnode, (const xmlChar *)"type_comp"); zak_form_validator_compare_set_compare_type ((ZakFormValidatorCompare *)validator, prop); @@ -148,7 +144,7 @@ zak_form_validator_compare_xml_parsing (ZakFormValidator *validator, xmlNode *xn void zak_form_validator_compare_set_compare_type (ZakFormValidatorCompare *validator, const gchar *type) { - ZakFormValidatorComparePrivate *priv = ZAK_FORM_VALIDATOR_COMPARE_GET_PRIVATE (validator); + ZakFormValidatorComparePrivate *priv = zak_form_validator_compare_get_instance_private (validator); priv->type = zak_form_get_compare_type_from_string (type); } @@ -162,7 +158,7 @@ zak_form_validator_compare_set_compare_type (ZakFormValidatorCompare *validator, const gchar *zak_form_validator_compare_get_compare_type (ZakFormValidatorCompare *validator) { - ZakFormValidatorComparePrivate *priv = ZAK_FORM_VALIDATOR_COMPARE_GET_PRIVATE (validator); + ZakFormValidatorComparePrivate *priv = zak_form_validator_compare_get_instance_private (validator); zak_form_get_compare_type_stringify (priv->type); } @@ -177,7 +173,7 @@ const gchar void zak_form_validator_compare_set_element1 (ZakFormValidatorCompare *validator, ZakFormForm *form, const gchar *element1) { - ZakFormValidatorComparePrivate *priv = ZAK_FORM_VALIDATOR_COMPARE_GET_PRIVATE (validator); + ZakFormValidatorComparePrivate *priv = zak_form_validator_compare_get_instance_private (validator); priv->v1 = zak_form_form_get_element_by_id (form, element1); if (!ZAK_FORM_IS_ELEMENT (priv->v1)) @@ -195,7 +191,7 @@ zak_form_validator_compare_set_element1 (ZakFormValidatorCompare *validator, Zak const gchar *zak_form_validator_compare_get_element1 (ZakFormValidatorCompare *validator) { - ZakFormValidatorComparePrivate *priv = ZAK_FORM_VALIDATOR_COMPARE_GET_PRIVATE (validator); + ZakFormValidatorComparePrivate *priv = zak_form_validator_compare_get_instance_private (validator); if (ZAK_FORM_IS_ELEMENT (priv->v1)) { @@ -217,7 +213,7 @@ const gchar void zak_form_validator_compare_set_element2 (ZakFormValidatorCompare *validator, ZakFormForm *form, const gchar *element2) { - ZakFormValidatorComparePrivate *priv = ZAK_FORM_VALIDATOR_COMPARE_GET_PRIVATE (validator); + ZakFormValidatorComparePrivate *priv = zak_form_validator_compare_get_instance_private (validator); priv->v2 = zak_form_form_get_element_by_id (form, element2); if (!ZAK_FORM_IS_ELEMENT (priv->v2)) @@ -235,7 +231,7 @@ zak_form_validator_compare_set_element2 (ZakFormValidatorCompare *validator, Zak const gchar *zak_form_validator_compare_get_element2 (ZakFormValidatorCompare *validator) { - ZakFormValidatorComparePrivate *priv = ZAK_FORM_VALIDATOR_COMPARE_GET_PRIVATE (validator); + ZakFormValidatorComparePrivate *priv = zak_form_validator_compare_get_instance_private (validator); if (ZAK_FORM_IS_ELEMENT (priv->v2)) { @@ -255,7 +251,7 @@ zak_form_validator_compare_set_property (GObject *object, GParamSpec *pspec) { ZakFormValidatorCompare *validator = (ZakFormValidatorCompare *)object; - ZakFormValidatorComparePrivate *priv = ZAK_FORM_VALIDATOR_COMPARE_GET_PRIVATE (validator); + ZakFormValidatorComparePrivate *priv = zak_form_validator_compare_get_instance_private (validator); switch (property_id) { @@ -272,7 +268,7 @@ zak_form_validator_compare_get_property (GObject *object, GParamSpec *pspec) { ZakFormValidatorCompare *validator = (ZakFormValidatorCompare *)object; - ZakFormValidatorComparePrivate *priv = ZAK_FORM_VALIDATOR_COMPARE_GET_PRIVATE (validator); + ZakFormValidatorComparePrivate *priv = zak_form_validator_compare_get_instance_private (validator); switch (property_id) { @@ -286,7 +282,7 @@ static void zak_form_validator_compare_dispose (GObject *gobject) { ZakFormValidatorCompare *validator = (ZakFormValidatorCompare *)gobject; - ZakFormValidatorComparePrivate *priv = ZAK_FORM_VALIDATOR_COMPARE_GET_PRIVATE (validator); + ZakFormValidatorComparePrivate *priv = zak_form_validator_compare_get_instance_private (validator); @@ -298,7 +294,7 @@ static void zak_form_validator_compare_finalize (GObject *gobject) { ZakFormValidatorCompare *validator = (ZakFormValidatorCompare *)gobject; - ZakFormValidatorComparePrivate *priv = ZAK_FORM_VALIDATOR_COMPARE_GET_PRIVATE (validator); + ZakFormValidatorComparePrivate *priv = zak_form_validator_compare_get_instance_private (validator); @@ -317,7 +313,7 @@ zak_form_validator_compare_validate (ZakFormValidator *validator) gint comp; gchar *msg; - ZakFormValidatorComparePrivate *priv = ZAK_FORM_VALIDATOR_COMPARE_GET_PRIVATE (validator); + ZakFormValidatorComparePrivate *priv = zak_form_validator_compare_get_instance_private (ZAK_FORM_VALIDATOR_COMPARE (validator)); ret = FALSE; @@ -367,7 +363,7 @@ static void zak_form_validator_compare_get_xml (ZakFormValidator *validator, xmlNode *xnode, const gchar *version) { ZakFormValidatorCompare *validator_compare = ZAK_FORM_VALIDATOR_COMPARE (validator); - ZakFormValidatorComparePrivate *priv = ZAK_FORM_VALIDATOR_COMPARE_GET_PRIVATE (validator_compare); + ZakFormValidatorComparePrivate *priv = zak_form_validator_compare_get_instance_private (validator_compare); xmlSetProp (xnode, (const xmlChar *)"type", (const xmlChar *)"zak_form_validator_compare"); diff --git a/src/formvalidatorcomparedate.c b/src/formvalidatorcomparedate.c index 31cb982..bfa755f 100644 --- a/src/formvalidatorcomparedate.c +++ b/src/formvalidatorcomparedate.c @@ -55,8 +55,6 @@ struct _ZakFormValidatorCompareDate /* Other members, including private data. */ }; -#define ZAK_FORM_VALIDATOR_COMPARE_DATE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ZAK_FORM_TYPE_VALIDATOR_COMPARE_DATE, ZakFormValidatorCompareDatePrivate)) - typedef struct _ZakFormValidatorCompareDatePrivate ZakFormValidatorCompareDatePrivate; struct _ZakFormValidatorCompareDatePrivate { @@ -69,7 +67,7 @@ struct _ZakFormValidatorCompareDatePrivate gchar *format2; }; -G_DEFINE_TYPE (ZakFormValidatorCompareDate, zak_form_validator_compare_date, ZAK_FORM_TYPE_VALIDATOR) +G_DEFINE_TYPE_WITH_PRIVATE (ZakFormValidatorCompareDate, zak_form_validator_compare_date, ZAK_FORM_TYPE_VALIDATOR) static void zak_form_validator_compare_date_class_init (ZakFormValidatorCompareDateClass *class) @@ -85,14 +83,12 @@ zak_form_validator_compare_date_class_init (ZakFormValidatorCompareDateClass *cl parent_class->xml_parsing = zak_form_validator_compare_date_xml_parsing; parent_class->validate = zak_form_validator_compare_date_validate; parent_class->get_xml = zak_form_validator_compare_date_get_xml; - - g_type_class_add_private (object_class, sizeof (ZakFormValidatorCompareDatePrivate)); } static void zak_form_validator_compare_date_init (ZakFormValidatorCompareDate *validator) { - ZakFormValidatorCompareDatePrivate *priv = ZAK_FORM_VALIDATOR_COMPARE_DATE_GET_PRIVATE (validator); + ZakFormValidatorCompareDatePrivate *priv = zak_form_validator_compare_date_get_instance_private (validator); priv->v1 = NULL; priv->v2 = NULL; @@ -128,7 +124,7 @@ zak_form_validator_compare_date_xml_parsing (ZakFormValidator *validator, xmlNod gchar *prop; gchar *prop2; - ZakFormValidatorCompareDatePrivate *priv = ZAK_FORM_VALIDATOR_COMPARE_DATE_GET_PRIVATE (validator); + ZakFormValidatorCompareDatePrivate *priv = zak_form_validator_compare_date_get_instance_private (ZAK_FORM_VALIDATOR_COMPARE_DATE (validator)); prop = (gchar *)xmlGetProp (xnode, (const xmlChar *)"type_comp"); zak_form_validator_compare_date_set_compare_type ((ZakFormValidatorCompareDate *)validator, prop); @@ -159,7 +155,7 @@ zak_form_validator_compare_date_xml_parsing (ZakFormValidator *validator, xmlNod void zak_form_validator_compare_date_set_compare_type (ZakFormValidatorCompareDate *validator, const gchar *type) { - ZakFormValidatorCompareDatePrivate *priv = ZAK_FORM_VALIDATOR_COMPARE_DATE_GET_PRIVATE (validator); + ZakFormValidatorCompareDatePrivate *priv = zak_form_validator_compare_date_get_instance_private (validator); priv->type = zak_form_get_compare_type_from_string (type); } @@ -173,7 +169,7 @@ zak_form_validator_compare_date_set_compare_type (ZakFormValidatorCompareDate *v const gchar *zak_form_validator_compare_date_get_compare_type (ZakFormValidatorCompareDate *validator) { - ZakFormValidatorCompareDatePrivate *priv = ZAK_FORM_VALIDATOR_COMPARE_DATE_GET_PRIVATE (validator); + ZakFormValidatorCompareDatePrivate *priv = zak_form_validator_compare_date_get_instance_private (validator); zak_form_get_compare_type_stringify (priv->type); } @@ -189,7 +185,7 @@ const gchar void zak_form_validator_compare_date_set_element1 (ZakFormValidatorCompareDate *validator, ZakFormForm *form, const gchar *element1, const gchar *format1) { - ZakFormValidatorCompareDatePrivate *priv = ZAK_FORM_VALIDATOR_COMPARE_DATE_GET_PRIVATE (validator); + ZakFormValidatorCompareDatePrivate *priv = zak_form_validator_compare_date_get_instance_private (validator); priv->v1 = zak_form_form_get_element_by_id (form, element1); if (!ZAK_FORM_IS_ELEMENT (priv->v1)) @@ -212,7 +208,7 @@ zak_form_validator_compare_date_set_element1 (ZakFormValidatorCompareDate *valid const gchar *zak_form_validator_compare_date_get_element1 (ZakFormValidatorCompareDate *validator) { - ZakFormValidatorCompareDatePrivate *priv = ZAK_FORM_VALIDATOR_COMPARE_DATE_GET_PRIVATE (validator); + ZakFormValidatorCompareDatePrivate *priv = zak_form_validator_compare_date_get_instance_private (validator); if (ZAK_FORM_IS_ELEMENT (priv->v2)) { @@ -233,7 +229,7 @@ const gchar const gchar *zak_form_validator_compare_date_get_element1_format (ZakFormValidatorCompareDate *validator) { - ZakFormValidatorCompareDatePrivate *priv = ZAK_FORM_VALIDATOR_COMPARE_DATE_GET_PRIVATE (validator); + ZakFormValidatorCompareDatePrivate *priv = zak_form_validator_compare_date_get_instance_private (validator); return g_strdup (priv->format1); } @@ -249,7 +245,7 @@ const gchar void zak_form_validator_compare_date_set_element2 (ZakFormValidatorCompareDate *validator, ZakFormForm *form, const gchar *element2, const gchar *format2) { - ZakFormValidatorCompareDatePrivate *priv = ZAK_FORM_VALIDATOR_COMPARE_DATE_GET_PRIVATE (validator); + ZakFormValidatorCompareDatePrivate *priv = zak_form_validator_compare_date_get_instance_private (validator); priv->v2 = zak_form_form_get_element_by_id (form, element2); if (!ZAK_FORM_IS_ELEMENT (priv->v2)) @@ -272,7 +268,7 @@ zak_form_validator_compare_date_set_element2 (ZakFormValidatorCompareDate *valid const gchar *zak_form_validator_compare_date_get_element2 (ZakFormValidatorCompareDate *validator) { - ZakFormValidatorCompareDatePrivate *priv = ZAK_FORM_VALIDATOR_COMPARE_DATE_GET_PRIVATE (validator); + ZakFormValidatorCompareDatePrivate *priv = zak_form_validator_compare_date_get_instance_private (validator); if (ZAK_FORM_IS_ELEMENT (priv->v2)) { @@ -293,7 +289,7 @@ const gchar const gchar *zak_form_validator_compare_date_get_element2_format (ZakFormValidatorCompareDate *validator) { - ZakFormValidatorCompareDatePrivate *priv = ZAK_FORM_VALIDATOR_COMPARE_DATE_GET_PRIVATE (validator); + ZakFormValidatorCompareDatePrivate *priv = zak_form_validator_compare_date_get_instance_private (validator); return g_strdup (priv->format2); } @@ -306,7 +302,7 @@ zak_form_validator_compare_date_set_property (GObject *object, GParamSpec *pspec) { ZakFormValidatorCompareDate *validator = (ZakFormValidatorCompareDate *)object; - ZakFormValidatorCompareDatePrivate *priv = ZAK_FORM_VALIDATOR_COMPARE_DATE_GET_PRIVATE (validator); + ZakFormValidatorCompareDatePrivate *priv = zak_form_validator_compare_date_get_instance_private (validator); switch (property_id) { @@ -323,7 +319,7 @@ zak_form_validator_compare_date_get_property (GObject *object, GParamSpec *pspec) { ZakFormValidatorCompareDate *validator = (ZakFormValidatorCompareDate *)object; - ZakFormValidatorCompareDatePrivate *priv = ZAK_FORM_VALIDATOR_COMPARE_DATE_GET_PRIVATE (validator); + ZakFormValidatorCompareDatePrivate *priv = zak_form_validator_compare_date_get_instance_private (validator); switch (property_id) { @@ -337,7 +333,7 @@ static void zak_form_validator_compare_date_dispose (GObject *gobject) { ZakFormValidatorCompareDate *validator = (ZakFormValidatorCompareDate *)gobject; - ZakFormValidatorCompareDatePrivate *priv = ZAK_FORM_VALIDATOR_COMPARE_DATE_GET_PRIVATE (validator); + ZakFormValidatorCompareDatePrivate *priv = zak_form_validator_compare_date_get_instance_private (validator); @@ -349,7 +345,7 @@ static void zak_form_validator_compare_date_finalize (GObject *gobject) { ZakFormValidatorCompareDate *validator = (ZakFormValidatorCompareDate *)gobject; - ZakFormValidatorCompareDatePrivate *priv = ZAK_FORM_VALIDATOR_COMPARE_DATE_GET_PRIVATE (validator); + ZakFormValidatorCompareDatePrivate *priv = zak_form_validator_compare_date_get_instance_private (validator); @@ -368,7 +364,7 @@ zak_form_validator_compare_date_validate (ZakFormValidator *validator) gint comp; gchar *msg; - ZakFormValidatorCompareDatePrivate *priv = ZAK_FORM_VALIDATOR_COMPARE_DATE_GET_PRIVATE (validator); + ZakFormValidatorCompareDatePrivate *priv = zak_form_validator_compare_date_get_instance_private (ZAK_FORM_VALIDATOR_COMPARE_DATE (validator)); ret = FALSE; @@ -437,7 +433,7 @@ static void zak_form_validator_compare_date_get_xml (ZakFormValidator *validator, xmlNode *xnode, const gchar *version) { ZakFormValidatorCompareDate *validator_compare_date = ZAK_FORM_VALIDATOR_COMPARE_DATE (validator); - ZakFormValidatorCompareDatePrivate *priv = ZAK_FORM_VALIDATOR_COMPARE_DATE_GET_PRIVATE (validator_compare_date); + ZakFormValidatorCompareDatePrivate *priv = zak_form_validator_compare_date_get_instance_private (validator_compare_date); xmlSetProp (xnode, (const xmlChar *)"type", (const xmlChar *)"zak_form_validator_compare_date"); diff --git a/src/formvalidatorcomparenumber.c b/src/formvalidatorcomparenumber.c index 62a8c6f..f5d37db 100644 --- a/src/formvalidatorcomparenumber.c +++ b/src/formvalidatorcomparenumber.c @@ -55,8 +55,6 @@ struct _ZakFormValidatorCompareNumber /* Other members, including private data. */ }; -#define ZAK_FORM_VALIDATOR_COMPARE_NUMBER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ZAK_FORM_TYPE_VALIDATOR_COMPARE_NUMBER, ZakFormValidatorCompareNumberPrivate)) - typedef struct _ZakFormValidatorCompareNumberPrivate ZakFormValidatorCompareNumberPrivate; struct _ZakFormValidatorCompareNumberPrivate { @@ -66,7 +64,7 @@ struct _ZakFormValidatorCompareNumberPrivate ZakFormElement *v2; }; -G_DEFINE_TYPE (ZakFormValidatorCompareNumber, zak_form_validator_compare_number, ZAK_FORM_TYPE_VALIDATOR) +G_DEFINE_TYPE_WITH_PRIVATE (ZakFormValidatorCompareNumber, zak_form_validator_compare_number, ZAK_FORM_TYPE_VALIDATOR) static void zak_form_validator_compare_number_class_init (ZakFormValidatorCompareNumberClass *class) @@ -82,14 +80,12 @@ zak_form_validator_compare_number_class_init (ZakFormValidatorCompareNumberClass parent_class->xml_parsing = zak_form_validator_compare_number_xml_parsing; parent_class->validate = zak_form_validator_compare_number_validate; parent_class->get_xml = zak_form_validator_compare_number_get_xml; - - g_type_class_add_private (object_class, sizeof (ZakFormValidatorCompareNumberPrivate)); } static void zak_form_validator_compare_number_init (ZakFormValidatorCompareNumber *validator) { - ZakFormValidatorCompareNumberPrivate *priv = ZAK_FORM_VALIDATOR_COMPARE_NUMBER_GET_PRIVATE (validator); + ZakFormValidatorCompareNumberPrivate *priv = zak_form_validator_compare_number_get_instance_private (validator); priv->v1 = NULL; priv->v2 = NULL; @@ -122,7 +118,7 @@ zak_form_validator_compare_number_xml_parsing (ZakFormValidator *validator, xmlN { gchar *prop; - ZakFormValidatorCompareNumberPrivate *priv = ZAK_FORM_VALIDATOR_COMPARE_NUMBER_GET_PRIVATE (validator); + ZakFormValidatorCompareNumberPrivate *priv = zak_form_validator_compare_number_get_instance_private (ZAK_FORM_VALIDATOR_COMPARE_NUMBER (validator)); prop = (gchar *)xmlGetProp (xnode, (const xmlChar *)"type_comp"); zak_form_validator_compare_number_set_compare_type ((ZakFormValidatorCompareNumber *)validator, prop); @@ -149,7 +145,7 @@ zak_form_validator_compare_number_xml_parsing (ZakFormValidator *validator, xmlN void zak_form_validator_compare_number_set_compare_type (ZakFormValidatorCompareNumber *validator, const gchar *type) { - ZakFormValidatorCompareNumberPrivate *priv = ZAK_FORM_VALIDATOR_COMPARE_NUMBER_GET_PRIVATE (validator); + ZakFormValidatorCompareNumberPrivate *priv = zak_form_validator_compare_number_get_instance_private (validator); priv->type = zak_form_get_compare_type_from_string (type); } @@ -163,7 +159,7 @@ zak_form_validator_compare_number_set_compare_type (ZakFormValidatorCompareNumbe const gchar *zak_form_validator_compare_number_get_compare_type (ZakFormValidatorCompareNumber *validator) { - ZakFormValidatorCompareNumberPrivate *priv = ZAK_FORM_VALIDATOR_COMPARE_NUMBER_GET_PRIVATE (validator); + ZakFormValidatorCompareNumberPrivate *priv = zak_form_validator_compare_number_get_instance_private (validator); zak_form_get_compare_type_stringify (priv->type); } @@ -178,7 +174,7 @@ const gchar void zak_form_validator_compare_number_set_element1 (ZakFormValidatorCompareNumber *validator, ZakFormForm *form, const gchar *element1) { - ZakFormValidatorCompareNumberPrivate *priv = ZAK_FORM_VALIDATOR_COMPARE_NUMBER_GET_PRIVATE (validator); + ZakFormValidatorCompareNumberPrivate *priv = zak_form_validator_compare_number_get_instance_private (validator); priv->v1 = zak_form_form_get_element_by_id (form, element1); if (!ZAK_FORM_IS_ELEMENT (priv->v1)) @@ -196,7 +192,7 @@ zak_form_validator_compare_number_set_element1 (ZakFormValidatorCompareNumber *v const gchar *zak_form_validator_compare_number_get_element1 (ZakFormValidatorCompareNumber *validator) { - ZakFormValidatorCompareNumberPrivate *priv = ZAK_FORM_VALIDATOR_COMPARE_NUMBER_GET_PRIVATE (validator); + ZakFormValidatorCompareNumberPrivate *priv = zak_form_validator_compare_number_get_instance_private (validator); if (ZAK_FORM_IS_ELEMENT (priv->v2)) { @@ -218,7 +214,7 @@ const gchar void zak_form_validator_compare_number_set_element2 (ZakFormValidatorCompareNumber *validator, ZakFormForm *form, const gchar *element2) { - ZakFormValidatorCompareNumberPrivate *priv = ZAK_FORM_VALIDATOR_COMPARE_NUMBER_GET_PRIVATE (validator); + ZakFormValidatorCompareNumberPrivate *priv = zak_form_validator_compare_number_get_instance_private (validator); priv->v2 = zak_form_form_get_element_by_id (form, element2); if (!ZAK_FORM_IS_ELEMENT (priv->v2)) @@ -236,7 +232,7 @@ zak_form_validator_compare_number_set_element2 (ZakFormValidatorCompareNumber *v const gchar *zak_form_validator_compare_number_get_element2 (ZakFormValidatorCompareNumber *validator) { - ZakFormValidatorCompareNumberPrivate *priv = ZAK_FORM_VALIDATOR_COMPARE_NUMBER_GET_PRIVATE (validator); + ZakFormValidatorCompareNumberPrivate *priv = zak_form_validator_compare_number_get_instance_private (validator); if (ZAK_FORM_IS_ELEMENT (priv->v2)) { @@ -256,7 +252,7 @@ zak_form_validator_compare_number_set_property (GObject *object, GParamSpec *pspec) { ZakFormValidatorCompareNumber *validator = (ZakFormValidatorCompareNumber *)object; - ZakFormValidatorCompareNumberPrivate *priv = ZAK_FORM_VALIDATOR_COMPARE_NUMBER_GET_PRIVATE (validator); + ZakFormValidatorCompareNumberPrivate *priv = zak_form_validator_compare_number_get_instance_private (validator); switch (property_id) { @@ -273,7 +269,7 @@ zak_form_validator_compare_number_get_property (GObject *object, GParamSpec *pspec) { ZakFormValidatorCompareNumber *validator = (ZakFormValidatorCompareNumber *)object; - ZakFormValidatorCompareNumberPrivate *priv = ZAK_FORM_VALIDATOR_COMPARE_NUMBER_GET_PRIVATE (validator); + ZakFormValidatorCompareNumberPrivate *priv = zak_form_validator_compare_number_get_instance_private (validator); switch (property_id) { @@ -287,7 +283,7 @@ static void zak_form_validator_compare_number_dispose (GObject *gobject) { ZakFormValidatorCompareNumber *validator = (ZakFormValidatorCompareNumber *)gobject; - ZakFormValidatorCompareNumberPrivate *priv = ZAK_FORM_VALIDATOR_COMPARE_NUMBER_GET_PRIVATE (validator); + ZakFormValidatorCompareNumberPrivate *priv = zak_form_validator_compare_number_get_instance_private (validator); @@ -299,7 +295,7 @@ static void zak_form_validator_compare_number_finalize (GObject *gobject) { ZakFormValidatorCompareNumber *validator = (ZakFormValidatorCompareNumber *)gobject; - ZakFormValidatorCompareNumberPrivate *priv = ZAK_FORM_VALIDATOR_COMPARE_NUMBER_GET_PRIVATE (validator); + ZakFormValidatorCompareNumberPrivate *priv = zak_form_validator_compare_number_get_instance_private (validator); @@ -318,7 +314,7 @@ zak_form_validator_compare_number_validate (ZakFormValidator *validator) gint comp; gchar *msg; - ZakFormValidatorCompareNumberPrivate *priv = ZAK_FORM_VALIDATOR_COMPARE_NUMBER_GET_PRIVATE (validator); + ZakFormValidatorCompareNumberPrivate *priv = zak_form_validator_compare_number_get_instance_private (ZAK_FORM_VALIDATOR_COMPARE_NUMBER (validator)); ret = FALSE; @@ -369,7 +365,7 @@ static void zak_form_validator_compare_number_get_xml (ZakFormValidator *validator, xmlNode *xnode, const gchar *version) { ZakFormValidatorCompareNumber *validator_compare_number = ZAK_FORM_VALIDATOR_COMPARE_NUMBER (validator); - ZakFormValidatorCompareNumberPrivate *priv = ZAK_FORM_VALIDATOR_COMPARE_NUMBER_GET_PRIVATE (validator_compare_number); + ZakFormValidatorCompareNumberPrivate *priv = zak_form_validator_compare_number_get_instance_private (validator_compare_number); xmlSetProp (xnode, (const xmlChar *)"type", (const xmlChar *)"zak_form_validator_compare_number"); diff --git a/src/formvalidatorcomposite.c b/src/formvalidatorcomposite.c index 66be402..599dab9 100644 --- a/src/formvalidatorcomposite.c +++ b/src/formvalidatorcomposite.c @@ -56,15 +56,13 @@ struct _ZakFormValidatorComposite /* Other members, including private data. */ }; -#define ZAK_FORM_VALIDATOR_COMPOSITE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ZAK_FORM_TYPE_VALIDATOR_COMPOSITE, ZakFormValidatorCompositePrivate)) - typedef struct _ZakFormValidatorCompositePrivate ZakFormValidatorCompositePrivate; struct _ZakFormValidatorCompositePrivate { GNode *tree; }; -G_DEFINE_TYPE (ZakFormValidatorComposite, zak_form_validator_composite, ZAK_FORM_TYPE_VALIDATOR) +G_DEFINE_TYPE_WITH_PRIVATE (ZakFormValidatorComposite, zak_form_validator_composite, ZAK_FORM_TYPE_VALIDATOR) typedef enum { @@ -96,14 +94,12 @@ zak_form_validator_composite_class_init (ZakFormValidatorCompositeClass *class) parent_class->xml_parsing = zak_form_validator_composite_xml_parsing; parent_class->validate = zak_form_validator_composite_validate; - - g_type_class_add_private (object_class, sizeof (ZakFormValidatorCompositePrivate)); } static void zak_form_validator_composite_init (ZakFormValidatorComposite *validator) { - ZakFormValidatorCompositePrivate *priv = ZAK_FORM_VALIDATOR_COMPOSITE_GET_PRIVATE (validator); + ZakFormValidatorCompositePrivate *priv = zak_form_validator_composite_get_instance_private (validator); priv->tree = NULL; } @@ -128,7 +124,7 @@ _zak_form_validator_composite_xml_parsing (ZakFormValidator *validator, xmlNode { xmlNode *cur; - ZakFormValidatorCompositePrivate *priv = ZAK_FORM_VALIDATOR_COMPOSITE_GET_PRIVATE (validator); + ZakFormValidatorCompositePrivate *priv = zak_form_validator_composite_get_instance_private (ZAK_FORM_VALIDATOR_COMPOSITE (validator)); cur = xnode->children; while (cur) @@ -328,7 +324,7 @@ static gboolean zak_form_validator_composite_xml_parsing (ZakFormValidator *validator, xmlNode *xnode, gpointer form) { - ZakFormValidatorCompositePrivate *priv = ZAK_FORM_VALIDATOR_COMPOSITE_GET_PRIVATE (validator); + ZakFormValidatorCompositePrivate *priv = zak_form_validator_composite_get_instance_private (ZAK_FORM_VALIDATOR_COMPOSITE (validator)); _zak_form_validator_composite_xml_parsing (validator, xnode, (ZakFormForm *)form, NULL); @@ -343,7 +339,7 @@ zak_form_validator_composite_set_property (GObject *object, GParamSpec *pspec) { ZakFormValidatorComposite *validator = (ZakFormValidatorComposite *)object; - ZakFormValidatorCompositePrivate *priv = ZAK_FORM_VALIDATOR_COMPOSITE_GET_PRIVATE (validator); + ZakFormValidatorCompositePrivate *priv = zak_form_validator_composite_get_instance_private (validator); switch (property_id) { @@ -360,7 +356,7 @@ zak_form_validator_composite_get_property (GObject *object, GParamSpec *pspec) { ZakFormValidatorComposite *validator = (ZakFormValidatorComposite *)object; - ZakFormValidatorCompositePrivate *priv = ZAK_FORM_VALIDATOR_COMPOSITE_GET_PRIVATE (validator); + ZakFormValidatorCompositePrivate *priv = zak_form_validator_composite_get_instance_private (validator); switch (property_id) { @@ -374,7 +370,7 @@ static void zak_form_validator_composite_dispose (GObject *gobject) { ZakFormValidatorComposite *validator = (ZakFormValidatorComposite *)gobject; - ZakFormValidatorCompositePrivate *priv = ZAK_FORM_VALIDATOR_COMPOSITE_GET_PRIVATE (validator); + ZakFormValidatorCompositePrivate *priv = zak_form_validator_composite_get_instance_private (validator); @@ -386,7 +382,7 @@ static void zak_form_validator_composite_finalize (GObject *gobject) { ZakFormValidatorComposite *validator = (ZakFormValidatorComposite *)gobject; - ZakFormValidatorCompositePrivate *priv = ZAK_FORM_VALIDATOR_COMPOSITE_GET_PRIVATE (validator); + ZakFormValidatorCompositePrivate *priv = zak_form_validator_composite_get_instance_private (validator); @@ -531,7 +527,7 @@ zak_form_validator_composite_validate (ZakFormValidator *validator) { gboolean ret; - ZakFormValidatorCompositePrivate *priv = ZAK_FORM_VALIDATOR_COMPOSITE_GET_PRIVATE (validator); + ZakFormValidatorCompositePrivate *priv = zak_form_validator_composite_get_instance_private (ZAK_FORM_VALIDATOR_COMPOSITE (validator)); if (priv->tree != NULL) {