[gedit/wip/spell-checking] spell: use G_DECLARE_* macros where the change is straightforward

[Sébastien Wilmet <swilmet src gnome org>]

commit dc1fb636b92d389c0025560ecd20b62d9578ac12
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Tue Jul 21 16:29:44 2015 +0200

    spell: use G_DECLARE_* macros where the change is straightforward
    
    Some other classes still use the old style, but it requires more work to
    change (either add a Private struct and use it, or don't use the 'priv'
    field).

 plugins/spell/gedit-spell-app-activatable.c |   11 +++++++-
 plugins/spell/gedit-spell-app-activatable.h |   32 ++++++--------------------
 plugins/spell/gedit-spell-language-dialog.c |    4 +--
 plugins/spell/gedit-spell-language-dialog.h |   28 +++++++----------------
 4 files changed, 27 insertions(+), 48 deletions(-)
---
diff --git a/plugins/spell/gedit-spell-app-activatable.c b/plugins/spell/gedit-spell-app-activatable.c
index 6fd52bf..73734e9 100644
--- a/plugins/spell/gedit-spell-app-activatable.c
+++ b/plugins/spell/gedit-spell-app-activatable.c
@@ -24,11 +24,18 @@
 #include <gedit/gedit-app-activatable.h>
 #include <gedit/gedit-app.h>
 
-typedef struct _GeditSpellAppActivatablePrivate
+typedef struct _GeditSpellAppActivatablePrivate GeditSpellAppActivatablePrivate;
+
+struct _GeditSpellAppActivatable
+{
+       GObject parent;
+};
+
+struct _GeditSpellAppActivatablePrivate
 {
        GeditApp *app;
        GeditMenuExtension *menu_ext;
-} GeditSpellAppActivatablePrivate;
+};
 
 enum
 {
diff --git a/plugins/spell/gedit-spell-app-activatable.h b/plugins/spell/gedit-spell-app-activatable.h
index 4dc2f02..68739b3 100644
--- a/plugins/spell/gedit-spell-app-activatable.h
+++ b/plugins/spell/gedit-spell-app-activatable.h
@@ -26,30 +26,14 @@
 
 G_BEGIN_DECLS
 
-#define GEDIT_TYPE_SPELL_APP_ACTIVATABLE               (gedit_spell_app_activatable_get_type ())
-#define GEDIT_SPELL_APP_ACTIVATABLE(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), 
GEDIT_TYPE_SPELL_APP_ACTIVATABLE, GeditSpellAppActivatable))
-#define GEDIT_SPELL_APP_ACTIVATABLE_CONST(obj)         (G_TYPE_CHECK_INSTANCE_CAST ((obj), 
GEDIT_TYPE_SPELL_APP_ACTIVATABLE, GeditSpellAppActivatable const))
-#define GEDIT_SPELL_APP_ACTIVATABLE_CLASS(klass)       (G_TYPE_CHECK_CLASS_CAST ((klass), 
GEDIT_TYPE_SPELL_APP_ACTIVATABLE, GeditSpellAppActivatableClass))
-#define GEDIT_IS_SPELL_APP_ACTIVATABLE(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), 
GEDIT_TYPE_SPELL_APP_ACTIVATABLE))
-#define GEDIT_IS_SPELL_APP_ACTIVATABLE_CLASS(klass)    (G_TYPE_CHECK_CLASS_TYPE ((klass), 
GEDIT_TYPE_SPELL_APP_ACTIVATABLE))
-#define GEDIT_SPELL_APP_ACTIVATABLE_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS ((obj), 
GEDIT_TYPE_SPELL_APP_ACTIVATABLE, GeditSpellAppActivatableClass))
-
-typedef struct _GeditSpellAppActivatable       GeditSpellAppActivatable;
-typedef struct _GeditSpellAppActivatableClass  GeditSpellAppActivatableClass;
-
-struct _GeditSpellAppActivatable
-{
-       GObject parent;
-};
-
-struct _GeditSpellAppActivatableClass
-{
-       GObjectClass parent_class;
-};
-
-GType          gedit_spell_app_activatable_get_type (void) G_GNUC_CONST;
-
-void           gedit_spell_app_activatable_register (GTypeModule *module);
+#define GEDIT_TYPE_SPELL_APP_ACTIVATABLE (gedit_spell_app_activatable_get_type ())
+G_DECLARE_FINAL_TYPE (GeditSpellAppActivatable,
+                     gedit_spell_app_activatable,
+                     GEDIT,
+                     SPELL_APP_ACTIVATABLE,
+                     GObject)
+
+void   gedit_spell_app_activatable_register    (GTypeModule *module);
 
 G_END_DECLS
 
