Merge lp:~rodrigo-moya/unity/no-empty-private-structs into lp:unity

[Rodrigo Moya]

Remove all empty private structures to avoid warnings when calling g_type_class_add_private

[Neil J. Patel (njpatel)]

Makes sense.

review: Approve

=== modified file 'src/nux-area-accessible.cpp'
--- src/nux-area-accessible.cpp	2011-02-05 01:59:00 +0000
+++ src/nux-area-accessible.cpp	2011-02-17 13:16:49 +0000
@@ -49,32 +49,21 @@
 
 
 
-#define NUX_AREA_ACCESSIBLE_GET_PRIVATE(obj) \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), NUX_TYPE_AREA_ACCESSIBLE, NuxAreaAccessiblePrivate))
-
 G_DEFINE_TYPE_WITH_CODE (NuxAreaAccessible, nux_area_accessible,  NUX_TYPE_OBJECT_ACCESSIBLE,
                          G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, atk_component_interface_init))
 
-struct _NuxAreaAccessiblePrivate
-{
-};
-
 static void
 nux_area_accessible_class_init (NuxAreaAccessibleClass *klass)
 {
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
   AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
 
   /* AtkObject */
   atk_class->initialize = nux_area_accessible_initialize;
-
-  g_type_class_add_private (gobject_class, sizeof (NuxAreaAccessiblePrivate));
 }
 
 static void
 nux_area_accessible_init (NuxAreaAccessible *area_accessible)
 {
-  area_accessible->priv = NUX_AREA_ACCESSIBLE_GET_PRIVATE (area_accessible);
 }
 
 AtkObject*
 
=== modified file 'src/nux-area-accessible.h'
--- src/nux-area-accessible.h	2011-01-13 01:59:18 +0000
+++ src/nux-area-accessible.h	2011-02-17 13:16:49 +0000
@@ -34,14 +34,10 @@
 
 typedef struct _NuxAreaAccessible        NuxAreaAccessible;
 typedef struct _NuxAreaAccessibleClass   NuxAreaAccessibleClass;
-typedef struct _NuxAreaAccessiblePrivate NuxAreaAccessiblePrivate;
 
 struct _NuxAreaAccessible
 {
   NuxObjectAccessible parent;
-
-  /* < private > */
-  NuxAreaAccessiblePrivate *priv;
 };
 
 struct _NuxAreaAccessibleClass
 
=== modified file 'src/nux-base-window-accessible.cpp'
--- src/nux-base-window-accessible.cpp	2011-01-13 01:59:18 +0000
+++ src/nux-base-window-accessible.cpp	2011-02-17 13:16:49 +0000
@@ -48,20 +48,11 @@
 static AtkObject *nux_base_window_accessible_get_parent     (AtkObject *obj);
 
 
-#define NUX_BASE_WINDOW_ACCESSIBLE_GET_PRIVATE(obj) \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), NUX_TYPE_BASE_WINDOW_ACCESSIBLE, NuxBaseWindowAccessiblePrivate))
-
 G_DEFINE_TYPE (NuxBaseWindowAccessible, nux_base_window_accessible,  NUX_TYPE_VIEW_ACCESSIBLE)
 
-struct _NuxBaseWindowAccessiblePrivate
-{
-
-};
-
 static void
 nux_base_window_accessible_class_init (NuxBaseWindowAccessibleClass *klass)
 {
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
   AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
 
   /* AtkObject */
@@ -69,14 +60,11 @@
   atk_class->get_n_children = nux_base_window_accessible_get_n_children;
   atk_class->ref_child = nux_base_window_accessible_ref_child;
   atk_class->get_parent = nux_base_window_accessible_get_parent;
-
-  g_type_class_add_private (gobject_class, sizeof (NuxBaseWindowAccessiblePrivate));
 }
 
 static void
 nux_base_window_accessible_init (NuxBaseWindowAccessible *base_window_accessible)
 {
-  base_window_accessible->priv = NUX_BASE_WINDOW_ACCESSIBLE_GET_PRIVATE (base_window_accessible);
 }
 
 AtkObject*
 
