a11y-keyboard-atspi: Switch to a final type and reduce boilerplate

1 files changed, 3 insertions, 21 deletions

diff --git a/plugins/a11y-keyboard/msd-a11y-keyboard-atspi.h b/plugins/a11y-keyboard/msd-a11y-keyboard-atspi.h
index 32fc0e7..fc97494 100644
--- a/plugins/a11y-keyboard/msd-a11y-keyboard-atspi.h
+++ b/plugins/a11y-keyboard/msd-a11y-keyboard-atspi.h
@@ -24,27 +24,9 @@
 
 G_BEGIN_DECLS
 
-#define MSD_TYPE_A11Y_KEYBOARD_ATSPI            (msd_a11y_keyboard_atspi_get_type ())
-#define MSD_A11Y_KEYBOARD_ATSPI(o)              (G_TYPE_CHECK_INSTANCE_CAST ((o), MSD_TYPE_A11Y_KEYBOARD_ATSPI, MsdA11yKeyboardAtspi))
-#define MSD_A11Y_KEYBOARD_ATSPI_CLASS(k)        (G_TYPE_CHECK_CLASS_CAST((k), MSD_TYPE_A11Y_KEYBOARD_ATSPI, MsdA11yKeyboardAtspiClass))
-#define MSD_IS_A11Y_KEYBOARD_ATSPI(o)           (G_TYPE_CHECK_INSTANCE_TYPE ((o), MSD_TYPE_A11Y_KEYBOARD_ATSPI))
-#define MSD_IS_A11Y_KEYBOARD_ATSPI_CLASS(k)     (G_TYPE_CHECK_CLASS_TYPE ((k), MSD_TYPE_A11Y_KEYBOARD_ATSPI))
-#define MSD_A11Y_KEYBOARD_ATSPI_GET_CLASS(o)    (G_TYPE_INSTANCE_GET_CLASS ((o), MSD_TYPE_A11Y_KEYBOARD_ATSPI, MsdA11yKeyboardAtspiClass))
-
-typedef struct MsdA11yKeyboardAtspiPrivate MsdA11yKeyboardAtspiPrivate;
-
-typedef struct
-{
-        GObject                         parent;
-        MsdA11yKeyboardAtspiPrivate    *priv;
-} MsdA11yKeyboardAtspi;
-
-typedef struct
-{
-        GObjectClass   parent_class;
-} MsdA11yKeyboardAtspiClass;
-
-GType                   msd_a11y_keyboard_atspi_get_type        (void);
+#define MSD_TYPE_A11Y_KEYBOARD_ATSPI (msd_a11y_keyboard_atspi_get_type ())
+G_DECLARE_FINAL_TYPE (MsdA11yKeyboardAtspi, msd_a11y_keyboard_atspi,
+                      MSD, A11Y_KEYBOARD_ATSPI, GObject)
 
 MsdA11yKeyboardAtspi   *msd_a11y_keyboard_atspi_new             (void);
 void                    msd_a11y_keyboard_atspi_start           (MsdA11yKeyboardAtspi *self);