--- /dev/null
+From: Andrea Zagli <azagli@libero.it>
+Date: Fri, 27 May 2016 10:13:19 +0200
+Subject: Glib old version - gobject macro.
+
+---
+ src/form.h | 17 ++++++++++++++---
+ src/formelement.h | 16 ++++++++++++++--
+ src/formelementfilter.h | 16 ++++++++++++++--
+ src/formelementfilterluc.h | 21 +++++++++++++++++++--
+ src/formelementfiltertrim.h | 22 ++++++++++++++++++++--
+ src/formelementvalidator.h | 16 ++++++++++++++--
+ src/formelementvalidatordate.h | 21 +++++++++++++++++++--
+ src/formelementvalidatornotempty.h | 21 +++++++++++++++++++--
+ src/formelementvalidatorregex.h | 21 +++++++++++++++++++--
+ src/formiprovider.h | 11 +++++++++--
+ src/formvalidator.h | 16 ++++++++++++++--
+ src/formvalidatorcompare.h | 22 ++++++++++++++++++++--
+ src/formvalidatorcomparedate.h | 21 +++++++++++++++++++--
+ 13 files changed, 214 insertions(+), 27 deletions(-)
+
+diff --git a/src/form.h b/src/form.h
+index e97ca2a..5e02300 100644
+--- a/src/form.h
++++ b/src/form.h
+@@ -31,9 +31,20 @@
+
+ G_BEGIN_DECLS
+
+-
+-#define ZAK_FORM_TYPE_FORM zak_form_form_get_type ()
+-G_DECLARE_DERIVABLE_TYPE (ZakFormForm, zak_form_form, ZAK_FORM, FORM, GObject)
++#define ZAK_FORM_TYPE_FORM (zak_form_form_get_type ())
++#define ZAK_FORM_FORM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ZAK_FORM_TYPE_FORM, ZakFormForm))
++#define ZAK_FORM_FORM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ZAK_FORM_TYPE_FORM, ZakFormFormClass))
++#define ZAK_FORM_IS_FORM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ZAK_FORM_TYPE_FORM))
++#define ZAK_FORM_IS_FORM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ZAK_FORM_TYPE_FORM))
++#define ZAK_FORM_FORM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ZAK_FORM_TYPE_FORM, ZakFormFormClass))
++
++typedef struct _ZakFormForm ZakFormForm;
++typedef struct _ZakFormFormClass ZakFormFormClass;
++
++struct _ZakFormForm
++ {
++ GObject parent;
++ };
+
+ struct _ZakFormFormClass
+ {
+diff --git a/src/formelement.h b/src/formelement.h
+index a3489d4..87b6d2d 100644
+--- a/src/formelement.h
++++ b/src/formelement.h
+@@ -31,8 +31,20 @@
+ G_BEGIN_DECLS
+
+
+-#define ZAK_FORM_TYPE_ELEMENT zak_form_element_get_type ()
+-G_DECLARE_DERIVABLE_TYPE (ZakFormElement, zak_form_element, ZAK_FORM, ELEMENT, GObject)
++#define ZAK_FORM_TYPE_ELEMENT (zak_form_element_get_type ())
++#define ZAK_FORM_ELEMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ZAK_FORM_TYPE_ELEMENT, ZakFormElement))
++#define ZAK_FORM_ELEMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ZAK_FORM_TYPE_ELEMENT, ZakFormElementClass))
++#define ZAK_FORM_IS_ELEMENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ZAK_FORM_TYPE_ELEMENT))
++#define ZAK_FORM_IS_ELEMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ZAK_FORM_TYPE_ELEMENT))
++#define ZAK_FORM_ELEMENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ZAK_FORM_TYPE_ELEMENT, ZakFormElementClass))
++
++typedef struct _ZakFormElement ZakFormElement;
++typedef struct _ZakFormElementClass ZakFormElementClass;
++
++struct _ZakFormElement
++ {
++ GObject parent;
++ };
+
+ struct _ZakFormElementClass
+ {
+diff --git a/src/formelementfilter.h b/src/formelementfilter.h
+index cc92929..81ac6e1 100644
+--- a/src/formelementfilter.h
++++ b/src/formelementfilter.h
+@@ -25,8 +25,20 @@
+ G_BEGIN_DECLS
+
+
+-#define ZAK_FORM_TYPE_ELEMENT_FILTER zak_form_element_filter_get_type ()
+-G_DECLARE_DERIVABLE_TYPE (ZakFormElementFilter, zak_form_element_filter, ZAK_FORM, ELEMENT_FILTER, GObject)
++#define ZAK_FORM_TYPE_ELEMENT_FILTER (zak_form_element_filter_get_type ())
++#define ZAK_FORM_ELEMENT_FILTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ZAK_FORM_TYPE_ELEMENT_FILTER, ZakFormElementFilter))
++#define ZAK_FORM_ELEMENT_FILTER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ZAK_FORM_TYPE_ELEMENT_FILTER, ZakFormElementFilterClass))
++#define ZAK_FORM_IS_ELEMENT_FILTER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ZAK_FORM_TYPE_ELEMENT_FILTER))
++#define ZAK_FORM_IS_ELEMENT_FILTER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ZAK_FORM_TYPE_ELEMENT_FILTER))
++#define ZAK_FORM_ELEMENT_FILTER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ZAK_FORM_TYPE_ELEMENT_FILTER, ZakFormElementFilterClass))
++
++typedef struct _ZakFormElementFilter ZakFormElementFilter;
++typedef struct _ZakFormElementFilterClass ZakFormElementFilterClass;
++
++struct _ZakFormElementFilter
++ {
++ GObject parent;
++ };
+
+ struct _ZakFormElementFilterClass
+ {
+diff --git a/src/formelementfilterluc.h b/src/formelementfilterluc.h
+index eb00250..4c91a79 100644
+--- a/src/formelementfilterluc.h
++++ b/src/formelementfilterluc.h
+@@ -30,8 +30,25 @@
+ G_BEGIN_DECLS
+
+
+-#define ZAK_FORM_TYPE_ELEMENT_FILTER_LUC zak_form_element_filter_luc_get_type ()
+-G_DECLARE_FINAL_TYPE (ZakFormElementFilterLuc, zak_form_element_filter_luc, ZAK_FORM, ELEMENT_FILTER_LUC, ZakFormElementFilter)
++#define ZAK_FORM_TYPE_ELEMENT_FILTER_LUC (zak_form_element_filter_luc_get_type ())
++#define ZAK_FORM_ELEMENT_FILTER_LUC(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ZAK_FORM_TYPE_ELEMENT_FILTER_LUC, ZakFormElementFilterLuc))
++#define ZAK_FORM_ELEMENT_FILTER_LUC_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ZAK_FORM_TYPE_ELEMENT_FILTER_LUC, ZakFormElementFilterLucClass))
++#define ZAK_FORM_IS_ELEMENT_FILTER_LUC(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ZAK_FORM_TYPE_ELEMENT_FILTER_LUC))
++#define ZAK_FORM_IS_ELEMENT_FILTER_LUC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ZAK_FORM_TYPE_ELEMENT_FILTER_LUC))
++#define ZAK_FORM_ELEMENT_FILTER_LUC_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ZAK_FORM_TYPE_ELEMENT_FILTER_LUC, ZakFormElementFilterLucClass))
++
++typedef struct _ZakFormElementFilterLuc ZakFormElementFilterLuc;
++typedef struct _ZakFormElementFilterLucClass ZakFormElementFilterLucClass;
++
++struct _ZakFormElementFilterLuc
++ {
++ ZakFormElementFilter parent;
++ };
++
++struct _ZakFormElementFilterLucClass
++{
++ ZakFormElementFilterClass parent_cleass;
++};
+
+ ZakFormElementFilterLuc *zak_form_element_filter_luc_new (void);
+ gboolean zak_form_element_filter_luc_xml_parsing (ZakFormElementFilter *filter, xmlNode *xnode);
+diff --git a/src/formelementfiltertrim.h b/src/formelementfiltertrim.h
+index d74e0bf..0cb37e8 100644
+--- a/src/formelementfiltertrim.h
++++ b/src/formelementfiltertrim.h
+@@ -30,8 +30,26 @@
+ G_BEGIN_DECLS
+
+
+-#define ZAK_FORM_TYPE_ELEMENT_FILTER_TRIM zak_form_element_filter_trim_get_type ()
+-G_DECLARE_FINAL_TYPE (ZakFormElementFilterTrim, zak_form_element_filter_trim, ZAK_FORM, ELEMENT_FILTER_TRIM, ZakFormElementFilter)
++#define ZAK_FORM_TYPE_ELEMENT_FILTER_TRIM (zak_form_element_filter_trim_get_type ())
++#define ZAK_FORM_ELEMENT_FILTER_TRIM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ZAK_FORM_TYPE_ELEMENT_FILTER_TRIM, ZakFormElementFilterTrim))
++#define ZAK_FORM_ELEMENT_FILTER_TRIM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ZAK_FORM_TYPE_ELEMENT_FILTER_TRIM, ZakFormElementFilterTrimClass))
++#define ZAK_FORM_IS_ELEMENT_FILTER_TRIM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ZAK_FORM_TYPE_ELEMENT_FILTER_TRIM))
++#define ZAK_FORM_IS_ELEMENT_FILTER_TRIM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ZAK_FORM_TYPE_ELEMENT_FILTER_TRIM))
++#define ZAK_FORM_ELEMENT_FILTER_TRIM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ZAK_FORM_TYPE_ELEMENT_FILTER_TRIM, ZakFormElementFilterTrimClass))
++
++typedef struct _ZakFormElementFilterTrim ZakFormElementFilterTrim;
++typedef struct _ZakFormElementFilterTrimClass ZakFormElementFilterTrimClass;
++
++struct _ZakFormElementFilterTrim
++ {
++ ZakFormElementFilter parent;
++ };
++
++struct _ZakFormElementFilterTrimClass
++{
++ ZakFormElementFilterClass parent_cleass;
++};
++
+
+ ZakFormElementFilterTrim *zak_form_element_filter_trim_new (void);
+ gboolean zak_form_element_filter_trim_xml_parsing (ZakFormElementFilter *filter, xmlNode *xnode);
+diff --git a/src/formelementvalidator.h b/src/formelementvalidator.h
+index 06ab451..b27662a 100644
+--- a/src/formelementvalidator.h
++++ b/src/formelementvalidator.h
+@@ -25,8 +25,20 @@
+ G_BEGIN_DECLS
+
+
+-#define ZAK_FORM_TYPE_ELEMENT_VALIDATOR zak_form_element_validator_get_type ()
+-G_DECLARE_DERIVABLE_TYPE (ZakFormElementValidator, zak_form_element_validator, ZAK_FORM, ELEMENT_VALIDATOR, GObject)
++#define ZAK_FORM_TYPE_ELEMENT_VALIDATOR (zak_form_element_validator_get_type ())
++#define ZAK_FORM_ELEMENT_VALIDATOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ZAK_FORM_TYPE_ELEMENT_VALIDATOR, ZakFormElementValidator)
++#define ZAK_FORM_ELEMENT_VALIDATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ZAK_FORM_TYPE_ELEMENT_VALIDATOR, ZakFormElementValidatorClass))
++#define ZAK_FORM_IS_ELEMENT_VALIDATOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ZAK_FORM_TYPE_ELEMENT_VALIDATOR))
++#define ZAK_FORM_IS_ELEMENT_VALIDATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ZAK_FORM_TYPE_ELEMENT_VALIDATOR))
++#define ZAK_FORM_ELEMENT_VALIDATOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ZAK_FORM_TYPE_ELEMENT_VALIDATOR, ZakFormElementValidatorClass))
++
++typedef struct _ZakFormElementValidator ZakFormElementValidator;
++typedef struct _ZakFormElementValidatorClass ZakFormElementValidatorClass;
++
++struct _ZakFormElementValidator
++ {
++ GObject parent;
++ };
+
+ struct _ZakFormElementValidatorClass
+ {
+diff --git a/src/formelementvalidatordate.h b/src/formelementvalidatordate.h
+index accea52..be0ae89 100644
+--- a/src/formelementvalidatordate.h
++++ b/src/formelementvalidatordate.h
+@@ -30,8 +30,25 @@
+ G_BEGIN_DECLS
+
+
+-#define ZAK_TYPE_FORM_ELEMENT_VALIDATOR_DATE zak_form_element_validator_date_get_type ()
+-G_DECLARE_FINAL_TYPE (ZakFormElementValidatorDate, zak_form_element_validator_date, ZAK_FORM, ELEMENT_VALIDATOR_DATE, ZakFormElementValidator)
++#define ZAK_FORM_TYPE_ELEMENT_VALIDATOR_DATE (zak_form_element_validator_date_get_type ())
++#define ZAK_FORM_ELEMENT_VALIDATOR_DATE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ZAK_FORM_TYPE_ELEMENT_VALIDATOR_DATE, ZakFormElementValidatorDate)
++#define ZAK_FORM_ELEMENT_VALIDATOR_DATE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ZAK_FORM_TYPE_ELEMENT_VALIDATOR_DATE, ZakFormElementValidatorDateClass))
++#define ZAK_FORM_IS_ELEMENT_VALIDATOR_DATE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ZAK_FORM_TYPE_ELEMENT_VALIDATOR_DATE))
++#define ZAK_FORM_IS_ELEMENT_VALIDATOR_DATE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ZAK_FORM_TYPE_ELEMENT_VALIDATOR_DATE))
++#define ZAK_FORM_ELEMENT_VALIDATOR_DATE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ZAK_FORM_TYPE_ELEMENT_VALIDATOR_DATE, ZakFormElementValidatorDateClass))
++
++typedef struct _ZakFormElementValidatorDate ZakFormElementValidatorDate;
++typedef struct _ZakFormElementValidatorDateClass ZakFormElementValidatorDateClass;
++
++struct _ZakFormElementValidatorDate
++ {
++ ZakFormElementValidator parent;
++ };
++
++struct _ZakFormElementValidatorDateClass
++{
++ ZakFormElementValidatorClass parent_class;
++};
+
+ ZakFormElementValidatorDate *zak_form_element_validator_date_new (void);
+
+diff --git a/src/formelementvalidatornotempty.h b/src/formelementvalidatornotempty.h
+index b4885bf..3adcccc 100644
+--- a/src/formelementvalidatornotempty.h
++++ b/src/formelementvalidatornotempty.h
+@@ -30,8 +30,25 @@
+ G_BEGIN_DECLS
+
+
+-#define ZAK_TYPE_FORM_ELEMENT_VALIDATOR_NOTEMPTY zak_form_element_validator_notempty_get_type ()
+-G_DECLARE_FINAL_TYPE (ZakFormElementValidatorNotempty, zak_form_element_validator_notempty, ZAK_FORM, ELEMENT_VALIDATOR_NOTEMPTY, ZakFormElementValidator)
++#define ZAK_FORM_TYPE_ELEMENT_VALIDATOR_NOTEMPTY (zak_form_element_validator_notempty_get_type ())
++#define ZAK_FORM_ELEMENT_VALIDATOR_NOTEMPTY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ZAK_FORM_TYPE_ELEMENT_VALIDATOR_NOTEMPTY, ZakFormElementValidatorNotempty)
++#define ZAK_FORM_ELEMENT_VALIDATOR_NOTEMPTY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ZAK_FORM_TYPE_ELEMENT_VALIDATOR_NOTEMPTY, ZakFormElementValidatorNotemptyClass))
++#define ZAK_FORM_IS_ELEMENT_VALIDATOR_NOTEMPTY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ZAK_FORM_TYPE_ELEMENT_VALIDATOR_NOTEMPTY))
++#define ZAK_FORM_IS_ELEMENT_VALIDATOR_NOTEMPTY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ZAK_FORM_TYPE_ELEMENT_VALIDATOR_NOTEMPTY))
++#define ZAK_FORM_ELEMENT_VALIDATOR_NOTEMPTY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ZAK_FORM_TYPE_ELEMENT_VALIDATOR_NOTEMPTY, ZakFormElementValidatorNotemptyClass))
++
++typedef struct _ZakFormElementValidatorNotempty ZakFormElementValidatorNotempty;
++typedef struct _ZakFormElementValidatorNotemptyClass ZakFormElementValidatorNotemptyClass;
++
++struct _ZakFormElementValidatorNotempty
++ {
++ ZakFormElementValidator parent;
++ };
++
++struct _ZakFormElementValidatorNotemptyClass
++{
++ ZakFormElementValidatorClass parent_class;
++};
+
+ ZakFormElementValidatorNotempty *zak_form_element_validator_notempty_new (void);
+ gboolean zak_form_element_validator_notempty_xml_parsing (ZakFormElementValidator *validator, xmlNode *xnode);
+diff --git a/src/formelementvalidatorregex.h b/src/formelementvalidatorregex.h
+index 3ed9948..eefb814 100644
+--- a/src/formelementvalidatorregex.h
++++ b/src/formelementvalidatorregex.h
+@@ -30,8 +30,25 @@
+ G_BEGIN_DECLS
+
+
+-#define ZAK_TYPE_FORM_ELEMENT_VALIDATOR_REGEX zak_form_element_validator_regex_get_type ()
+-G_DECLARE_FINAL_TYPE (ZakFormElementValidatorRegex, zak_form_element_validator_regex, ZAK_FORM, ELEMENT_VALIDATOR_REGEX, ZakFormElementValidator)
++#define ZAK_FORM_TYPE_ELEMENT_VALIDATOR_REGEX (zak_form_element_validator_regex_get_type ())
++#define ZAK_FORM_ELEMENT_VALIDATOR_REGEX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ZAK_FORM_TYPE_ELEMENT_VALIDATOR_REGEX, ZakFormElementValidatorRegex)
++#define ZAK_FORM_ELEMENT_VALIDATOR_REGEX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ZAK_FORM_TYPE_ELEMENT_VALIDATOR_REGEX, ZakFormElementValidatorRegexClass))
++#define ZAK_FORM_IS_ELEMENT_VALIDATOR_REGEX(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ZAK_FORM_TYPE_ELEMENT_VALIDATOR_REGEX))
++#define ZAK_FORM_IS_ELEMENT_VALIDATOR_REGEX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ZAK_FORM_TYPE_ELEMENT_VALIDATOR_REGEX))
++#define ZAK_FORM_ELEMENT_VALIDATOR_REGEX_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ZAK_FORM_TYPE_ELEMENT_VALIDATOR_REGEX, ZakFormElementValidatorRegexClass))
++
++typedef struct _ZakFormElementValidatorRegex ZakFormElementValidatorRegex;
++typedef struct _ZakFormElementValidatorRegexClass ZakFormElementValidatorRegexClass;
++
++struct _ZakFormElementValidatorRegex
++ {
++ ZakFormElementValidator parent;
++ };
++
++struct _ZakFormElementValidatorRegexClass
++{
++ ZakFormElementValidatorClass parent_class;
++};
+
+ ZakFormElementValidatorRegex *zak_form_element_validator_regex_new (void);
+ gboolean zak_form_element_validator_regex_xml_parsing (ZakFormElementValidator *validator, xmlNode *xnode);
+diff --git a/src/formiprovider.h b/src/formiprovider.h
+index cabb51e..be970ae 100644
+--- a/src/formiprovider.h
++++ b/src/formiprovider.h
+@@ -25,8 +25,15 @@
+ G_BEGIN_DECLS
+
+
+-#define ZAK_FORM_TYPE_IPROVIDER zak_form_iprovider_get_type ()
+-G_DECLARE_INTERFACE (ZakFormIProvider, zak_form_iprovider, ZAK_FORM, IPROVIDER, GObject)
++#define ZAK_FORM_TYPE_IPROVIDER (zak_form_iprovider_get_type ())
++#define ZAK_FORM_IPROVIDER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FORM_TYPE_IPROVIDER, ZakFormIprovider))
++#define ZAK_FORM_IPROVIDER_IFACE(obj) (G_TYPE_CHECK_CLASS_CAST ((obj), ZAK_FORM_TYPE_IPROVIDER, ZakFormIproviderInterface))
++#define ZAK_FORM_IS_IPROVIDER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ZAK_FORM_TYPE_IPROVIDER))
++#define ZAK_FORM_IPROVIDER_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ZAK_FORM_TYPE_IPROVIDER, ZakFormIproviderInterface))
++
++
++typedef struct _ZakFormIProvider ZakFormIProvider;
++typedef struct _ZakFormIProviderInterface ZakFormIProviderInterface;
+
+ struct _ZakFormIProviderInterface
+ {
+diff --git a/src/formvalidator.h b/src/formvalidator.h
+index c80677b..5c5cd9b 100644
+--- a/src/formvalidator.h
++++ b/src/formvalidator.h
+@@ -25,8 +25,20 @@
+ G_BEGIN_DECLS
+
+
+-#define ZAK_FORM_TYPE_VALIDATOR zak_form_validator_get_type ()
+-G_DECLARE_DERIVABLE_TYPE (ZakFormValidator, zak_form_validator, ZAK_FORM, VALIDATOR, GObject)
++#define ZAK_FORM_TYPE_VALIDATOR (zak_form_validator_get_type ())
++#define ZAK_FORM_VALIDATOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ZAK_FORM_TYPE_VALIDATOR, ZakFormValidator)
++#define ZAK_FORM_VALIDATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ZAK_FORM_TYPE_VALIDATOR, ZakFormValidatorClass))
++#define ZAK_FORM_IS_VALIDATOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ZAK_FORM_TYPE_VALIDATOR))
++#define ZAK_FORM_IS_VALIDATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ZAK_FORM_TYPE_VALIDATOR))
++#define ZAK_FORM_VALIDATOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ZAK_FORM_TYPE_VALIDATOR, ZakFormValidatorClass))
++
++typedef struct _ZakFormValidator ZakFormValidator;
++typedef struct _ZakFormValidatorClass ZakFormValidatorClass;
++
++struct _ZakFormValidator
++ {
++ GObject parent;
++ };
+
+ struct _ZakFormValidatorClass
+ {
+diff --git a/src/formvalidatorcompare.h b/src/formvalidatorcompare.h
+index 02139d0..d4ab5ac 100644
+--- a/src/formvalidatorcompare.h
++++ b/src/formvalidatorcompare.h
+@@ -30,8 +30,26 @@
+ G_BEGIN_DECLS
+
+
+-#define ZAK_FORM_TYPE_VALIDATOR_COMPARE zak_form_validator_compare_get_type ()
+-G_DECLARE_FINAL_TYPE (ZakFormValidatorCompare, zak_form_validator_compare, ZAK_FORM, VALIDATOR_COMPARE, ZakFormValidator)
++#define ZAK_FORM_TYPE_VALIDATOR_COMPARE (zak_form_validator_compare_get_type ())
++#define ZAK_FORM_VALIDATOR_COMPARE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ZAK_FORM_TYPE_VALIDATOR_COMPARE, ZakFormValidatorCompare)
++#define ZAK_FORM_VALIDATOR_COMPARE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ZAK_FORM_TYPE_VALIDATOR_COMPARE, ZakFormValidatorCompareClass))
++#define ZAK_FORM_IS_VALIDATOR_COMPARE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ZAK_FORM_TYPE_VALIDATOR_COMPARE))
++#define ZAK_FORM_IS_VALIDATOR_COMPARE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ZAK_FORM_TYPE_VALIDATOR_COMPARE))
++#define ZAK_FORM_VALIDATOR_COMPARE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ZAK_FORM_TYPE_VALIDATOR_COMPARE, ZakFormValidatorCompareClass))
++
++typedef struct _ZakFormValidatorCompare ZakFormValidatorCompare;
++typedef struct _ZakFormValidatorCompareClass ZakFormValidatorCompareClass;
++
++struct _ZakFormValidatorCompare
++ {
++ ZakFormValidator parent;
++ };
++
++struct _ZakFormValidatorCompareClass
++{
++ ZakFormValidatorClass parent_class;
++};
++
+
+ ZakFormValidatorCompare *zak_form_validator_compare_new (void);
+ gboolean zak_form_validator_compare_xml_parsing (ZakFormValidator *validator, xmlNode *xnode, GPtrArray *ar_elements);
+diff --git a/src/formvalidatorcomparedate.h b/src/formvalidatorcomparedate.h
+index c8940ca..ec11584 100644
+--- a/src/formvalidatorcomparedate.h
++++ b/src/formvalidatorcomparedate.h
+@@ -30,8 +30,25 @@
+ G_BEGIN_DECLS
+
+
+-#define ZAK_FORM_TYPE_VALIDATOR_COMPARE_DATE zak_form_validator_compare_date_get_type ()
+-G_DECLARE_FINAL_TYPE (ZakFormValidatorCompareDate, zak_form_validator_compare_date, ZAK_FORM, VALIDATOR_COMPARE_DATE, ZakFormValidator)
++#define ZAK_FORM_TYPE_VALIDATOR_COMPARE_DATE (zak_form_validator_compare_date_get_type ())
++#define ZAK_FORM_VALIDATOR_COMPARE_DATE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ZAK_FORM_TYPE_VALIDATOR_COMPARE_DATE, ZakFormValidatorCompareDate)
++#define ZAK_FORM_VALIDATOR_COMPARE_DATE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ZAK_FORM_TYPE_VALIDATOR_COMPARE_DATE, ZakFormValidatorCompareDateClass))
++#define ZAK_FORM_IS_VALIDATOR_COMPARE_DATE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ZAK_FORM_TYPE_VALIDATOR_COMPARE_DATE))
++#define ZAK_FORM_IS_VALIDATOR_COMPARE_DATE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ZAK_FORM_TYPE_VALIDATOR_COMPARE_DATE))
++#define ZAK_FORM_VALIDATOR_COMPARE_DATE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ZAK_FORM_TYPE_VALIDATOR_COMPARE_DATE, ZakFormValidatorCompareDateClass))
++
++typedef struct _ZakFormValidatorCompareDate ZakFormValidatorCompareDate;
++typedef struct _ZakFormValidatorCompareDateClass ZakFormValidatorCompareDateClass;
++
++struct _ZakFormValidatorCompareDate
++ {
++ ZakFormValidator parent;
++ };
++
++struct _ZakFormValidatorCompareDateClass
++{
++ ZakFormValidatorClass parent_class;
++};
+
+ ZakFormValidatorCompareDate *zak_form_validator_compare_date_new (void);
+ gboolean zak_form_validator_compare_date_xml_parsing (ZakFormValidator *validator, xmlNode *xnode, GPtrArray *ar_elements);
--- /dev/null
+From: Andrea Zagli <azagli@libero.it>
+Date: Fri, 27 May 2016 10:54:40 +0200
+Subject: Glib old version - private.
+
+---
+ src/form.c | 48 +++++++++++++------------
+ src/formelement.c | 74 ++++++++++++++++++++------------------
+ src/formelementfilterluc.c | 7 ----
+ src/formelementfiltertrim.c | 7 ----
+ src/formelementvalidator.c | 18 ++++++----
+ src/formelementvalidatordate.c | 9 +----
+ src/formelementvalidatordate.h | 2 +-
+ src/formelementvalidatornotempty.c | 9 +----
+ src/formelementvalidatornotempty.h | 2 +-
+ src/formelementvalidatorregex.c | 9 +----
+ src/formelementvalidatorregex.h | 2 +-
+ src/formiprovider.h | 6 ++--
+ src/formvalidator.c | 20 ++++++-----
+ src/formvalidatorcompare.c | 7 ----
+ src/formvalidatorcompare.h | 2 +-
+ src/formvalidatorcomparedate.c | 7 ----
+ src/formvalidatorcomparedate.h | 2 +-
+ 17 files changed, 99 insertions(+), 132 deletions(-)
+
+diff --git a/src/form.c b/src/form.c
+index a173097..bdb23a3 100644
+--- a/src/form.c
++++ b/src/form.c
+@@ -60,6 +60,8 @@ static void zak_form_form_finalize (GObject *gobject);
+ static void zak_form_form_load_modules (ZakFormForm *zakform);
+ static GPtrArray *zak_form_form_get_elements (ZakFormForm *zakform);
+
++#define ZAK_FORM_FORM_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ZAK_FORM_TYPE_FORM, ZakFormFormPrivate))
++
+ typedef struct
+ {
+ GPtrArray *ar_modules;
+@@ -68,7 +70,7 @@ typedef struct
+ GPtrArray *ar_messages;
+ } ZakFormFormPrivate;
+
+-G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (ZakFormForm, zak_form_form, G_TYPE_OBJECT)
++G_DEFINE_ABSTRACT_TYPE (ZakFormForm, zak_form_form, G_TYPE_OBJECT)
+
+ #ifdef G_OS_WIN32
+ static HMODULE backend_dll = NULL;
+@@ -104,6 +106,8 @@ zak_form_form_class_init (ZakFormFormClass *class)
+ object_class->dispose = zak_form_form_dispose;
+ object_class->finalize = zak_form_form_finalize;
+
++ g_type_class_add_private (object_class, sizeof (ZakFormFormPrivate));
++
+ class->get_elements = zak_form_form_get_elements;
+ }
+
+@@ -172,7 +176,7 @@ zak_form_form_element_xml_parsing (ZakFormForm *zakform, ZakFormElement *element
+ gboolean to_unlink;
+ xmlNode *xnode_tmp;
+
+- priv = zak_form_form_get_instance_private (zakform);
++ priv = ZAK_FORM_FORM_GET_PRIVATE (zakform);
+
+ xnode = xnode->children;
+ while (xnode)
+@@ -313,7 +317,7 @@ zak_form_form_load_from_xml (ZakFormForm *zakform, xmlDoc *xmldoc)
+ {
+ ret = TRUE;
+
+- priv = zak_form_form_get_instance_private (zakform);
++ priv = ZAK_FORM_FORM_GET_PRIVATE (zakform);
+
+ cur = cur->children;
+ while (cur)
+@@ -462,7 +466,7 @@ zak_form_form_add_element (ZakFormForm *zakform, ZakFormElement *element)
+
+ ZakFormFormPrivate *priv;
+
+- priv = zak_form_form_get_instance_private (zakform);
++ priv = ZAK_FORM_FORM_GET_PRIVATE (zakform);
+
+ g_ptr_array_add (priv->ar_elements, g_object_ref (element));
+ ret = TRUE;
+@@ -491,7 +495,7 @@ ZakFormElement
+
+ guint i;
+
+- priv = zak_form_form_get_instance_private (zakform);
++ priv = ZAK_FORM_FORM_GET_PRIVATE (zakform);
+
+ ret = NULL;
+ for (i = 0; i < priv->ar_elements->len; i++)
+@@ -522,7 +526,7 @@ zak_form_form_add_validator (ZakFormForm *zakform, ZakFormValidator *validator)
+
+ ZakFormFormPrivate *priv;
+
+- priv = zak_form_form_get_instance_private (zakform);
++ priv = ZAK_FORM_FORM_GET_PRIVATE (zakform);
+
+ g_ptr_array_add (priv->ar_validators, g_object_ref (validator));
+ ret = TRUE;
+@@ -544,7 +548,7 @@ zak_form_form_clear (ZakFormForm *zakform)
+
+ g_return_if_fail (ZAK_FORM_IS_FORM (zakform));
+
+- priv = zak_form_form_get_instance_private (zakform);
++ priv = ZAK_FORM_FORM_GET_PRIVATE (zakform);
+
+ for (i = 0; i < priv->ar_elements->len; i++)
+ {
+@@ -568,7 +572,7 @@ zak_form_form_set_as_original (ZakFormForm *zakform)
+
+ g_return_if_fail (ZAK_FORM_IS_FORM (zakform));
+
+- priv = zak_form_form_get_instance_private (zakform);
++ priv = ZAK_FORM_FORM_GET_PRIVATE (zakform);
+
+ for (i = 0; i < priv->ar_elements->len; i++)
+ {
+@@ -593,7 +597,7 @@ zak_form_form_set_editable (ZakFormForm *zakform, gboolean editable)
+
+ g_return_if_fail (ZAK_FORM_IS_FORM (zakform));
+
+- priv = zak_form_form_get_instance_private (zakform);
++ priv = ZAK_FORM_FORM_GET_PRIVATE (zakform);
+
+ for (i = 0; i < priv->ar_elements->len; i++)
+ {
+@@ -620,7 +624,7 @@ zak_form_form_is_valid (ZakFormForm *zakform)
+
+ GPtrArray *ar_messages;
+
+- priv = zak_form_form_get_instance_private (zakform);
++ priv = ZAK_FORM_FORM_GET_PRIVATE (zakform);
+
+ ret = TRUE;
+
+@@ -657,7 +661,7 @@ GPtrArray
+ {
+ ZakFormFormPrivate *priv;
+
+- priv = zak_form_form_get_instance_private (zakform);
++ priv = ZAK_FORM_FORM_GET_PRIVATE (zakform);
+
+ return priv->ar_messages;
+ }
+@@ -677,7 +681,7 @@ zak_form_form_is_changed (ZakFormForm *zakform)
+
+ ZakFormFormPrivate *priv;
+
+- priv = zak_form_form_get_instance_private (zakform);
++ priv = ZAK_FORM_FORM_GET_PRIVATE (zakform);
+
+ ret = FALSE;
+
+@@ -705,7 +709,7 @@ zak_form_form_load (ZakFormForm *zakform, ZakFormIProvider *provider)
+ {
+ ZakFormFormPrivate *priv;
+
+- priv = zak_form_form_get_instance_private (zakform);
++ priv = ZAK_FORM_FORM_GET_PRIVATE (zakform);
+
+ return zak_form_iprovider_load (provider, priv->ar_elements);
+ }
+@@ -721,7 +725,7 @@ zak_form_form_insert (ZakFormForm *zakform, ZakFormIProvider *provider)
+ {
+ ZakFormFormPrivate *priv;
+
+- priv = zak_form_form_get_instance_private (zakform);
++ priv = ZAK_FORM_FORM_GET_PRIVATE (zakform);
+
+ return zak_form_iprovider_insert (provider, priv->ar_elements);
+ }
+@@ -737,7 +741,7 @@ zak_form_form_update (ZakFormForm *zakform, ZakFormIProvider *provider)
+ {
+ ZakFormFormPrivate *priv;
+
+- priv = zak_form_form_get_instance_private (zakform);
++ priv = ZAK_FORM_FORM_GET_PRIVATE (zakform);
+
+ return zak_form_iprovider_update (provider, priv->ar_elements);
+ }
+@@ -753,7 +757,7 @@ zak_form_form_delete (ZakFormForm *zakform, ZakFormIProvider *provider)
+ {
+ ZakFormFormPrivate *priv;
+
+- priv = zak_form_form_get_instance_private (zakform);
++ priv = ZAK_FORM_FORM_GET_PRIVATE (zakform);
+
+ return zak_form_iprovider_delete (provider, priv->ar_elements);
+ }
+@@ -766,7 +770,7 @@ zak_form_form_set_property (GObject *object,
+ GParamSpec *pspec)
+ {
+ ZakFormForm *zak_form_form = (ZakFormForm *)object;
+- ZakFormFormPrivate *priv = zak_form_form_get_instance_private (zak_form_form);
++ ZakFormFormPrivate *priv = ZAK_FORM_FORM_GET_PRIVATE (zak_form_form);
+
+ switch (property_id)
+ {
+@@ -783,7 +787,7 @@ zak_form_form_get_property (GObject *object,
+ GParamSpec *pspec)
+ {
+ ZakFormForm *zak_form_form = (ZakFormForm *)object;
+- ZakFormFormPrivate *priv = zak_form_form_get_instance_private (zak_form_form);
++ ZakFormFormPrivate *priv = ZAK_FORM_FORM_GET_PRIVATE (zak_form_form);
+
+ switch (property_id)
+ {
+@@ -797,7 +801,7 @@ static void
+ zak_form_form_dispose (GObject *gobject)
+ {
+ ZakFormForm *zak_form_form = (ZakFormForm *)gobject;
+- ZakFormFormPrivate *priv = zak_form_form_get_instance_private (zak_form_form);
++ ZakFormFormPrivate *priv = ZAK_FORM_FORM_GET_PRIVATE (zak_form_form);
+
+
+
+@@ -809,7 +813,7 @@ static void
+ zak_form_form_finalize (GObject *gobject)
+ {
+ ZakFormForm *zak_form_form = (ZakFormForm *)gobject;
+- ZakFormFormPrivate *priv = zak_form_form_get_instance_private (zak_form_form);
++ ZakFormFormPrivate *priv = ZAK_FORM_FORM_GET_PRIVATE (zak_form_form);
+
+
+
+@@ -831,7 +835,7 @@ zak_form_form_load_modules (ZakFormForm* zakform)
+
+ if (g_module_supported ())
+ {
+- priv = zak_form_form_get_instance_private (zakform);
++ priv = ZAK_FORM_FORM_GET_PRIVATE (zakform);
+
+ modulesdir = (gchar *)g_getenv ("LIBZAKFORM_MODULESDIR");
+ if (modulesdir == NULL)
+@@ -917,7 +921,7 @@ zak_form_form_load_modules (ZakFormForm* zakform)
+ static GPtrArray
+ *zak_form_form_get_elements (ZakFormForm *zakform)
+ {
+- ZakFormFormPrivate *priv = zak_form_form_get_instance_private (zakform);
++ ZakFormFormPrivate *priv = ZAK_FORM_FORM_GET_PRIVATE (zakform);
+
+ return priv->ar_elements;
+ }
+diff --git a/src/formelement.c b/src/formelement.c
+index 431219a..f2fa40b 100644
+--- a/src/formelement.c
++++ b/src/formelement.c
+@@ -64,6 +64,8 @@ static void zak_form_element_finalize (GObject *gobject);
+
+ static void zak_form_element_xml_parsing (ZakFormElement *element, xmlNode *xmlnode);
+
++#define ZAK_FORM_ELEMENT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ZAK_FORM_TYPE_ELEMENT, ZakFormElementPrivate))
++
+ typedef struct
+ {
+ gchar *name;
+@@ -84,7 +86,7 @@ typedef struct
+ GPtrArray *pa_messages;
+ } ZakFormElementPrivate;
+
+-G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (ZakFormElement, zak_form_element, G_TYPE_OBJECT)
++G_DEFINE_ABSTRACT_TYPE (ZakFormElement, zak_form_element, G_TYPE_OBJECT)
+
+ static void
+ zak_form_element_class_init (ZakFormElementClass *class)
+@@ -98,6 +100,8 @@ zak_form_element_class_init (ZakFormElementClass *class)
+
+ class->xml_parsing = zak_form_element_xml_parsing;
+
++ g_type_class_add_private (object_class, sizeof (ZakFormElementPrivate));
++
+ g_object_class_install_property (object_class, PROP_NAME,
+ g_param_spec_string ("name",
+ "Name",
+@@ -215,7 +219,7 @@ zak_form_element_add_filter (ZakFormElement *element, ZakFormElementFilter *filt
+ {
+ ZakFormElementPrivate *priv;
+
+- priv = zak_form_element_get_instance_private (element);
++ priv = ZAK_FORM_ELEMENT_GET_PRIVATE (element);
+
+ if (priv->pa_filters == NULL)
+ {
+@@ -237,7 +241,7 @@ zak_form_element_filter (ZakFormElement *element)
+
+ ZakFormElementPrivate *priv;
+
+- priv = zak_form_element_get_instance_private (element);
++ priv = ZAK_FORM_ELEMENT_GET_PRIVATE (element);
+
+ if (priv->pa_filters == NULL)
+ {
+@@ -268,7 +272,7 @@ zak_form_element_set_name (ZakFormElement *element, const gchar *name)
+ {
+ ZakFormElementPrivate *priv;
+
+- priv = zak_form_element_get_instance_private (element);
++ priv = ZAK_FORM_ELEMENT_GET_PRIVATE (element);
+
+ if (priv->name != NULL)
+ {
+@@ -290,7 +294,7 @@ gchar
+
+ gchar *ret;
+
+- priv = zak_form_element_get_instance_private (element);
++ priv = ZAK_FORM_ELEMENT_GET_PRIVATE (element);
+
+ ret = g_strdup (priv->name);
+
+@@ -308,7 +312,7 @@ zak_form_element_set_long_name (ZakFormElement *element, const gchar *long_name)
+ {
+ ZakFormElementPrivate *priv;
+
+- priv = zak_form_element_get_instance_private (element);
++ priv = ZAK_FORM_ELEMENT_GET_PRIVATE (element);
+
+ if (priv->long_name != NULL)
+ {
+@@ -330,7 +334,7 @@ gchar
+
+ gchar *ret;
+
+- priv = zak_form_element_get_instance_private (element);
++ priv = ZAK_FORM_ELEMENT_GET_PRIVATE (element);
+
+ if (priv->long_name == NULL)
+ {
+@@ -355,7 +359,7 @@ zak_form_element_set_is_key (ZakFormElement *element, gboolean is_key)
+ {
+ ZakFormElementPrivate *priv;
+
+- priv = zak_form_element_get_instance_private (element);
++ priv = ZAK_FORM_ELEMENT_GET_PRIVATE (element);
+
+ priv->is_key = is_key;
+ }
+@@ -370,7 +374,7 @@ zak_form_element_get_is_key (ZakFormElement *element)
+ {
+ ZakFormElementPrivate *priv;
+
+- priv = zak_form_element_get_instance_private (element);
++ priv = ZAK_FORM_ELEMENT_GET_PRIVATE (element);
+
+ return priv->is_key;
+ }
+@@ -386,7 +390,7 @@ zak_form_element_set_provider_type (ZakFormElement *element, const gchar *type)
+ {
+ ZakFormElementPrivate *priv;
+
+- priv = zak_form_element_get_instance_private (element);
++ priv = ZAK_FORM_ELEMENT_GET_PRIVATE (element);
+
+ if (priv->type != NULL)
+ {
+@@ -408,7 +412,7 @@ gchar
+
+ gchar *ret;
+
+- priv = zak_form_element_get_instance_private (element);
++ priv = ZAK_FORM_ELEMENT_GET_PRIVATE (element);
+
+ ret = g_strdup (priv->type);
+
+@@ -615,7 +619,7 @@ zak_form_element_set_value (ZakFormElement *element, const gchar *value)
+
+ ret = TRUE;
+
+- priv = zak_form_element_get_instance_private (element);
++ priv = ZAK_FORM_ELEMENT_GET_PRIVATE (element);
+
+ if (priv->value != NULL)
+ {
+@@ -644,7 +648,7 @@ gchar
+
+ gchar *ret;
+
+- priv = zak_form_element_get_instance_private (element);
++ priv = ZAK_FORM_ELEMENT_GET_PRIVATE (element);
+
+ if (ZAK_FORM_ELEMENT_GET_CLASS (element)->get_value != NULL)
+ {
+@@ -673,7 +677,7 @@ zak_form_element_set_default_value (ZakFormElement *element, const gchar *value)
+
+ ret = TRUE;
+
+- priv = zak_form_element_get_instance_private (element);
++ priv = ZAK_FORM_ELEMENT_GET_PRIVATE (element);
+
+ if (priv->default_value != NULL)
+ {
+@@ -695,7 +699,7 @@ gchar
+ {
+ ZakFormElementPrivate *priv;
+
+- priv = zak_form_element_get_instance_private (element);
++ priv = ZAK_FORM_ELEMENT_GET_PRIVATE (element);
+
+ return g_strdup (priv->default_value);
+ }
+@@ -715,7 +719,7 @@ zak_form_element_set_original_value (ZakFormElement *element, const gchar *value
+
+ ret = TRUE;
+
+- priv = zak_form_element_get_instance_private (element);
++ priv = ZAK_FORM_ELEMENT_GET_PRIVATE (element);
+
+ if (priv->original_value != NULL)
+ {
+@@ -737,7 +741,7 @@ gchar
+ {
+ ZakFormElementPrivate *priv;
+
+- priv = zak_form_element_get_instance_private (element);
++ priv = ZAK_FORM_ELEMENT_GET_PRIVATE (element);
+
+ return g_strdup (priv->original_value);
+ }
+@@ -775,7 +779,7 @@ zak_form_element_set_format (ZakFormElement *element, GHashTable *format)
+ {
+ ZakFormElementPrivate *priv;
+
+- priv = zak_form_element_get_instance_private (element);
++ priv = ZAK_FORM_ELEMENT_GET_PRIVATE (element);
+
+ if (priv->format != NULL)
+ {
+@@ -799,7 +803,7 @@ GHashTable
+
+ GHashTable *ret;
+
+- priv = zak_form_element_get_instance_private (element);
++ priv = ZAK_FORM_ELEMENT_GET_PRIVATE (element);
+
+ ret = g_hash_table_ref (priv->format);
+
+@@ -817,7 +821,7 @@ zak_form_element_set_visible (ZakFormElement *element, gboolean visible)
+ {
+ ZakFormElementPrivate *priv;
+
+- priv = zak_form_element_get_instance_private (element);
++ priv = ZAK_FORM_ELEMENT_GET_PRIVATE (element);
+
+ priv->visible = visible;
+
+@@ -839,7 +843,7 @@ zak_form_element_get_visible (ZakFormElement *element)
+
+ gboolean ret;
+
+- priv = zak_form_element_get_instance_private (element);
++ priv = ZAK_FORM_ELEMENT_GET_PRIVATE (element);
+
+ if (ZAK_FORM_ELEMENT_GET_CLASS (element)->get_visible != NULL)
+ {
+@@ -864,7 +868,7 @@ zak_form_element_set_editable (ZakFormElement *element, gboolean editable)
+ {
+ ZakFormElementPrivate *priv;
+
+- priv = zak_form_element_get_instance_private (element);
++ priv = ZAK_FORM_ELEMENT_GET_PRIVATE (element);
+
+ priv->editable = editable;
+
+@@ -886,7 +890,7 @@ zak_form_element_get_editable (ZakFormElement *element)
+
+ gboolean ret;
+
+- priv = zak_form_element_get_instance_private (element);
++ priv = ZAK_FORM_ELEMENT_GET_PRIVATE (element);
+
+ if (ZAK_FORM_ELEMENT_GET_CLASS (element)->get_editable != NULL)
+ {
+@@ -911,7 +915,7 @@ zak_form_element_set_to_load (ZakFormElement *element, gboolean to_load)
+ {
+ ZakFormElementPrivate *priv;
+
+- priv = zak_form_element_get_instance_private (element);
++ priv = ZAK_FORM_ELEMENT_GET_PRIVATE (element);
+
+ priv->to_load = to_load;
+ }
+@@ -926,7 +930,7 @@ zak_form_element_get_to_load (ZakFormElement *element)
+ {
+ ZakFormElementPrivate *priv;
+
+- priv = zak_form_element_get_instance_private (element);
++ priv = ZAK_FORM_ELEMENT_GET_PRIVATE (element);
+
+ return priv->to_load;
+ }
+@@ -942,7 +946,7 @@ zak_form_element_set_to_save (ZakFormElement *element, gboolean to_save)
+ {
+ ZakFormElementPrivate *priv;
+
+- priv = zak_form_element_get_instance_private (element);
++ priv = ZAK_FORM_ELEMENT_GET_PRIVATE (element);
+
+ priv->to_save = to_save;
+ }
+@@ -957,7 +961,7 @@ zak_form_element_get_to_save (ZakFormElement *element)
+ {
+ ZakFormElementPrivate *priv;
+
+- priv = zak_form_element_get_instance_private (element);
++ priv = ZAK_FORM_ELEMENT_GET_PRIVATE (element);
+
+ return priv->to_save;
+ }
+@@ -972,7 +976,7 @@ zak_form_element_clear (ZakFormElement *element)
+ {
+ ZakFormElementPrivate *priv;
+
+- priv = zak_form_element_get_instance_private (element);
++ priv = ZAK_FORM_ELEMENT_GET_PRIVATE (element);
+
+ zak_form_element_set_value (element, priv->default_value);
+ }
+@@ -988,7 +992,7 @@ zak_form_element_add_validator (ZakFormElement *element, ZakFormElementValidator
+ {
+ ZakFormElementPrivate *priv;
+
+- priv = zak_form_element_get_instance_private (element);
++ priv = ZAK_FORM_ELEMENT_GET_PRIVATE (element);
+
+ if (priv->pa_validators == NULL)
+ {
+@@ -1013,7 +1017,7 @@ zak_form_element_is_valid (ZakFormElement *element)
+
+ ZakFormElementPrivate *priv;
+
+- priv = zak_form_element_get_instance_private (element);
++ priv = ZAK_FORM_ELEMENT_GET_PRIVATE (element);
+
+ ret = TRUE;
+
+@@ -1056,7 +1060,7 @@ zak_form_element_is_valid (ZakFormElement *element)
+ GPtrArray
+ *zak_form_element_get_messages (ZakFormElement *element)
+ {
+- ZakFormElementPrivate *priv = zak_form_element_get_instance_private (element);
++ ZakFormElementPrivate *priv = ZAK_FORM_ELEMENT_GET_PRIVATE (element);
+
+ return priv->pa_messages;
+ }
+@@ -1069,7 +1073,7 @@ zak_form_element_set_property (GObject *object,
+ GParamSpec *pspec)
+ {
+ ZakFormElement *zak_form_element = (ZakFormElement *)object;
+- ZakFormElementPrivate *priv = zak_form_element_get_instance_private (zak_form_element);
++ ZakFormElementPrivate *priv = ZAK_FORM_ELEMENT_GET_PRIVATE (zak_form_element);
+
+ switch (property_id)
+ {
+@@ -1134,7 +1138,7 @@ zak_form_element_get_property (GObject *object,
+ GParamSpec *pspec)
+ {
+ ZakFormElement *zak_form_element = (ZakFormElement *)object;
+- ZakFormElementPrivate *priv = zak_form_element_get_instance_private (zak_form_element);
++ ZakFormElementPrivate *priv = ZAK_FORM_ELEMENT_GET_PRIVATE (zak_form_element);
+
+ switch (property_id)
+ {
+@@ -1196,7 +1200,7 @@ static void
+ zak_form_element_dispose (GObject *gobject)
+ {
+ ZakFormElement *zak_form_element = (ZakFormElement *)gobject;
+- ZakFormElementPrivate *priv = zak_form_element_get_instance_private (zak_form_element);
++ ZakFormElementPrivate *priv = ZAK_FORM_ELEMENT_GET_PRIVATE (zak_form_element);
+
+
+
+@@ -1208,7 +1212,7 @@ static void
+ zak_form_element_finalize (GObject *gobject)
+ {
+ ZakFormElement *zak_form_element = (ZakFormElement *)gobject;
+- ZakFormElementPrivate *priv = zak_form_element_get_instance_private (zak_form_element);
++ ZakFormElementPrivate *priv = ZAK_FORM_ELEMENT_GET_PRIVATE (zak_form_element);
+
+
+
+diff --git a/src/formelementfilterluc.c b/src/formelementfilterluc.c
+index 543043a..e0f7bf9 100644
+--- a/src/formelementfilterluc.c
++++ b/src/formelementfilterluc.c
+@@ -51,13 +51,6 @@ enum
+ CAMEL
+ };
+
+-struct _ZakFormElementFilterLuc
+-{
+- ZakFormElementFilter parent_instance;
+-
+- /* 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;
+diff --git a/src/formelementfiltertrim.c b/src/formelementfiltertrim.c
+index 6acafbd..8b658f1 100644
+--- a/src/formelementfiltertrim.c
++++ b/src/formelementfiltertrim.c
+@@ -40,13 +40,6 @@ static void zak_form_element_filter_trim_finalize (GObject *gobject);
+
+ static gchar *zak_form_element_filter_trim_filter (ZakFormElementFilter *filter_trim, const gchar *value);
+
+-struct _ZakFormElementFilterTrim
+-{
+- ZakFormElementFilter parent_instance;
+-
+- /* 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;
+diff --git a/src/formelementvalidator.c b/src/formelementvalidator.c
+index cf0b8e0..715f2a7 100644
+--- a/src/formelementvalidator.c
++++ b/src/formelementvalidator.c
+@@ -45,12 +45,14 @@ static void zak_form_element_validator_get_property (GObject *object,
+ static void zak_form_element_validator_dispose (GObject *gobject);
+ static void zak_form_element_validator_finalize (GObject *gobject);
+
++#define ZAK_FORM_ELEMENT_VALIDATOR_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ZAK_FORM_TYPE_ELEMENT_VALIDATOR, ZakFormElementValidatorPrivate))
++
+ typedef struct
+ {
+ gchar *message;
+ } ZakFormElementValidatorPrivate;
+
+-G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (ZakFormElementValidator, zak_form_element_validator, G_TYPE_OBJECT)
++G_DEFINE_ABSTRACT_TYPE (ZakFormElementValidator, zak_form_element_validator, G_TYPE_OBJECT)
+
+ static void
+ zak_form_element_validator_class_init (ZakFormElementValidatorClass *class)
+@@ -62,6 +64,8 @@ zak_form_element_validator_class_init (ZakFormElementValidatorClass *class)
+ object_class->dispose = zak_form_element_validator_dispose;
+ object_class->finalize = zak_form_element_validator_finalize;
+
++ g_type_class_add_private (object_class, sizeof (ZakFormElementValidatorPrivate));
++
+ g_object_class_install_property (object_class, PROP_MESSAGE,
+ g_param_spec_string ("message",
+ "Message",
+@@ -101,7 +105,7 @@ void
+ zak_form_element_validator_set_message (ZakFormElementValidator *validator,
+ const gchar *message)
+ {
+- ZakFormElementValidatorPrivate *priv = zak_form_element_validator_get_instance_private (validator);
++ ZakFormElementValidatorPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_GET_PRIVATE (validator);
+
+ priv->message = g_strdup (message);
+ }
+@@ -115,7 +119,7 @@ zak_form_element_validator_set_message (ZakFormElementValidator *validator,
+ gchar
+ *zak_form_element_validator_get_message (ZakFormElementValidator *validator)
+ {
+- ZakFormElementValidatorPrivate *priv = zak_form_element_validator_get_instance_private (validator);
++ ZakFormElementValidatorPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_GET_PRIVATE (validator);
+
+ return g_strdup (priv->message);
+ }
+@@ -128,7 +132,7 @@ zak_form_element_validator_set_property (GObject *object,
+ GParamSpec *pspec)
+ {
+ ZakFormElementValidator *zak_form_element_validator = (ZakFormElementValidator *)object;
+- ZakFormElementValidatorPrivate *priv = zak_form_element_validator_get_instance_private (zak_form_element_validator);
++ ZakFormElementValidatorPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_GET_PRIVATE (zak_form_element_validator);
+
+ switch (property_id)
+ {
+@@ -149,7 +153,7 @@ zak_form_element_validator_get_property (GObject *object,
+ GParamSpec *pspec)
+ {
+ ZakFormElementValidator *zak_form_element_validator = (ZakFormElementValidator *)object;
+- ZakFormElementValidatorPrivate *priv = zak_form_element_validator_get_instance_private (zak_form_element_validator);
++ ZakFormElementValidatorPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_GET_PRIVATE (zak_form_element_validator);
+
+ switch (property_id)
+ {
+@@ -167,7 +171,7 @@ static void
+ zak_form_element_validator_dispose (GObject *gobject)
+ {
+ ZakFormElementValidator *zak_form_element_validator = (ZakFormElementValidator *)gobject;
+- ZakFormElementValidatorPrivate *priv = zak_form_element_validator_get_instance_private (zak_form_element_validator);
++ ZakFormElementValidatorPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_GET_PRIVATE (zak_form_element_validator);
+
+
+
+@@ -179,7 +183,7 @@ static void
+ zak_form_element_validator_finalize (GObject *gobject)
+ {
+ ZakFormElementValidator *zak_form_element_validator = (ZakFormElementValidator *)gobject;
+- ZakFormElementValidatorPrivate *priv = zak_form_element_validator_get_instance_private (zak_form_element_validator);
++ ZakFormElementValidatorPrivate *priv = ZAK_FORM_ELEMENT_VALIDATOR_GET_PRIVATE (zak_form_element_validator);
+
+
+
+diff --git a/src/formelementvalidatordate.c b/src/formelementvalidatordate.c
+index 2546c61..a2c4cd0 100644
+--- a/src/formelementvalidatordate.c
++++ b/src/formelementvalidatordate.c
+@@ -42,14 +42,7 @@ static void zak_form_element_validator_date_finalize (GObject *gobject);
+
+ static gboolean zak_form_element_validator_date_validate (ZakFormElementValidator *validator_date, const gchar *value);
+
+-struct _ZakFormElementValidatorDate
+-{
+- ZakFormElementValidator parent_instance;
+-
+- /* Other members, including private data. */
+-};
+-
+-#define ZAK_FORM_ELEMENT_VALIDATOR_DATE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ZAK_TYPE_FORM_ELEMENT_VALIDATOR_DATE, ZakFormElementValidatorDatePrivate))
++#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
+diff --git a/src/formelementvalidatordate.h b/src/formelementvalidatordate.h
+index be0ae89..9a7ecf2 100644
+--- a/src/formelementvalidatordate.h
++++ b/src/formelementvalidatordate.h
+@@ -31,7 +31,7 @@ G_BEGIN_DECLS
+
+
+ #define ZAK_FORM_TYPE_ELEMENT_VALIDATOR_DATE (zak_form_element_validator_date_get_type ())
+-#define ZAK_FORM_ELEMENT_VALIDATOR_DATE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ZAK_FORM_TYPE_ELEMENT_VALIDATOR_DATE, ZakFormElementValidatorDate)
++#define ZAK_FORM_ELEMENT_VALIDATOR_DATE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ZAK_FORM_TYPE_ELEMENT_VALIDATOR_DATE, ZakFormElementValidatorDate))
+ #define ZAK_FORM_ELEMENT_VALIDATOR_DATE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ZAK_FORM_TYPE_ELEMENT_VALIDATOR_DATE, ZakFormElementValidatorDateClass))
+ #define ZAK_FORM_IS_ELEMENT_VALIDATOR_DATE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ZAK_FORM_TYPE_ELEMENT_VALIDATOR_DATE))
+ #define ZAK_FORM_IS_ELEMENT_VALIDATOR_DATE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ZAK_FORM_TYPE_ELEMENT_VALIDATOR_DATE))
+diff --git a/src/formelementvalidatornotempty.c b/src/formelementvalidatornotempty.c
+index 1de3f30..a944d07 100644
+--- a/src/formelementvalidatornotempty.c
++++ b/src/formelementvalidatornotempty.c
+@@ -40,14 +40,7 @@ static void zak_form_element_validator_notempty_finalize (GObject *gobject);
+
+ static gboolean zak_form_element_validator_notempty_validate (ZakFormElementValidator *validator_notempty, const gchar *value);
+
+-struct _ZakFormElementValidatorNotempty
+-{
+- ZakFormElementValidator parent_instance;
+-
+- /* Other members, including private data. */
+-};
+-
+-#define ZAK_FORM_ELEMENT_VALIDATOR_NOTEMPTY_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ZAK_TYPE_FORM_ELEMENT_VALIDATOR_NOTEMPTY, ZakFormElementValidatorNotemptyPrivate))
++#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
+diff --git a/src/formelementvalidatornotempty.h b/src/formelementvalidatornotempty.h
+index 3adcccc..7aa896f 100644
+--- a/src/formelementvalidatornotempty.h
++++ b/src/formelementvalidatornotempty.h
+@@ -31,7 +31,7 @@ G_BEGIN_DECLS
+
+
+ #define ZAK_FORM_TYPE_ELEMENT_VALIDATOR_NOTEMPTY (zak_form_element_validator_notempty_get_type ())
+-#define ZAK_FORM_ELEMENT_VALIDATOR_NOTEMPTY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ZAK_FORM_TYPE_ELEMENT_VALIDATOR_NOTEMPTY, ZakFormElementValidatorNotempty)
++#define ZAK_FORM_ELEMENT_VALIDATOR_NOTEMPTY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ZAK_FORM_TYPE_ELEMENT_VALIDATOR_NOTEMPTY, ZakFormElementValidatorNotempty))
+ #define ZAK_FORM_ELEMENT_VALIDATOR_NOTEMPTY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ZAK_FORM_TYPE_ELEMENT_VALIDATOR_NOTEMPTY, ZakFormElementValidatorNotemptyClass))
+ #define ZAK_FORM_IS_ELEMENT_VALIDATOR_NOTEMPTY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ZAK_FORM_TYPE_ELEMENT_VALIDATOR_NOTEMPTY))
+ #define ZAK_FORM_IS_ELEMENT_VALIDATOR_NOTEMPTY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ZAK_FORM_TYPE_ELEMENT_VALIDATOR_NOTEMPTY))
+diff --git a/src/formelementvalidatorregex.c b/src/formelementvalidatorregex.c
+index cd92203..bd8a1c1 100644
+--- a/src/formelementvalidatorregex.c
++++ b/src/formelementvalidatorregex.c
+@@ -46,14 +46,7 @@ static void zak_form_element_validator_regex_finalize (GObject *gobject);
+
+ static gboolean zak_form_element_validator_regex_validate (ZakFormElementValidator *validator_regex, const gchar *value);
+
+-struct _ZakFormElementValidatorRegex
+-{
+- ZakFormElementValidator parent_instance;
+-
+- /* Other members, including private data. */
+-};
+-
+-#define ZAK_FORM_ELEMENT_VALIDATOR_REGEX_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ZAK_TYPE_FORM_ELEMENT_VALIDATOR_REGEX, ZakFormElementValidatorRegexPrivate))
++#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
+diff --git a/src/formelementvalidatorregex.h b/src/formelementvalidatorregex.h
+index eefb814..7c8101c 100644
+--- a/src/formelementvalidatorregex.h
++++ b/src/formelementvalidatorregex.h
+@@ -31,7 +31,7 @@ G_BEGIN_DECLS
+
+
+ #define ZAK_FORM_TYPE_ELEMENT_VALIDATOR_REGEX (zak_form_element_validator_regex_get_type ())
+-#define ZAK_FORM_ELEMENT_VALIDATOR_REGEX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ZAK_FORM_TYPE_ELEMENT_VALIDATOR_REGEX, ZakFormElementValidatorRegex)
++#define ZAK_FORM_ELEMENT_VALIDATOR_REGEX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ZAK_FORM_TYPE_ELEMENT_VALIDATOR_REGEX, ZakFormElementValidatorRegex))
+ #define ZAK_FORM_ELEMENT_VALIDATOR_REGEX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ZAK_FORM_TYPE_ELEMENT_VALIDATOR_REGEX, ZakFormElementValidatorRegexClass))
+ #define ZAK_FORM_IS_ELEMENT_VALIDATOR_REGEX(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ZAK_FORM_TYPE_ELEMENT_VALIDATOR_REGEX))
+ #define ZAK_FORM_IS_ELEMENT_VALIDATOR_REGEX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ZAK_FORM_TYPE_ELEMENT_VALIDATOR_REGEX))
+diff --git a/src/formiprovider.h b/src/formiprovider.h
+index be970ae..1b3a835 100644
+--- a/src/formiprovider.h
++++ b/src/formiprovider.h
+@@ -26,10 +26,10 @@ G_BEGIN_DECLS
+
+
+ #define ZAK_FORM_TYPE_IPROVIDER (zak_form_iprovider_get_type ())
+-#define ZAK_FORM_IPROVIDER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FORM_TYPE_IPROVIDER, ZakFormIprovider))
+-#define ZAK_FORM_IPROVIDER_IFACE(obj) (G_TYPE_CHECK_CLASS_CAST ((obj), ZAK_FORM_TYPE_IPROVIDER, ZakFormIproviderInterface))
++#define ZAK_FORM_IPROVIDER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FORM_TYPE_IPROVIDER, ZakFormIProvider))
++#define ZAK_FORM_IPROVIDER_IFACE(obj) (G_TYPE_CHECK_CLASS_CAST ((obj), ZAK_FORM_TYPE_IPROVIDER, ZakFormIProviderInterface))
+ #define ZAK_FORM_IS_IPROVIDER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ZAK_FORM_TYPE_IPROVIDER))
+-#define ZAK_FORM_IPROVIDER_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ZAK_FORM_TYPE_IPROVIDER, ZakFormIproviderInterface))
++#define ZAK_FORM_IPROVIDER_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ZAK_FORM_TYPE_IPROVIDER, ZakFormIProviderInterface))
+
+
+ typedef struct _ZakFormIProvider ZakFormIProvider;
+diff --git a/src/formvalidator.c b/src/formvalidator.c
+index 56b1d7c..04c543d 100644
+--- a/src/formvalidator.c
++++ b/src/formvalidator.c
+@@ -43,12 +43,14 @@ static void zak_form_validator_get_property (GObject *object,
+ static void zak_form_validator_dispose (GObject *gobject);
+ static void zak_form_validator_finalize (GObject *gobject);
+
++#define ZAK_FORM_VALIDATOR_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ZAK_FORM_TYPE_VALIDATOR, ZakFormValidatorPrivate))
++
+ typedef struct
+ {
+ gchar *message;
+ } ZakFormValidatorPrivate;
+
+-G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (ZakFormValidator, zak_form_validator, G_TYPE_OBJECT)
++G_DEFINE_ABSTRACT_TYPE (ZakFormValidator, zak_form_validator, G_TYPE_OBJECT)
+
+ static void
+ zak_form_validator_class_init (ZakFormValidatorClass *class)
+@@ -60,6 +62,8 @@ zak_form_validator_class_init (ZakFormValidatorClass *class)
+ object_class->dispose = zak_form_validator_dispose;
+ object_class->finalize = zak_form_validator_finalize;
+
++ g_type_class_add_private (object_class, sizeof (ZakFormValidatorPrivate));
++
+ g_object_class_install_property (object_class, PROP_MESSAGE,
+ g_param_spec_string ("message",
+ "Message",
+@@ -71,7 +75,7 @@ zak_form_validator_class_init (ZakFormValidatorClass *class)
+ static void
+ zak_form_validator_init (ZakFormValidator *zak_form_validator)
+ {
+- ZakFormValidatorPrivate *priv = zak_form_validator_get_instance_private (zak_form_validator);
++ ZakFormValidatorPrivate *priv = ZAK_FORM_VALIDATOR_GET_PRIVATE (zak_form_validator);
+ }
+
+ gboolean
+@@ -99,7 +103,7 @@ void
+ zak_form_validator_set_message (ZakFormValidator *validator,
+ const gchar *message)
+ {
+- ZakFormValidatorPrivate *priv = zak_form_validator_get_instance_private (validator);
++ ZakFormValidatorPrivate *priv = ZAK_FORM_VALIDATOR_GET_PRIVATE (validator);
+
+ priv->message = g_strdup (message);
+ }
+@@ -113,7 +117,7 @@ zak_form_validator_set_message (ZakFormValidator *validator,
+ gchar
+ *zak_form_validator_get_message (ZakFormValidator *validator)
+ {
+- ZakFormValidatorPrivate *priv = zak_form_validator_get_instance_private (validator);
++ ZakFormValidatorPrivate *priv = ZAK_FORM_VALIDATOR_GET_PRIVATE (validator);
+
+ return g_strdup (priv->message);
+ }
+@@ -126,7 +130,7 @@ zak_form_validator_set_property (GObject *object,
+ GParamSpec *pspec)
+ {
+ ZakFormValidator *zak_form_validator = (ZakFormValidator *)object;
+- ZakFormValidatorPrivate *priv = zak_form_validator_get_instance_private (zak_form_validator);
++ ZakFormValidatorPrivate *priv = ZAK_FORM_VALIDATOR_GET_PRIVATE (zak_form_validator);
+
+ switch (property_id)
+ {
+@@ -147,7 +151,7 @@ zak_form_validator_get_property (GObject *object,
+ GParamSpec *pspec)
+ {
+ ZakFormValidator *zak_form_validator = (ZakFormValidator *)object;
+- ZakFormValidatorPrivate *priv = zak_form_validator_get_instance_private (zak_form_validator);
++ ZakFormValidatorPrivate *priv = ZAK_FORM_VALIDATOR_GET_PRIVATE (zak_form_validator);
+
+ switch (property_id)
+ {
+@@ -165,7 +169,7 @@ static void
+ zak_form_validator_dispose (GObject *gobject)
+ {
+ ZakFormValidator *zak_form_validator = (ZakFormValidator *)gobject;
+- ZakFormValidatorPrivate *priv = zak_form_validator_get_instance_private (zak_form_validator);
++ ZakFormValidatorPrivate *priv = ZAK_FORM_VALIDATOR_GET_PRIVATE (zak_form_validator);
+
+
+
+@@ -177,7 +181,7 @@ static void
+ zak_form_validator_finalize (GObject *gobject)
+ {
+ ZakFormValidator *zak_form_validator = (ZakFormValidator *)gobject;
+- ZakFormValidatorPrivate *priv = zak_form_validator_get_instance_private (zak_form_validator);
++ ZakFormValidatorPrivate *priv = ZAK_FORM_VALIDATOR_GET_PRIVATE (zak_form_validator);
+
+
+
+diff --git a/src/formvalidatorcompare.c b/src/formvalidatorcompare.c
+index 02fedf6..6d4eac2 100644
+--- a/src/formvalidatorcompare.c
++++ b/src/formvalidatorcompare.c
+@@ -45,13 +45,6 @@ static void zak_form_validator_compare_finalize (GObject *gobject);
+
+ static gboolean zak_form_validator_compare_validate (ZakFormValidator *validator_notempty);
+
+-struct _ZakFormValidatorCompare
+-{
+- ZakFormValidator parent_instance;
+-
+- /* 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))
+
+ enum
+diff --git a/src/formvalidatorcompare.h b/src/formvalidatorcompare.h
+index d4ab5ac..91b9180 100644
+--- a/src/formvalidatorcompare.h
++++ b/src/formvalidatorcompare.h
+@@ -31,7 +31,7 @@ G_BEGIN_DECLS
+
+
+ #define ZAK_FORM_TYPE_VALIDATOR_COMPARE (zak_form_validator_compare_get_type ())
+-#define ZAK_FORM_VALIDATOR_COMPARE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ZAK_FORM_TYPE_VALIDATOR_COMPARE, ZakFormValidatorCompare)
++#define ZAK_FORM_VALIDATOR_COMPARE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ZAK_FORM_TYPE_VALIDATOR_COMPARE, ZakFormValidatorCompare))
+ #define ZAK_FORM_VALIDATOR_COMPARE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ZAK_FORM_TYPE_VALIDATOR_COMPARE, ZakFormValidatorCompareClass))
+ #define ZAK_FORM_IS_VALIDATOR_COMPARE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ZAK_FORM_TYPE_VALIDATOR_COMPARE))
+ #define ZAK_FORM_IS_VALIDATOR_COMPARE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ZAK_FORM_TYPE_VALIDATOR_COMPARE))
+diff --git a/src/formvalidatorcomparedate.c b/src/formvalidatorcomparedate.c
+index ba0a04c..8cc0e28 100644
+--- a/src/formvalidatorcomparedate.c
++++ b/src/formvalidatorcomparedate.c
+@@ -45,13 +45,6 @@ static void zak_form_validator_compare_date_finalize (GObject *gobject);
+
+ static gboolean zak_form_validator_compare_date_validate (ZakFormValidator *validator_notempty);
+
+-struct _ZakFormValidatorCompareDate
+-{
+- ZakFormValidator parent_instance;
+-
+- /* 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))
+
+ enum
+diff --git a/src/formvalidatorcomparedate.h b/src/formvalidatorcomparedate.h
+index ec11584..655680a 100644
+--- a/src/formvalidatorcomparedate.h
++++ b/src/formvalidatorcomparedate.h
+@@ -31,7 +31,7 @@ G_BEGIN_DECLS
+
+
+ #define ZAK_FORM_TYPE_VALIDATOR_COMPARE_DATE (zak_form_validator_compare_date_get_type ())
+-#define ZAK_FORM_VALIDATOR_COMPARE_DATE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ZAK_FORM_TYPE_VALIDATOR_COMPARE_DATE, ZakFormValidatorCompareDate)
++#define ZAK_FORM_VALIDATOR_COMPARE_DATE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ZAK_FORM_TYPE_VALIDATOR_COMPARE_DATE, ZakFormValidatorCompareDate))
+ #define ZAK_FORM_VALIDATOR_COMPARE_DATE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ZAK_FORM_TYPE_VALIDATOR_COMPARE_DATE, ZakFormValidatorCompareDateClass))
+ #define ZAK_FORM_IS_VALIDATOR_COMPARE_DATE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ZAK_FORM_TYPE_VALIDATOR_COMPARE_DATE))
+ #define ZAK_FORM_IS_VALIDATOR_COMPARE_DATE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ZAK_FORM_TYPE_VALIDATOR_COMPARE_DATE))
projects / zakform / libzakform / commitdiff