[epiphany] lockdown: Use G_DECLARE_FINAL_TYPE
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] lockdown: Use G_DECLARE_FINAL_TYPE
- Date: Sat, 27 Feb 2016 23:10:20 +0000 (UTC)
commit fe1a422b1575bb99690c7bb817c58be421b8e898
Author: Michael Catanzaro <mcatanzaro igalia com>
Date: Sat Feb 27 16:29:49 2016 -0600
lockdown: Use G_DECLARE_FINAL_TYPE
src/ephy-lockdown.c | 9 +++++++--
src/ephy-lockdown.h | 26 ++------------------------
2 files changed, 9 insertions(+), 26 deletions(-)
---
diff --git a/src/ephy-lockdown.c b/src/ephy-lockdown.c
index d26519d..22eaea3 100644
--- a/src/ephy-lockdown.c
+++ b/src/ephy-lockdown.c
@@ -34,6 +34,13 @@
#define LOCKDOWN_FLAG 1 << 8
+struct _EphyLockdown
+{
+ GObject parent_instance;
+};
+
+G_DEFINE_TYPE (EphyLockdown, ephy_lockdown, G_TYPE_OBJECT)
+
static int
find_name (GtkActionGroup *action_group,
const char *name)
@@ -242,8 +249,6 @@ window_added_cb (GtkApplication *application,
}
}
-G_DEFINE_TYPE (EphyLockdown, ephy_lockdown, G_TYPE_OBJECT)
-
static void
ephy_lockdown_init (EphyLockdown *lockdown)
{
diff --git a/src/ephy-lockdown.h b/src/ephy-lockdown.h
index 4a3e925..7b01aa0 100644
--- a/src/ephy-lockdown.h
+++ b/src/ephy-lockdown.h
@@ -25,31 +25,9 @@
G_BEGIN_DECLS
-#define EPHY_TYPE_LOCKDOWN (ephy_lockdown_get_type ())
-#define EPHY_LOCKDOWN(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_LOCKDOWN, EphyLockdown))
-#define EPHY_LOCKDOWN_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_LOCKDOWN, EphyLockdownClass))
-#define EPHY_IS_LOCKDOWN(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_LOCKDOWN))
-#define EPHY_IS_LOCKDOWN_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_LOCKDOWN))
-#define EPHY_LOCKDOWN_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_LOCKDOWN, EphyLockdownClass))
+#define EPHY_TYPE_LOCKDOWN (ephy_lockdown_get_type ())
-typedef struct _EphyLockdownClass EphyLockdownClass;
-typedef struct _EphyLockdown EphyLockdown;
-typedef struct _EphyLockdownPrivate EphyLockdownPrivate;
-
-struct _EphyLockdownClass
-{
- GObjectClass parent_class;
-};
-
-struct _EphyLockdown
-{
- GObject parent_instance;
-
- /*< private >*/
- EphyLockdownPrivate *priv;
-};
-
-GType ephy_lockdown_get_type (void);
+G_DECLARE_FINAL_TYPE (EphyLockdown, ephy_lockdown, EPHY, LOCKDOWN, GObject)
G_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]