--- 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)
+ {
+ GObject parent;
+ };
-
+
struct _ZakFormFormClass
{
diff --git a/src/formelement.h b/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 ())
+ {
+ GObject parent;
+ };
-
+
struct _ZakFormElementClass
{
diff --git a/src/formelementfilter.h b/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 ())
+ {
+ GObject parent;
+ };
-
+
struct _ZakFormElementFilterClass
{
diff --git a/src/formelementfilterluc.h b/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 ())
+{
+ 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
+++ 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 ())
+ 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
+++ 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(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))
+ {
+ GObject parent;
+ };
-
+
struct _ZakFormElementValidatorClass
{
diff --git a/src/formelementvalidatordate.h b/src/formelementvalidatordate.h
+++ b/src/formelementvalidatordate.h
@@ -30,8 +30,25 @@
G_BEGIN_DECLS
-
-
+
+
-#define ZAK_FORM_TYPE_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 ())
+ {
+ ZakFormElementValidatorClass parent_class;
+ };
-
+
ZakFormElementValidatorDate *zak_form_element_validator_date_new (void);
-
+
diff --git a/src/formelementvalidatornotempty.h b/src/formelementvalidatornotempty.h
index 5a6b662..c6e3a20 100644
--- a/src/formelementvalidatornotempty.h
+++ b/src/formelementvalidatornotempty.h
@@ -30,8 +30,25 @@
G_BEGIN_DECLS
-
-
+
+
-#define ZAK_FORM_TYPE_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 ())
+ {
+ ZakFormElementValidatorClass parent_class;
+ };
-
+
ZakFormElementValidatorNotempty *zak_form_element_validator_notempty_new (void);
-
+
diff --git a/src/formelementvalidatorregex.h b/src/formelementvalidatorregex.h
index 4bb8b42..f8e62e0 100644
--- a/src/formelementvalidatorregex.h
+++ b/src/formelementvalidatorregex.h
@@ -30,8 +30,25 @@
G_BEGIN_DECLS
-
-
+
+
-#define ZAK_FORM_TYPE_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 ())
+ {
+ 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
+++ 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 ())
+
+typedef struct _ZakFormIProvider ZakFormIProvider;
+typedef struct _ZakFormIProviderInterface ZakFormIProviderInterface;
-
+
struct _ZakFormIProviderInterface
{
diff --git a/src/formvalidator.h b/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 ())
+ {
+ GObject parent;
+ };
-
+
struct _ZakFormValidatorClass
{
diff --git a/src/formvalidatorcompare.h b/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 ())
+ 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
+++ 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 ())
+{
+ 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);