=== modified file 'src/nux-base-window-accessible.h'
--- src/nux-base-window-accessible.h	2011-01-13 01:59:18 +0000
+++ src/nux-base-window-accessible.h	2011-02-17 13:16:49 +0000
@@ -37,14 +37,10 @@
 
 typedef struct _NuxBaseWindowAccessible        NuxBaseWindowAccessible;
 typedef struct _NuxBaseWindowAccessibleClass   NuxBaseWindowAccessibleClass;
-typedef struct _NuxBaseWindowAccessiblePrivate NuxBaseWindowAccessiblePrivate;
 
 struct _NuxBaseWindowAccessible
 {
   NuxViewAccessible parent;
-
-  /* < private > */
-  NuxBaseWindowAccessiblePrivate *priv;
 };
 
 struct _NuxBaseWindowAccessibleClass
 
=== modified file 'src/nux-layout-accessible.cpp'
--- src/nux-layout-accessible.cpp	2011-01-13 01:59:18 +0000
+++ src/nux-layout-accessible.cpp	2011-02-17 13:16:49 +0000
@@ -44,33 +44,22 @@
                                                         gint i);
 
 
-#define NUX_LAYOUT_ACCESSIBLE_GET_PRIVATE(obj)                          \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), NUX_TYPE_LAYOUT_ACCESSIBLE, NuxLayoutAccessiblePrivate))
-
 G_DEFINE_TYPE (NuxLayoutAccessible, nux_layout_accessible,  NUX_TYPE_AREA_ACCESSIBLE)
 
-struct _NuxLayoutAccessiblePrivate
-{
-};
-
 static void
 nux_layout_accessible_class_init (NuxLayoutAccessibleClass *klass)
 {
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
   AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
 
   /* AtkObject */
   atk_class->initialize = nux_layout_accessible_initialize;
   atk_class->ref_child = nux_layout_accessible_ref_child;
   atk_class->get_n_children = nux_layout_accessible_get_n_children;
-
-  g_type_class_add_private (gobject_class, sizeof (NuxLayoutAccessiblePrivate));
 }
 
 static void
 nux_layout_accessible_init (NuxLayoutAccessible *layout_accessible)
 {
-  layout_accessible->priv = NUX_LAYOUT_ACCESSIBLE_GET_PRIVATE (layout_accessible);
 }
 
 AtkObject*
 
=== modified file 'src/nux-layout-accessible.h'
--- src/nux-layout-accessible.h	2011-01-13 01:59:18 +0000
+++ src/nux-layout-accessible.h	2011-02-17 13:16:49 +0000
@@ -37,14 +37,10 @@
 
 typedef struct _NuxLayoutAccessible        NuxLayoutAccessible;
 typedef struct _NuxLayoutAccessibleClass   NuxLayoutAccessibleClass;
-typedef struct _NuxLayoutAccessiblePrivate NuxLayoutAccessiblePrivate;
 
 struct _NuxLayoutAccessible
 {
   NuxAreaAccessible parent;
-
-  /* < private > */
-  NuxLayoutAccessiblePrivate *priv;
 };
 
 struct _NuxLayoutAccessibleClass
 
=== modified file 'src/nux-view-accessible.cpp'
--- src/nux-view-accessible.cpp	2011-02-05 01:59:00 +0000
+++ src/nux-view-accessible.cpp	2011-02-17 13:16:49 +0000
@@ -53,36 +53,25 @@
 static void nux_view_accessible_focus_handler (AtkObject *accessible,
                                                gboolean focus_in);
 
-#define NUX_VIEW_ACCESSIBLE_GET_PRIVATE(obj) \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), NUX_TYPE_VIEW_ACCESSIBLE, NuxViewAccessiblePrivate))
-
 G_DEFINE_TYPE_WITH_CODE (NuxViewAccessible,
                          nux_view_accessible,
                          NUX_TYPE_AREA_ACCESSIBLE,
                          G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT,
                                                 atk_component_interface_init))
 
