[gedit] activatables: use G_DECLARE_INTERFACE

[Paolo Borelli <pborelli src gnome org>]

commit a91839e83bee315ef544e4fb2e8c487e7ca8bcc6
Author: Paolo Borelli <pborelli gnome org>
Date:   Sun Apr 19 15:58:31 2015 +0200

    activatables: use G_DECLARE_INTERFACE

 gedit/gedit-app-activatable.h    |   17 ++---------------
 gedit/gedit-view-activatable.h   |   18 +++---------------
 gedit/gedit-window-activatable.h |   18 ++----------------
 3 files changed, 7 insertions(+), 46 deletions(-)
---
diff --git a/gedit/gedit-app-activatable.h b/gedit/gedit-app-activatable.h
index d39884f..dbfc6ac 100644
--- a/gedit/gedit-app-activatable.h
+++ b/gedit/gedit-app-activatable.h
@@ -27,17 +27,9 @@
 
 G_BEGIN_DECLS
 
-/*
- * Type checking and casting macros
- */
-#define GEDIT_TYPE_APP_ACTIVATABLE             (gedit_app_activatable_get_type ())
-#define GEDIT_APP_ACTIVATABLE(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), 
GEDIT_TYPE_APP_ACTIVATABLE, GeditAppActivatable))
-#define GEDIT_APP_ACTIVATABLE_IFACE(obj)       (G_TYPE_CHECK_CLASS_CAST ((obj), GEDIT_TYPE_APP_ACTIVATABLE, 
GeditAppActivatableInterface))
-#define GEDIT_IS_APP_ACTIVATABLE(obj)  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEDIT_TYPE_APP_ACTIVATABLE))
-#define GEDIT_APP_ACTIVATABLE_GET_IFACE(obj)   (G_TYPE_INSTANCE_GET_INTERFACE ((obj), 
GEDIT_TYPE_APP_ACTIVATABLE, GeditAppActivatableInterface))
+#define GEDIT_TYPE_APP_ACTIVATABLE (gedit_app_activatable_get_type ())
 
-typedef struct _GeditAppActivatable           GeditAppActivatable; /* dummy typedef */
-typedef struct _GeditAppActivatableInterface  GeditAppActivatableInterface;
+G_DECLARE_INTERFACE (GeditAppActivatable, gedit_app_activatable, GEDIT, APP_ACTIVATABLE, GObject)
 
 struct _GeditAppActivatableInterface
 {
@@ -48,11 +40,6 @@ struct _GeditAppActivatableInterface
        void    (*deactivate)           (GeditAppActivatable *activatable);
 };
 
-/*
- * Public methods
- */
-GType   gedit_app_activatable_get_type (void)  G_GNUC_CONST;
-
 void    gedit_app_activatable_activate                 (GeditAppActivatable *activatable);
 void    gedit_app_activatable_deactivate               (GeditAppActivatable *activatable);
 
diff --git a/gedit/gedit-view-activatable.h b/gedit/gedit-view-activatable.h
index 26e2388..5ff45e4 100644
--- a/gedit/gedit-view-activatable.h
+++ b/gedit/gedit-view-activatable.h
@@ -25,17 +25,9 @@
 
 G_BEGIN_DECLS
 
-/*
- * Type checking and casting macros
- */
-#define GEDIT_TYPE_VIEW_ACTIVATABLE            (gedit_view_activatable_get_type ())
-#define GEDIT_VIEW_ACTIVATABLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), 
GEDIT_TYPE_VIEW_ACTIVATABLE, GeditViewActivatable))
-#define GEDIT_VIEW_ACTIVATABLE_IFACE(obj)      (G_TYPE_CHECK_CLASS_CAST ((obj), GEDIT_TYPE_VIEW_ACTIVATABLE, 
GeditViewActivatableInterface))
-#define GEDIT_IS_VIEW_ACTIVATABLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), 
GEDIT_TYPE_VIEW_ACTIVATABLE))
-#define GEDIT_VIEW_ACTIVATABLE_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), 
GEDIT_TYPE_VIEW_ACTIVATABLE, GeditViewActivatableInterface))
+#define GEDIT_TYPE_VIEW_ACTIVATABLE (gedit_view_activatable_get_type ())
 