diff --git a/plugins/spell/gedit-spell-language-dialog.c b/plugins/spell/gedit-spell-language-dialog.c
index 2a1c0a7..0b9ad95 100644
--- a/plugins/spell/gedit-spell-language-dialog.c
+++ b/plugins/spell/gedit-spell-language-dialog.c
@@ -32,7 +32,6 @@ enum
        ENCODING_NUM_COLS
 };
 
-
 struct _GeditSpellLanguageDialog
 {
        GtkDialog dialog;
@@ -41,8 +40,7 @@ struct _GeditSpellLanguageDialog
        GtkTreeModel *model;
 };
 
-G_DEFINE_TYPE(GeditSpellLanguageDialog, gedit_spell_language_dialog, GTK_TYPE_DIALOG)
-
+G_DEFINE_TYPE (GeditSpellLanguageDialog, gedit_spell_language_dialog, GTK_TYPE_DIALOG)
 
 static void
 gedit_spell_language_dialog_class_init (GeditSpellLanguageDialogClass *klass)
diff --git a/plugins/spell/gedit-spell-language-dialog.h b/plugins/spell/gedit-spell-language-dialog.h
index 561bcba..63e284d 100644
--- a/plugins/spell/gedit-spell-language-dialog.h
+++ b/plugins/spell/gedit-spell-language-dialog.h
@@ -26,29 +26,19 @@
 
 G_BEGIN_DECLS
 
-#define GEDIT_TYPE_SPELL_LANGUAGE_DIALOG              (gedit_spell_language_dialog_get_type())
-#define GEDIT_SPELL_LANGUAGE_DIALOG(obj)              (G_TYPE_CHECK_INSTANCE_CAST((obj), 
GEDIT_TYPE_SPELL_LANGUAGE_DIALOG, GeditSpellLanguageDialog))
-#define GEDIT_SPELL_LANGUAGE_DIALOG_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST((klass), 
GEDIT_TYPE_SPELL_LANGUAGE_DIALOG, GeditSpellLanguageDialogClass))
-#define GEDIT_IS_SPELL_LANGUAGE_DIALOG(obj)           (G_TYPE_CHECK_INSTANCE_TYPE((obj), 
GEDIT_TYPE_SPELL_LANGUAGE_DIALOG))
-#define GEDIT_IS_SPELL_LANGUAGE_DIALOG_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), 
GEDIT_TYPE_SPELL_LANGUAGE_DIALOG))
-#define GEDIT_SPELL_LANGUAGE_DIALOG_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS((obj), 
GEDIT_TYPE_SPELL_LANGUAGE_DIALOG, GeditSpellLanguageDialogClass))
-
-typedef struct _GeditSpellLanguageDialog       GeditSpellLanguageDialog;
-typedef struct _GeditSpellLanguageDialogClass  GeditSpellLanguageDialogClass;
-
-struct _GeditSpellLanguageDialogClass
-{
-       GtkDialogClass parent_class;
-};
-
-GType           gedit_spell_language_dialog_get_type           (void) G_GNUC_CONST;
-
-GtkWidget      *gedit_spell_language_dialog_new                (GtkWindow                       *parent,
+#define GEDIT_TYPE_SPELL_LANGUAGE_DIALOG (gedit_spell_language_dialog_get_type ())
+G_DECLARE_FINAL_TYPE (GeditSpellLanguageDialog,
+                     gedit_spell_language_dialog,
+                     GEDIT,
+                     SPELL_LANGUAGE_DIALOG,
+                     GtkDialog)
+
+GtkWidget *    gedit_spell_language_dialog_new                 (GtkWindow                       *parent,
                                                                 const GeditSpellCheckerLanguage *cur_lang,
                                                                 const gchar                     *data_dir);
 
 const GeditSpellCheckerLanguage *
-                gedit_spell_language_get_selected_language     (GeditSpellLanguageDialog *dlg);
+               gedit_spell_language_get_selected_language      (GeditSpellLanguageDialog *dialog);
 
 G_END_DECLS