1 files changed, 18 insertions, 50 deletions
diff --git a/rest-extras/youtube-proxy.h b/rest-extras/youtube-proxy.h
index 1fe6c20..1215cf4 100644
--- a/rest-extras/youtube-proxy.h
+++ b/rest-extras/youtube-proxy.h
@@ -20,8 +20,7 @@
  *
  */
 
-#ifndef _YOUTUBE_PROXY
-#define _YOUTUBE_PROXY
+#pragma once
 
 #include <rest/rest-proxy.h>
 
@@ -29,52 +28,18 @@ G_BEGIN_DECLS
 
 #define YOUTUBE_TYPE_PROXY youtube_proxy_get_type()
 
-#define YOUTUBE_PROXY(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), YOUTUBE_TYPE_PROXY, YoutubeProxy))
+G_DECLARE_DERIVABLE_TYPE (YoutubeProxy, youtube_proxy, YOUTUBE, PROXY, RestProxy)
 
-#define YOUTUBE_PROXY_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), YOUTUBE_TYPE_PROXY, YoutubeProxyClass))
-
-#define YOUTUBE_IS_PROXY(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), YOUTUBE_TYPE_PROXY))
-
-#define YOUTUBE_IS_PROXY_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), YOUTUBE_TYPE_PROXY))
-
-#define YOUTUBE_PROXY_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), YOUTUBE_TYPE_PROXY, YoutubeProxyClass))
-
-typedef struct _YoutubeProxyPrivate YoutubeProxyPrivate;
-
-/**
- * YoutubeProxy:
- *
- * #YoutubeProxy has no publicly available members.
- */
-typedef struct {
-  RestProxy parent;
-  YoutubeProxyPrivate *priv;
-} YoutubeProxy;
-
-typedef struct {
+struct _YoutubeProxyClass {
   RestProxyClass parent_class;
+
   /*< private >*/
   /* padding for future expansion */
   gpointer _padding_dummy[8];
-} YoutubeProxyClass;
+};
 
 #define YOUTUBE_PROXY_ERROR youtube_proxy_error_quark()
 
-GType youtube_proxy_get_type (void);
-
-RestProxy* youtube_proxy_new (const gchar *developer_key);
-
-RestProxy* youtube_proxy_new_with_auth (const gchar *developer_key,
-        const gchar *user_auth);
-
-void youtube_proxy_set_user_auth (YoutubeProxy *proxy,
-                                  const gchar  *user_auth);
-
 typedef void (*YoutubeProxyUploadCallback)(YoutubeProxy  *proxy,
                                            const gchar   *payload,
                                            gsize          total,
@@ -83,15 +48,18 @@ typedef void (*YoutubeProxyUploadCallback)(YoutubeProxy  *proxy,
                                            GObject       *weak_object,
                                            gpointer       user_data);
 
-gboolean youtube_proxy_upload_async (YoutubeProxy              *self,
-                                     const gchar               *filename,
-                                     GHashTable                *fields,
-                                     gboolean                   incomplete,
-                                     YoutubeProxyUploadCallback callback,
-                                     GObject                   *weak_object,
-                                     gpointer                   user_data,
-                                     GError                   **error);
+RestProxy *youtube_proxy_new           (const gchar                 *developer_key);
+RestProxy *youtube_proxy_new_with_auth (const gchar                 *developer_key,
+                                        const gchar                 *user_auth);
+void       youtube_proxy_set_user_auth (YoutubeProxy                *proxy,
+                                        const gchar                 *user_auth);
+gboolean   youtube_proxy_upload_async  (YoutubeProxy                *self,
+                                        const gchar                 *filename,
+                                        GHashTable                  *fields,
+                                        gboolean                     incomplete,
+                                        YoutubeProxyUploadCallback   callback,
+                                        GObject                     *weak_object,
+                                        gpointer                     user_data,
+                                        GError                     **error);
 
 G_END_DECLS
-
-#endif /* _YOUTUBE_PROXY */