-typedef struct _GeditViewActivatable           GeditViewActivatable; /* dummy typedef */
-typedef struct _GeditViewActivatableInterface  GeditViewActivatableInterface;
+G_DECLARE_INTERFACE (GeditViewActivatable, gedit_view_activatable, GEDIT, VIEW_ACTIVATABLE, GObject)
 
 struct _GeditViewActivatableInterface
 {
@@ -46,14 +38,10 @@ struct _GeditViewActivatableInterface
        void    (*deactivate)           (GeditViewActivatable *activatable);
 };
 
-/*
- * Public methods
- */
-GType   gedit_view_activatable_get_type        (void)  G_GNUC_CONST;
-
 void    gedit_view_activatable_activate        (GeditViewActivatable *activatable);
 void    gedit_view_activatable_deactivate      (GeditViewActivatable *activatable);
 
 G_END_DECLS
 
 #endif /* __GEDIT_VIEW_ACTIVATABLE_H__ */
+/* ex:set ts=8 noet: */
diff --git a/gedit/gedit-window-activatable.h b/gedit/gedit-window-activatable.h
index 9b3c532..a7a6bd1 100644
--- a/gedit/gedit-window-activatable.h
+++ b/gedit/gedit-window-activatable.h
@@ -25,17 +25,9 @@
 
 G_BEGIN_DECLS
 
-/*
- * Type checking and casting macros
- */
-#define GEDIT_TYPE_WINDOW_ACTIVATABLE          (gedit_window_activatable_get_type ())
-#define GEDIT_WINDOW_ACTIVATABLE(obj)          (G_TYPE_CHECK_INSTANCE_CAST ((obj), 
GEDIT_TYPE_WINDOW_ACTIVATABLE, GeditWindowActivatable))
-#define GEDIT_WINDOW_ACTIVATABLE_IFACE(obj)    (G_TYPE_CHECK_CLASS_CAST ((obj), 
GEDIT_TYPE_WINDOW_ACTIVATABLE, GeditWindowActivatableInterface))
-#define GEDIT_IS_WINDOW_ACTIVATABLE(obj)       (G_TYPE_CHECK_INSTANCE_TYPE ((obj), 
GEDIT_TYPE_WINDOW_ACTIVATABLE))
-#define GEDIT_WINDOW_ACTIVATABLE_GET_IFACE(obj)        (G_TYPE_INSTANCE_GET_INTERFACE ((obj), 
GEDIT_TYPE_WINDOW_ACTIVATABLE, GeditWindowActivatableInterface))
+#define GEDIT_TYPE_WINDOW_ACTIVATABLE (gedit_window_activatable_get_type ())
 
-typedef struct _GeditWindowActivatable           GeditWindowActivatable; /* dummy typedef */
-typedef struct _GeditWindowActivatableInterface  GeditWindowActivatableInterface;
+G_DECLARE_INTERFACE (GeditWindowActivatable, gedit_window_activatable, GEDIT, WINDOW_ACTIVATABLE, GObject)
 
 struct _GeditWindowActivatableInterface
 {
@@ -47,11 +39,6 @@ struct _GeditWindowActivatableInterface
        void    (*update_state)         (GeditWindowActivatable *activatable);
 };
 
-/*
- * Public methods
- */
-GType   gedit_window_activatable_get_type      (void)  G_GNUC_CONST;
-
 void    gedit_window_activatable_activate      (GeditWindowActivatable *activatable);
 void    gedit_window_activatable_deactivate    (GeditWindowActivatable *activatable);
 void    gedit_window_activatable_update_state  (GeditWindowActivatable *activatable);
@@ -59,5 +46,4 @@ void   gedit_window_activatable_update_state  (GeditWindowActivatable *activatable
 G_END_DECLS
 
 #endif /* __GEDIT_WINDOW_ACTIVATABLE_H__ */
-
 /* ex:set ts=8 noet: */