hwdep: device_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/hwdep/device-info.c b/src/hwdep/device-info.c
index cbe019f603b05eb8980c243be02b7fe772ac6101..3bc163f28d94a9fc260947e4b46fc566a5ea0e45 100644 (file)
--- a/src/hwdep/device-info.c
+++ b/src/hwdep/device-info.c
@@ -13,9 +13,9 @@
  *
  * The object wraps 'struct snd_hwdep_info' in UAPI of Linux sound subsystem.
  */
-struct _ALSAHwdepDeviceInfoPrivate {
+typedef struct {
     struct snd_hwdep_info info;
-};
+} ALSAHwdepDeviceInfoPrivate;
 G_DEFINE_TYPE_WITH_PRIVATE(ALSAHwdepDeviceInfo, alsahwdep_device_info, G_TYPE_OBJECT)
 
 enum hwdep_device_info_prop_type {

diff --git a/src/hwdep/device-info.h b/src/hwdep/device-info.h
index 1b4b47ae8e58d4a121b00dfb214f6b6b1e60ea2f..26b5a29fcb331b88b2db3e31f11b868cafb4f1aa 100644 (file)
--- a/src/hwdep/device-info.h
+++ b/src/hwdep/device-info.h
@@ -8,42 +8,12 @@ G_BEGIN_DECLS
 
 #define ALSAHWDEP_TYPE_DEVICE_INFO      (alsahwdep_device_info_get_type())
 
-#define ALSAHWDEP_DEVICE_INFO(obj)                          \
-    (G_TYPE_CHECK_INSTANCE_CAST((obj),                      \
-                                ALSAHWDEP_TYPE_DEVICE_INFO, \
-                                ALSAHwdepDeviceInfo))
-#define ALSAHWDEP_IS_DEVICE_INFO(obj)                       \
-    (G_TYPE_CHECK_INSTANCE_TYPE((obj),                      \
-                                ALSAHWDEP_TYPE_DEVICE_INFO))
-
-#define ALSAHWDEP_DEVICE_INFO_CLASS(klass)                  \
-    (G_TYPE_CHECK_CLASS_CAST((klass),                       \
-                             ALSAHWDEP_TYPE_DEVICE_INFO,    \
-                             ALSAHwdepDeviceInfoClass))
-#define ALSAHWDEP_IS_DEVICE_INFO_CLASS(klass)               \
-    (G_TYPE_CHECK_CLASS_TYPE((klass),                       \
-                             ALSAHWDEP_TYPE_DEVICE_INFO))
-#define ALSAHWDEP_DEVICE_INFO_GET_CLASS(obj)                \
-    (G_TYPE_INSTANCE_GET_CLASS((obj),                       \
-                               ALSAHWDEP_TYPE_DEVICE_INFO,  \
-                               ALSAHwdepDeviceInfoClass))
-
-typedef struct _ALSAHwdepDeviceInfo         ALSAHwdepDeviceInfo;
-typedef struct _ALSAHwdepDeviceInfoClass    ALSAHwdepDeviceInfoClass;
-typedef struct _ALSAHwdepDeviceInfoPrivate  ALSAHwdepDeviceInfoPrivate;
-
-struct _ALSAHwdepDeviceInfo {
-    GObject parent_instance;
-
-    ALSAHwdepDeviceInfoPrivate *priv;
-};
+G_DECLARE_DERIVABLE_TYPE(ALSAHwdepDeviceInfo, alsahwdep_device_info, ALSAHWDEP, DEVICE_INFO, GObject);
 
 struct _ALSAHwdepDeviceInfoClass {
     GObjectClass parent_class;
 };
 
-GType alsahwdep_device_info_get_type() G_GNUC_CONST;
-
 G_END_DECLS
 
 #endif