seq: user_client: use an utility macro to declare GObject-derived object

Since gobject v2.44, an utility macro is available to declare
GObject-derived objects.

This commit replaces existent boireplates with it.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>

diff --git a/src/seq/user-client.c b/src/seq/user-client.c
index 41665103f5f835426c46a86f7cc61c31ef3b1e31..cba36ab0656bb7da2211506f36ac23e9e93d6314 100644 (file)
--- a/src/seq/user-client.c
+++ b/src/seq/user-client.c
@@ -26,12 +26,12 @@
  * dispatcher to notify the event. The call of
  * alsaseq_user_client_schedule_event() schedules event with given parameters.
  */
-struct _ALSASeqUserClientPrivate {
+typedef struct {
     int fd;
     const char *devnode;
     int client_id;
     guint16 proto_ver_triplet[3];
-};
+} ALSASeqUserClientPrivate;
 G_DEFINE_TYPE_WITH_PRIVATE(ALSASeqUserClient, alsaseq_user_client, G_TYPE_OBJECT)
 
 /**

diff --git a/src/seq/user-client.h b/src/seq/user-client.h
index 505a62ca5872b0c89bfa4d7553650a1d245a2097..b9c0dd60e81d40f7960e3f5a006af1aec9c14606 100644 (file)
--- a/src/seq/user-client.h
+++ b/src/seq/user-client.h
@@ -8,40 +8,12 @@ G_BEGIN_DECLS
 
 #define ALSASEQ_TYPE_USER_CLIENT     (alsaseq_user_client_get_type())
 
-#define ALSASEQ_USER_CLIENT(obj)                            \
-    (G_TYPE_CHECK_INSTANCE_CAST((obj),                      \
-                                ALSASEQ_TYPE_USER_CLIENT,   \
-                                ALSASeqUserClient))
-#define ALSASEQ_IS_USER_CLIENT(obj)                         \
-    (G_TYPE_CHECK_INSTANCE_TYPE((obj),                      \
-                                ALSASEQ_TYPE_USER_CLIENT))
-
-#define ALSASEQ_USER_CLIENT_CLASS(klass)                    \
-    (G_TYPE_CHECK_CLASS_CAST((klass),                       \
-                             ALSASEQ_TYPE_USER_CLIENT,      \
-                             ALSASeqUserClientClass))
-#define ALSASEQ_IS_USER_CLIENT_CLASS(klass)                 \
-    (G_TYPE_CHECK_CLASS_TYPE((klass),                       \
-                             ALSASEQ_TYPE_USER_CLIENT))
-#define ALSASEQ_USER_CLIENT_GET_CLASS(obj)                  \
-    (G_TYPE_INSTANCE_GET_CLASS((obj),                       \
-                               ALSASEQ_TYPE_USER_CLIENT,    \
-                               ALSASeqUserClientClass))
+G_DECLARE_DERIVABLE_TYPE(ALSASeqUserClient, alsaseq_user_client, ALSASEQ, USER_CLIENT, GObject);
 
 #define ALSASEQ_USER_CLIENT_ERROR   alsaseq_user_client_error_quark()
 
 GQuark alsaseq_user_client_error_quark();
 
-typedef struct _ALSASeqUserClient           ALSASeqUserClient;
-typedef struct _ALSASeqUserClientClass      ALSASeqUserClientClass;
-typedef struct _ALSASeqUserClientPrivate    ALSASeqUserClientPrivate;
-
-struct _ALSASeqUserClient {
-    GObject parent_instance;
-
-    ALSASeqUserClientPrivate *priv;
-};
-
 struct _ALSASeqUserClientClass {
     GObjectClass parent_class;
 
@@ -60,8 +32,6 @@ struct _ALSASeqUserClientClass {
                          const ALSASeqEventCntr *ev_cntr);
 };
 
-GType alsaseq_user_client_get_type() G_GNUC_CONST;
-
 ALSASeqUserClient *alsaseq_user_client_new();
 
 void alsaseq_user_client_open(ALSASeqUserClient *self, gint open_flag,