-struct _NuxViewAccessiblePrivate
-{
-};
-
 static void
 nux_view_accessible_class_init (NuxViewAccessibleClass *klass)
 {
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
   AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
 
   /* AtkObject */
   atk_class->initialize = nux_view_accessible_initialize;
   atk_class->ref_state_set = nux_view_accessible_ref_state_set;
-
-  g_type_class_add_private (gobject_class, sizeof (NuxViewAccessiblePrivate));
 }
 
 static void
 nux_view_accessible_init (NuxViewAccessible *view_accessible)
 {
-  view_accessible->priv = NUX_VIEW_ACCESSIBLE_GET_PRIVATE (view_accessible);
 }
 
 AtkObject*
 
=== modified file 'src/nux-view-accessible.h'
--- src/nux-view-accessible.h	2011-01-13 01:59:18 +0000
+++ src/nux-view-accessible.h	2011-02-17 13:16:49 +0000
@@ -37,14 +37,10 @@
 
 typedef struct _NuxViewAccessible        NuxViewAccessible;
 typedef struct _NuxViewAccessibleClass   NuxViewAccessibleClass;
-typedef struct _NuxViewAccessiblePrivate NuxViewAccessiblePrivate;
 
 struct _NuxViewAccessible
 {
   NuxAreaAccessible parent;
-
-  /* < private > */
-  NuxViewAccessiblePrivate *priv;
 };
 
 struct _NuxViewAccessibleClass
 
=== modified file 'src/unity-launcher-accessible.cpp'
--- src/unity-launcher-accessible.cpp	2011-01-18 15:56:03 +0000
+++ src/unity-launcher-accessible.cpp	2011-02-17 13:16:49 +0000
@@ -45,33 +45,22 @@
 static AtkObject *unity_launcher_accessible_ref_child      (AtkObject *obj,
                                                             gint i);
 
-#define UNITY_LAUNCHER_ACCESSIBLE_GET_PRIVATE(obj)                      \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), UNITY_TYPE_LAUNCHER_ACCESSIBLE, UnityLauncherAccessiblePrivate))
-
 G_DEFINE_TYPE (UnityLauncherAccessible, unity_launcher_accessible,  NUX_TYPE_VIEW_ACCESSIBLE)
 
-struct _UnityLauncherAccessiblePrivate
-{
-};
-
 static void
 unity_launcher_accessible_class_init (UnityLauncherAccessibleClass *klass)
 {
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
   AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
 
   /* AtkObject */
   atk_class->get_n_children = unity_launcher_accessible_get_n_children;
   atk_class->ref_child = unity_launcher_accessible_ref_child;
   atk_class->initialize = unity_launcher_accessible_initialize;
-
-  g_type_class_add_private (gobject_class, sizeof (UnityLauncherAccessiblePrivate));
 }
 
 static void
 unity_launcher_accessible_init (UnityLauncherAccessible *self)
 {
-  self->priv = UNITY_LAUNCHER_ACCESSIBLE_GET_PRIVATE (self);
 }
 
 AtkObject*
 
=== modified file 'src/unity-launcher-accessible.h'
--- src/unity-launcher-accessible.h	2011-01-13 01:59:18 +0000
+++ src/unity-launcher-accessible.h	2011-02-17 13:16:49 +0000
@@ -34,14 +34,10 @@
 
 typedef struct _UnityLauncherAccessible        UnityLauncherAccessible;
 typedef struct _UnityLauncherAccessibleClass   UnityLauncherAccessibleClass;
-typedef struct _UnityLauncherAccessiblePrivate UnityLauncherAccessiblePrivate;
 
 struct _UnityLauncherAccessible
 {
   NuxViewAccessible parent;
-
-  /* < private > */
-  UnityLauncherAccessiblePrivate *priv;
 };
 
 struct _UnityLauncherAccessibleClass
 
