seq: queue_info: 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/queue-info.c b/src/seq/queue-info.c
index 355757b3e2930d18d17d335963b9449e231f5e54..8f3648e8cf9afdcbd7a70c66bc36f4eb61466808 100644 (file)
--- a/src/seq/queue-info.c
+++ b/src/seq/queue-info.c
@@ -15,9 +15,9 @@
  *
  * The object wraps 'struct snd_seq_queue_info' in UAPI of Linux sound subsystem.
  */
-struct _ALSASeqQueueInfoPrivate {
+typedef struct {
     struct snd_seq_queue_info info;
-};
+} ALSASeqQueueInfoPrivate;
 G_DEFINE_TYPE_WITH_PRIVATE(ALSASeqQueueInfo, alsaseq_queue_info, G_TYPE_OBJECT)
 
 enum seq_queue_info_prop_type {

diff --git a/src/seq/queue-info.h b/src/seq/queue-info.h
index dba6053b48e459ca851708993832855f899849fb..fddbacf4702f8f330b944e2d99c5f592654b5497 100644 (file)
--- a/src/seq/queue-info.h
+++ b/src/seq/queue-info.h
@@ -8,42 +8,11 @@ G_BEGIN_DECLS
 
 #define ALSASEQ_TYPE_QUEUE_INFO     (alsaseq_queue_info_get_type())
 
-#define ALSASEQ_QUEUE_INFO(obj)                             \
-    (G_TYPE_CHECK_INSTANCE_CAST((obj),                      \
-                                ALSASEQ_TYPE_QUEUE_INFO,    \
-                                ALSASeqQueueInfo))
-#define ALSASEQ_IS_QUEUE_INFO(obj)                          \
-    (G_TYPE_CHECK_INSTANCE_TYPE((obj),                      \
-                                ALSASEQ_TYPE_QUEUE_INFO))
-
-#define ALSASEQ_QUEUE_INFO_CLASS(klass)                     \
-    (G_TYPE_CHECK_CLASS_CAST((klass),                       \
-                             ALSASEQ_TYPE_QUEUE_INFO,       \
-                             ALSASeqQueueInfoClass))
-#define ALSASEQ_IS_QUEUE_INFO_CLASS(klass)                  \
-    (G_TYPE_CHECK_CLASS_TYPE((klass),                       \
-                             ALSASEQ_TYPE_QUEUE_INFO))
-#define ALSASEQ_QUEUE_INFO_GET_CLASS(obj)                   \
-    (G_TYPE_INSTANCE_GET_CLASS((obj),                       \
-                               ALSASEQ_TYPE_QUEUE_INFO,     \
-                               ALSASeqQueueInfoClass))
-
-typedef struct _ALSASeqQueueInfo            ALSASeqQueueInfo;
-typedef struct _ALSASeqQueueInfoClass       ALSASeqQueueInfoClass;
-typedef struct _ALSASeqQueueInfoPrivate     ALSASeqQueueInfoPrivate;
-
-struct _ALSASeqQueueInfo {
-    GObject parent_instance;
-
-    ALSASeqQueueInfoPrivate *priv;
-};
-
+G_DECLARE_DERIVABLE_TYPE(ALSASeqQueueInfo, alsaseq_queue_info, ALSASEQ, QUEUE_INFO, GObject);
 struct _ALSASeqQueueInfoClass {
     GObjectClass parent_class;
 };
 
-GType alsaseq_queue_info_get_type() G_GNUC_CONST;
-
 ALSASeqQueueInfo *alsaseq_queue_info_new();
 
 G_END_DECLS