diff options
-rw-r--r-- | rest/rest-proxy-call.h | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/rest/rest-proxy-call.h b/rest/rest-proxy-call.h index 0c37e7c..53077f7 100644 --- a/rest/rest-proxy-call.h +++ b/rest/rest-proxy-call.h @@ -30,31 +30,13 @@ G_BEGIN_DECLS #define REST_TYPE_PROXY_CALL rest_proxy_call_get_type() - -#define REST_PROXY_CALL(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), REST_TYPE_PROXY_CALL, RestProxyCall)) - -#define REST_PROXY_CALL_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST ((klass), REST_TYPE_PROXY_CALL, RestProxyCallClass)) - -#define REST_IS_PROXY_CALL(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), REST_TYPE_PROXY_CALL)) - -#define REST_IS_PROXY_CALL_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), REST_TYPE_PROXY_CALL)) - -#define REST_PROXY_CALL_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), REST_TYPE_PROXY_CALL, RestProxyCallClass)) - +G_DECLARE_DERIVABLE_TYPE (RestProxyCall, rest_proxy_call, REST, PROXY_CALL, GObject) /** * RestProxyCall: * * #RestProxyCall has no publicly available members. */ -typedef struct { - GObject parent; -} RestProxyCall; /** * RestProxyCallClass: @@ -66,7 +48,7 @@ typedef struct { * Class structure for #RestProxyCall for subclasses to implement specialised * behaviour. */ -typedef struct { +struct _RestProxyCallClass { /*< private >*/ GObjectClass parent_class; /*< public >*/ @@ -80,7 +62,7 @@ typedef struct { /*< private >*/ /* padding for future expansion */ gpointer _padding_dummy[7]; -} RestProxyCallClass; +}; #define REST_PROXY_CALL_ERROR rest_proxy_call_error_quark () @@ -96,8 +78,6 @@ typedef enum { GQuark rest_proxy_call_error_quark (void); -GType rest_proxy_call_get_type (void); - /* Functions for dealing with request */ void rest_proxy_call_set_method (RestProxyCall *call, const gchar *method); |