=== modified file 'src/unity-launcher-icon-accessible.cpp'
--- src/unity-launcher-icon-accessible.cpp	2011-01-13 01:59:18 +0000
+++ src/unity-launcher-icon-accessible.cpp	2011-02-17 13:16:49 +0000
@@ -41,32 +41,21 @@
 static const gchar * unity_launcher_icon_accessible_get_name   (AtkObject *obj);
 
 
-#define UNITY_LAUNCHER_ICON_ACCESSIBLE_GET_PRIVATE(obj)                 \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), UNITY_TYPE_LAUNCHER_ICON_ACCESSIBLE, UnityLauncherIconAccessiblePrivate))
-
 G_DEFINE_TYPE (UnityLauncherIconAccessible, unity_launcher_icon_accessible,  NUX_TYPE_OBJECT_ACCESSIBLE)
 
-struct _UnityLauncherIconAccessiblePrivate
-{
-};
-
 static void
 unity_launcher_icon_accessible_class_init (UnityLauncherIconAccessibleClass *klass)
 {
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
   AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
 
   /* AtkObject */
   atk_class->initialize = unity_launcher_icon_accessible_initialize;
   atk_class->get_name = unity_launcher_icon_accessible_get_name;
-
-  g_type_class_add_private (gobject_class, sizeof (UnityLauncherIconAccessiblePrivate));
 }
 
 static void
 unity_launcher_icon_accessible_init (UnityLauncherIconAccessible *launcher_icon_accessible)
 {
-  launcher_icon_accessible->priv = UNITY_LAUNCHER_ICON_ACCESSIBLE_GET_PRIVATE (launcher_icon_accessible);
 }
 
 AtkObject*
 
=== modified file 'src/unity-launcher-icon-accessible.h'
--- src/unity-launcher-icon-accessible.h	2011-01-13 01:59:18 +0000
+++ src/unity-launcher-icon-accessible.h	2011-02-17 13:16:49 +0000
@@ -34,14 +34,10 @@
 
 typedef struct _UnityLauncherIconAccessible        UnityLauncherIconAccessible;
 typedef struct _UnityLauncherIconAccessibleClass   UnityLauncherIconAccessibleClass;
-typedef struct _UnityLauncherIconAccessiblePrivate UnityLauncherIconAccessiblePrivate;
 
 struct _UnityLauncherIconAccessible
 {
   NuxObjectAccessible parent;
-
-  /* < private > */
-  UnityLauncherIconAccessiblePrivate *priv;
 };
 
 struct _UnityLauncherIconAccessibleClass
 
=== modified file 'src/unity-panel-home-button-accessible.cpp'
--- src/unity-panel-home-button-accessible.cpp	2011-02-14 13:18:26 +0000
+++ src/unity-panel-home-button-accessible.cpp	2011-02-17 13:16:49 +0000
@@ -41,31 +41,20 @@
 /* AtkObject */
 static void       unity_panel_home_button_accessible_initialize     (AtkObject *accessible, gpointer data);
 
-#define UNITY_PANEL_HOME_BUTTON_ACCESSIBLE_GET_PRIVATE(obj)                      \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), UNITY_TYPE_PANEL_HOME_BUTTON_ACCESSIBLE, UnityPanelHomeButtonAccessiblePrivate))
-
 G_DEFINE_TYPE (UnityPanelHomeButtonAccessible, unity_panel_home_button_accessible,  NUX_TYPE_VIEW_ACCESSIBLE)
 
