snd_dice: 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>

2 files changed, 3 insertions, 33 deletions

diff --git a/src/snd_dice.c b/src/snd_dice.c
index 8bacc37..13a2e3f 100644
--- a/src/snd_dice.c
+++ b/src/snd_dice.c
@@ -38,11 +38,11 @@ struct notification_waiter {
 	gboolean awakened;
 };
 
-struct _HinawaSndDicePrivate {
+typedef struct {
 	HinawaFwReq *req;
 	GList *waiters;
 	GMutex mutex;
-};
+} HinawaSndDicePrivate;
 G_DEFINE_TYPE_WITH_PRIVATE(HinawaSndDice, hinawa_snd_dice, HINAWA_TYPE_SND_UNIT)
 
 /* This object has one signal. */
diff --git a/src/snd_dice.h b/src/snd_dice.h
index 6aa4ad9..c84c9cf 100644
--- a/src/snd_dice.h
+++ b/src/snd_dice.h
@@ -8,40 +8,12 @@ G_BEGIN_DECLS
 
 #define HINAWA_TYPE_SND_DICE	(hinawa_snd_dice_get_type())
 
-#define HINAWA_SND_DICE(obj)					\
-	(G_TYPE_CHECK_INSTANCE_CAST((obj),			\
-				    HINAWA_TYPE_SND_DICE,	\
-				    HinawaSndDice))
-#define HINAWA_IS_SND_DICE(obj)					\
-	(G_TYPE_CHECK_INSTANCE_TYPE((obj),			\
-				    HINAWA_TYPE_SND_DICE))
-
-#define HINAWA_SND_DICE_CLASS(klass)				\
-	(G_TYPE_CHECK_CLASS_CAST((klass),			\
-				 HINAWA_TYPE_SND_DICE,		\
-				 HinawaSndDiceClass))
-#define HINAWA_IS_SND_DICE_CLASS(klass)				\
-	(G_TYPE_CHECK_CLASS_TYPE((klass),			\
-				 HINAWA_TYPE_SND_DICE))
-#define HINAWA_SND_DICE_GET_CLASS(obj)				\
-	(G_TYPE_INSTANCE_GET_CLASS((obj),			\
-				   HINAWA_TYPE_SND_DICE,	\
-				   HinawaSndDiceClass))
+G_DECLARE_DERIVABLE_TYPE(HinawaSndDice, hinawa_snd_dice, HINAWA, SND_DICE, HinawaSndUnit);
 
 #define HINAWA_SND_DICE_ERROR	hinawa_snd_dice_error_quark()
 
 GQuark hinawa_snd_dice_error_quark();
 
-typedef struct _HinawaSndDice		HinawaSndDice;
-typedef struct _HinawaSndDiceClass	HinawaSndDiceClass;
-typedef struct _HinawaSndDicePrivate	HinawaSndDicePrivate;
-
-struct _HinawaSndDice {
-	HinawaSndUnit parent_instance;
-
-	HinawaSndDicePrivate *priv;
-};
-
 struct _HinawaSndDiceClass {
 	HinawaSndUnitClass parent_class;
 
@@ -58,8 +30,6 @@ struct _HinawaSndDiceClass {
 	void (*notified)(HinawaSndDice *self, guint message);
 };
 
-GType hinawa_snd_dice_get_type(void) G_GNUC_CONST;
-
 HinawaSndDice *hinawa_snd_dice_new(void);
 
 void hinawa_snd_dice_open(HinawaSndDice *self, gchar *path, GError **exception);