-struct _UnityPanelHomeButtonAccessiblePrivate
-{
-};
-
 static void
 unity_panel_home_button_accessible_class_init (UnityPanelHomeButtonAccessibleClass *klass)
 {
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
   AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
 
   /* AtkObject */
   atk_class->initialize = unity_panel_home_button_accessible_initialize;
-
-  g_type_class_add_private (gobject_class, sizeof (UnityPanelHomeButtonAccessiblePrivate));
 }
 
 static void
 unity_panel_home_button_accessible_init (UnityPanelHomeButtonAccessible *self)
 {
-  self->priv = UNITY_PANEL_HOME_BUTTON_ACCESSIBLE_GET_PRIVATE (self);
 }
 
 AtkObject *
 
=== modified file 'src/unity-panel-home-button-accessible.h'
--- src/unity-panel-home-button-accessible.h	2011-01-24 09:10:38 +0000
+++ src/unity-panel-home-button-accessible.h	2011-02-17 13:16:49 +0000
@@ -34,14 +34,10 @@
 
 typedef struct _UnityPanelHomeButtonAccessible        UnityPanelHomeButtonAccessible;
 typedef struct _UnityPanelHomeButtonAccessibleClass   UnityPanelHomeButtonAccessibleClass;
-typedef struct _UnityPanelHomeButtonAccessiblePrivate UnityPanelHomeButtonAccessiblePrivate;
 
 struct _UnityPanelHomeButtonAccessible
 {
   NuxViewAccessible parent;
-
-  /* < private > */
-  UnityPanelHomeButtonAccessiblePrivate *priv;
 };
 
 struct _UnityPanelHomeButtonAccessibleClass
 
=== modified file 'src/unity-panel-view-accessible.cpp'
--- src/unity-panel-view-accessible.cpp	2011-02-14 16:35:25 +0000
+++ src/unity-panel-view-accessible.cpp	2011-02-17 13:16:49 +0000
@@ -44,33 +44,22 @@
 static gint         unity_panel_view_accessible_get_n_children (AtkObject *accessible);
 static AtkObject   *unity_panel_view_accessible_ref_child      (AtkObject *accessible, gint i);
 
-#define UNITY_PANEL_VIEW_ACCESSIBLE_GET_PRIVATE(obj)                      \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), UNITY_TYPE_PANEL_VIEW_ACCESSIBLE, UnityPanelViewAccessiblePrivate))
-
 G_DEFINE_TYPE (UnityPanelViewAccessible, unity_panel_view_accessible,  NUX_TYPE_VIEW_ACCESSIBLE)
 
-struct _UnityPanelViewAccessiblePrivate
-{
-};
-
 static void
 unity_panel_view_accessible_class_init (UnityPanelViewAccessibleClass *klass)
 {
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
   AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
 
   /* AtkObject */
   atk_class->initialize = unity_panel_view_accessible_initialize;
   atk_class->get_n_children = unity_panel_view_accessible_get_n_children;
   atk_class->ref_child = unity_panel_view_accessible_ref_child;
-
-  g_type_class_add_private (gobject_class, sizeof (UnityPanelViewAccessiblePrivate));
 }
 
 static void
 unity_panel_view_accessible_init (UnityPanelViewAccessible *self)
 {
-  self->priv = UNITY_PANEL_VIEW_ACCESSIBLE_GET_PRIVATE (self);
 }
 
 AtkObject *
 
=== modified file 'src/unity-panel-view-accessible.h'
--- src/unity-panel-view-accessible.h	2011-01-25 10:56:17 +0000
+++ src/unity-panel-view-accessible.h	2011-02-17 13:16:49 +0000
@@ -34,14 +34,10 @@
 
 typedef struct _UnityPanelViewAccessible        UnityPanelViewAccessible;
 typedef struct _UnityPanelViewAccessibleClass   UnityPanelViewAccessibleClass;
-typedef struct _UnityPanelViewAccessiblePrivate UnityPanelViewAccessiblePrivate;
 
 struct _UnityPanelViewAccessible
 {
   NuxViewAccessible parent;
-
-  /* < private > */
-  UnityPanelViewAccessiblePrivate *priv;
 };
 
 struct _UnityPanelViewAccessibleClass