Unity

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

  1. no-empty-private-structs
  2. Merge into trunk
Proposed by Rodrigo Moya
Status: Merged
Approved by: Neil J. Patel
Approved revision: no longer in the source branch.
Merged at revision: 868
Proposed branch: lp:~rodrigo-moya/unity/no-empty-private-structs
Merge into: lp:unity
Diff against target: 456 lines (+0/-121)
16 files modified
src/nux-area-accessible.cpp (+0/-11)
src/nux-area-accessible.h (+0/-4)
src/nux-base-window-accessible.cpp (+0/-12)
src/nux-base-window-accessible.h (+0/-4)
src/nux-layout-accessible.cpp (+0/-11)
src/nux-layout-accessible.h (+0/-4)
src/nux-view-accessible.cpp (+0/-11)
src/nux-view-accessible.h (+0/-4)
src/unity-launcher-accessible.cpp (+0/-11)
src/unity-launcher-accessible.h (+0/-4)
src/unity-launcher-icon-accessible.cpp (+0/-11)
src/unity-launcher-icon-accessible.h (+0/-4)
src/unity-panel-home-button-accessible.cpp (+0/-11)
src/unity-panel-home-button-accessible.h (+0/-4)
src/unity-panel-view-accessible.cpp (+0/-11)
src/unity-panel-view-accessible.h (+0/-4)
To merge this branch: bzr merge lp:~rodrigo-moya/unity/no-empty-private-structs
Reviewer Review Type Date Requested Status
Neil J. Patel (community) Approve
Review via email: mp+50143@code.launchpad.net

Description of the change

Remove all empty private structures to avoid warnings when calling g_type_class_add_private

To post a comment you must log in.
Revision history for this message
Neil J. Patel (njpatel) wrote :

Makes sense.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/nux-area-accessible.cpp'
2--- src/nux-area-accessible.cpp 2011-02-05 01:59:00 +0000
3+++ src/nux-area-accessible.cpp 2011-02-17 13:16:49 +0000
4@@ -49,32 +49,21 @@
5
6
7
8-#define NUX_AREA_ACCESSIBLE_GET_PRIVATE(obj) \
9- (G_TYPE_INSTANCE_GET_PRIVATE ((obj), NUX_TYPE_AREA_ACCESSIBLE, NuxAreaAccessiblePrivate))
10-
11 G_DEFINE_TYPE_WITH_CODE (NuxAreaAccessible, nux_area_accessible, NUX_TYPE_OBJECT_ACCESSIBLE,
12 G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, atk_component_interface_init))
13
14-struct _NuxAreaAccessiblePrivate
15-{
16-};
17-
18 static void
19 nux_area_accessible_class_init (NuxAreaAccessibleClass *klass)
20 {
21- GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
22 AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
23
24 /* AtkObject */
25 atk_class->initialize = nux_area_accessible_initialize;
26-
27- g_type_class_add_private (gobject_class, sizeof (NuxAreaAccessiblePrivate));
28 }
29
30 static void
31 nux_area_accessible_init (NuxAreaAccessible *area_accessible)
32 {
33- area_accessible->priv = NUX_AREA_ACCESSIBLE_GET_PRIVATE (area_accessible);
34 }
35
36 AtkObject*
37
38=== modified file 'src/nux-area-accessible.h'
39--- src/nux-area-accessible.h 2011-01-13 01:59:18 +0000
40+++ src/nux-area-accessible.h 2011-02-17 13:16:49 +0000
41@@ -34,14 +34,10 @@
42
43 typedef struct _NuxAreaAccessible NuxAreaAccessible;
44 typedef struct _NuxAreaAccessibleClass NuxAreaAccessibleClass;
45-typedef struct _NuxAreaAccessiblePrivate NuxAreaAccessiblePrivate;
46
47 struct _NuxAreaAccessible
48 {
49 NuxObjectAccessible parent;
50-
51- /* < private > */
52- NuxAreaAccessiblePrivate *priv;
53 };
54
55 struct _NuxAreaAccessibleClass
56
57=== modified file 'src/nux-base-window-accessible.cpp'
58--- src/nux-base-window-accessible.cpp 2011-01-13 01:59:18 +0000
59+++ src/nux-base-window-accessible.cpp 2011-02-17 13:16:49 +0000
60@@ -48,20 +48,11 @@
61 static AtkObject *nux_base_window_accessible_get_parent (AtkObject *obj);
62
63
64-#define NUX_BASE_WINDOW_ACCESSIBLE_GET_PRIVATE(obj) \
65- (G_TYPE_INSTANCE_GET_PRIVATE ((obj), NUX_TYPE_BASE_WINDOW_ACCESSIBLE, NuxBaseWindowAccessiblePrivate))
66-
67 G_DEFINE_TYPE (NuxBaseWindowAccessible, nux_base_window_accessible, NUX_TYPE_VIEW_ACCESSIBLE)
68
69-struct _NuxBaseWindowAccessiblePrivate
70-{
71-
72-};
73-
74 static void
75 nux_base_window_accessible_class_init (NuxBaseWindowAccessibleClass *klass)
76 {
77- GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
78 AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
79
80 /* AtkObject */
81@@ -69,14 +60,11 @@
82 atk_class->get_n_children = nux_base_window_accessible_get_n_children;
83 atk_class->ref_child = nux_base_window_accessible_ref_child;
84 atk_class->get_parent = nux_base_window_accessible_get_parent;
85-
86- g_type_class_add_private (gobject_class, sizeof (NuxBaseWindowAccessiblePrivate));
87 }
88
89 static void
90 nux_base_window_accessible_init (NuxBaseWindowAccessible *base_window_accessible)
91 {
92- base_window_accessible->priv = NUX_BASE_WINDOW_ACCESSIBLE_GET_PRIVATE (base_window_accessible);
93 }
94
95 AtkObject*
96
97=== modified file 'src/nux-base-window-accessible.h'
98--- src/nux-base-window-accessible.h 2011-01-13 01:59:18 +0000
99+++ src/nux-base-window-accessible.h 2011-02-17 13:16:49 +0000
100@@ -37,14 +37,10 @@
101
102 typedef struct _NuxBaseWindowAccessible NuxBaseWindowAccessible;
103 typedef struct _NuxBaseWindowAccessibleClass NuxBaseWindowAccessibleClass;
104-typedef struct _NuxBaseWindowAccessiblePrivate NuxBaseWindowAccessiblePrivate;
105
106 struct _NuxBaseWindowAccessible
107 {
108 NuxViewAccessible parent;
109-
110- /* < private > */
111- NuxBaseWindowAccessiblePrivate *priv;
112 };
113
114 struct _NuxBaseWindowAccessibleClass
115
116=== modified file 'src/nux-layout-accessible.cpp'
117--- src/nux-layout-accessible.cpp 2011-01-13 01:59:18 +0000
118+++ src/nux-layout-accessible.cpp 2011-02-17 13:16:49 +0000
119@@ -44,33 +44,22 @@
120 gint i);
121
122
123-#define NUX_LAYOUT_ACCESSIBLE_GET_PRIVATE(obj) \
124- (G_TYPE_INSTANCE_GET_PRIVATE ((obj), NUX_TYPE_LAYOUT_ACCESSIBLE, NuxLayoutAccessiblePrivate))
125-
126 G_DEFINE_TYPE (NuxLayoutAccessible, nux_layout_accessible, NUX_TYPE_AREA_ACCESSIBLE)
127
128-struct _NuxLayoutAccessiblePrivate
129-{
130-};
131-
132 static void
133 nux_layout_accessible_class_init (NuxLayoutAccessibleClass *klass)
134 {
135- GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
136 AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
137
138 /* AtkObject */
139 atk_class->initialize = nux_layout_accessible_initialize;
140 atk_class->ref_child = nux_layout_accessible_ref_child;
141 atk_class->get_n_children = nux_layout_accessible_get_n_children;
142-
143- g_type_class_add_private (gobject_class, sizeof (NuxLayoutAccessiblePrivate));
144 }
145
146 static void
147 nux_layout_accessible_init (NuxLayoutAccessible *layout_accessible)
148 {
149- layout_accessible->priv = NUX_LAYOUT_ACCESSIBLE_GET_PRIVATE (layout_accessible);
150 }
151
152 AtkObject*
153
154=== modified file 'src/nux-layout-accessible.h'
155--- src/nux-layout-accessible.h 2011-01-13 01:59:18 +0000
156+++ src/nux-layout-accessible.h 2011-02-17 13:16:49 +0000
157@@ -37,14 +37,10 @@
158
159 typedef struct _NuxLayoutAccessible NuxLayoutAccessible;
160 typedef struct _NuxLayoutAccessibleClass NuxLayoutAccessibleClass;
161-typedef struct _NuxLayoutAccessiblePrivate NuxLayoutAccessiblePrivate;
162
163 struct _NuxLayoutAccessible
164 {
165 NuxAreaAccessible parent;
166-
167- /* < private > */
168- NuxLayoutAccessiblePrivate *priv;
169 };
170
171 struct _NuxLayoutAccessibleClass
172
173=== modified file 'src/nux-view-accessible.cpp'
174--- src/nux-view-accessible.cpp 2011-02-05 01:59:00 +0000
175+++ src/nux-view-accessible.cpp 2011-02-17 13:16:49 +0000
176@@ -53,36 +53,25 @@
177 static void nux_view_accessible_focus_handler (AtkObject *accessible,
178 gboolean focus_in);
179
180-#define NUX_VIEW_ACCESSIBLE_GET_PRIVATE(obj) \
181- (G_TYPE_INSTANCE_GET_PRIVATE ((obj), NUX_TYPE_VIEW_ACCESSIBLE, NuxViewAccessiblePrivate))
182-
183 G_DEFINE_TYPE_WITH_CODE (NuxViewAccessible,
184 nux_view_accessible,
185 NUX_TYPE_AREA_ACCESSIBLE,
186 G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT,
187 atk_component_interface_init))
188
189-struct _NuxViewAccessiblePrivate
190-{
191-};
192-
193 static void
194 nux_view_accessible_class_init (NuxViewAccessibleClass *klass)
195 {
196- GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
197 AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
198
199 /* AtkObject */
200 atk_class->initialize = nux_view_accessible_initialize;
201 atk_class->ref_state_set = nux_view_accessible_ref_state_set;
202-
203- g_type_class_add_private (gobject_class, sizeof (NuxViewAccessiblePrivate));
204 }
205
206 static void
207 nux_view_accessible_init (NuxViewAccessible *view_accessible)
208 {
209- view_accessible->priv = NUX_VIEW_ACCESSIBLE_GET_PRIVATE (view_accessible);
210 }
211
212 AtkObject*
213
214=== modified file 'src/nux-view-accessible.h'
215--- src/nux-view-accessible.h 2011-01-13 01:59:18 +0000
216+++ src/nux-view-accessible.h 2011-02-17 13:16:49 +0000
217@@ -37,14 +37,10 @@
218
219 typedef struct _NuxViewAccessible NuxViewAccessible;
220 typedef struct _NuxViewAccessibleClass NuxViewAccessibleClass;
221-typedef struct _NuxViewAccessiblePrivate NuxViewAccessiblePrivate;
222
223 struct _NuxViewAccessible
224 {
225 NuxAreaAccessible parent;
226-
227- /* < private > */
228- NuxViewAccessiblePrivate *priv;
229 };
230
231 struct _NuxViewAccessibleClass
232
233=== modified file 'src/unity-launcher-accessible.cpp'
234--- src/unity-launcher-accessible.cpp 2011-01-18 15:56:03 +0000
235+++ src/unity-launcher-accessible.cpp 2011-02-17 13:16:49 +0000
236@@ -45,33 +45,22 @@
237 static AtkObject *unity_launcher_accessible_ref_child (AtkObject *obj,
238 gint i);
239
240-#define UNITY_LAUNCHER_ACCESSIBLE_GET_PRIVATE(obj) \
241- (G_TYPE_INSTANCE_GET_PRIVATE ((obj), UNITY_TYPE_LAUNCHER_ACCESSIBLE, UnityLauncherAccessiblePrivate))
242-
243 G_DEFINE_TYPE (UnityLauncherAccessible, unity_launcher_accessible, NUX_TYPE_VIEW_ACCESSIBLE)
244
245-struct _UnityLauncherAccessiblePrivate
246-{
247-};
248-
249 static void
250 unity_launcher_accessible_class_init (UnityLauncherAccessibleClass *klass)
251 {
252- GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
253 AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
254
255 /* AtkObject */
256 atk_class->get_n_children = unity_launcher_accessible_get_n_children;
257 atk_class->ref_child = unity_launcher_accessible_ref_child;
258 atk_class->initialize = unity_launcher_accessible_initialize;
259-
260- g_type_class_add_private (gobject_class, sizeof (UnityLauncherAccessiblePrivate));
261 }
262
263 static void
264 unity_launcher_accessible_init (UnityLauncherAccessible *self)
265 {
266- self->priv = UNITY_LAUNCHER_ACCESSIBLE_GET_PRIVATE (self);
267 }
268
269 AtkObject*
270
271=== modified file 'src/unity-launcher-accessible.h'
272--- src/unity-launcher-accessible.h 2011-01-13 01:59:18 +0000
273+++ src/unity-launcher-accessible.h 2011-02-17 13:16:49 +0000
274@@ -34,14 +34,10 @@
275
276 typedef struct _UnityLauncherAccessible UnityLauncherAccessible;
277 typedef struct _UnityLauncherAccessibleClass UnityLauncherAccessibleClass;
278-typedef struct _UnityLauncherAccessiblePrivate UnityLauncherAccessiblePrivate;
279
280 struct _UnityLauncherAccessible
281 {
282 NuxViewAccessible parent;
283-
284- /* < private > */
285- UnityLauncherAccessiblePrivate *priv;
286 };
287
288 struct _UnityLauncherAccessibleClass
289
290=== modified file 'src/unity-launcher-icon-accessible.cpp'
291--- src/unity-launcher-icon-accessible.cpp 2011-01-13 01:59:18 +0000
292+++ src/unity-launcher-icon-accessible.cpp 2011-02-17 13:16:49 +0000
293@@ -41,32 +41,21 @@
294 static const gchar * unity_launcher_icon_accessible_get_name (AtkObject *obj);
295
296
297-#define UNITY_LAUNCHER_ICON_ACCESSIBLE_GET_PRIVATE(obj) \
298- (G_TYPE_INSTANCE_GET_PRIVATE ((obj), UNITY_TYPE_LAUNCHER_ICON_ACCESSIBLE, UnityLauncherIconAccessiblePrivate))
299-
300 G_DEFINE_TYPE (UnityLauncherIconAccessible, unity_launcher_icon_accessible, NUX_TYPE_OBJECT_ACCESSIBLE)
301
302-struct _UnityLauncherIconAccessiblePrivate
303-{
304-};
305-
306 static void
307 unity_launcher_icon_accessible_class_init (UnityLauncherIconAccessibleClass *klass)
308 {
309- GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
310 AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
311
312 /* AtkObject */
313 atk_class->initialize = unity_launcher_icon_accessible_initialize;
314 atk_class->get_name = unity_launcher_icon_accessible_get_name;
315-
316- g_type_class_add_private (gobject_class, sizeof (UnityLauncherIconAccessiblePrivate));
317 }
318
319 static void
320 unity_launcher_icon_accessible_init (UnityLauncherIconAccessible *launcher_icon_accessible)
321 {
322- launcher_icon_accessible->priv = UNITY_LAUNCHER_ICON_ACCESSIBLE_GET_PRIVATE (launcher_icon_accessible);
323 }
324
325 AtkObject*
326
327=== modified file 'src/unity-launcher-icon-accessible.h'
328--- src/unity-launcher-icon-accessible.h 2011-01-13 01:59:18 +0000
329+++ src/unity-launcher-icon-accessible.h 2011-02-17 13:16:49 +0000
330@@ -34,14 +34,10 @@
331
332 typedef struct _UnityLauncherIconAccessible UnityLauncherIconAccessible;
333 typedef struct _UnityLauncherIconAccessibleClass UnityLauncherIconAccessibleClass;
334-typedef struct _UnityLauncherIconAccessiblePrivate UnityLauncherIconAccessiblePrivate;
335
336 struct _UnityLauncherIconAccessible
337 {
338 NuxObjectAccessible parent;
339-
340- /* < private > */
341- UnityLauncherIconAccessiblePrivate *priv;
342 };
343
344 struct _UnityLauncherIconAccessibleClass
345
346=== modified file 'src/unity-panel-home-button-accessible.cpp'
347--- src/unity-panel-home-button-accessible.cpp 2011-02-14 13:18:26 +0000
348+++ src/unity-panel-home-button-accessible.cpp 2011-02-17 13:16:49 +0000
349@@ -41,31 +41,20 @@
350 /* AtkObject */
351 static void unity_panel_home_button_accessible_initialize (AtkObject *accessible, gpointer data);
352
353-#define UNITY_PANEL_HOME_BUTTON_ACCESSIBLE_GET_PRIVATE(obj) \
354- (G_TYPE_INSTANCE_GET_PRIVATE ((obj), UNITY_TYPE_PANEL_HOME_BUTTON_ACCESSIBLE, UnityPanelHomeButtonAccessiblePrivate))
355-
356 G_DEFINE_TYPE (UnityPanelHomeButtonAccessible, unity_panel_home_button_accessible, NUX_TYPE_VIEW_ACCESSIBLE)
357
358-struct _UnityPanelHomeButtonAccessiblePrivate
359-{
360-};
361-
362 static void
363 unity_panel_home_button_accessible_class_init (UnityPanelHomeButtonAccessibleClass *klass)
364 {
365- GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
366 AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
367
368 /* AtkObject */
369 atk_class->initialize = unity_panel_home_button_accessible_initialize;
370-
371- g_type_class_add_private (gobject_class, sizeof (UnityPanelHomeButtonAccessiblePrivate));
372 }
373
374 static void
375 unity_panel_home_button_accessible_init (UnityPanelHomeButtonAccessible *self)
376 {
377- self->priv = UNITY_PANEL_HOME_BUTTON_ACCESSIBLE_GET_PRIVATE (self);
378 }
379
380 AtkObject *
381
382=== modified file 'src/unity-panel-home-button-accessible.h'
383--- src/unity-panel-home-button-accessible.h 2011-01-24 09:10:38 +0000
384+++ src/unity-panel-home-button-accessible.h 2011-02-17 13:16:49 +0000
385@@ -34,14 +34,10 @@
386
387 typedef struct _UnityPanelHomeButtonAccessible UnityPanelHomeButtonAccessible;
388 typedef struct _UnityPanelHomeButtonAccessibleClass UnityPanelHomeButtonAccessibleClass;
389-typedef struct _UnityPanelHomeButtonAccessiblePrivate UnityPanelHomeButtonAccessiblePrivate;
390
391 struct _UnityPanelHomeButtonAccessible
392 {
393 NuxViewAccessible parent;
394-
395- /* < private > */
396- UnityPanelHomeButtonAccessiblePrivate *priv;
397 };
398
399 struct _UnityPanelHomeButtonAccessibleClass
400
401=== modified file 'src/unity-panel-view-accessible.cpp'
402--- src/unity-panel-view-accessible.cpp 2011-02-14 16:35:25 +0000
403+++ src/unity-panel-view-accessible.cpp 2011-02-17 13:16:49 +0000
404@@ -44,33 +44,22 @@
405 static gint unity_panel_view_accessible_get_n_children (AtkObject *accessible);
406 static AtkObject *unity_panel_view_accessible_ref_child (AtkObject *accessible, gint i);
407
408-#define UNITY_PANEL_VIEW_ACCESSIBLE_GET_PRIVATE(obj) \
409- (G_TYPE_INSTANCE_GET_PRIVATE ((obj), UNITY_TYPE_PANEL_VIEW_ACCESSIBLE, UnityPanelViewAccessiblePrivate))
410-
411 G_DEFINE_TYPE (UnityPanelViewAccessible, unity_panel_view_accessible, NUX_TYPE_VIEW_ACCESSIBLE)
412
413-struct _UnityPanelViewAccessiblePrivate
414-{
415-};
416-
417 static void
418 unity_panel_view_accessible_class_init (UnityPanelViewAccessibleClass *klass)
419 {
420- GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
421 AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
422
423 /* AtkObject */
424 atk_class->initialize = unity_panel_view_accessible_initialize;
425 atk_class->get_n_children = unity_panel_view_accessible_get_n_children;
426 atk_class->ref_child = unity_panel_view_accessible_ref_child;
427-
428- g_type_class_add_private (gobject_class, sizeof (UnityPanelViewAccessiblePrivate));
429 }
430
431 static void
432 unity_panel_view_accessible_init (UnityPanelViewAccessible *self)
433 {
434- self->priv = UNITY_PANEL_VIEW_ACCESSIBLE_GET_PRIVATE (self);
435 }
436
437 AtkObject *
438
439=== modified file 'src/unity-panel-view-accessible.h'
440--- src/unity-panel-view-accessible.h 2011-01-25 10:56:17 +0000
441+++ src/unity-panel-view-accessible.h 2011-02-17 13:16:49 +0000
442@@ -34,14 +34,10 @@
443
444 typedef struct _UnityPanelViewAccessible UnityPanelViewAccessible;
445 typedef struct _UnityPanelViewAccessibleClass UnityPanelViewAccessibleClass;
446-typedef struct _UnityPanelViewAccessiblePrivate UnityPanelViewAccessiblePrivate;
447
448 struct _UnityPanelViewAccessible
449 {
450 NuxViewAccessible parent;
451-
452- /* < private > */
453- UnityPanelViewAccessiblePrivate *priv;
454 };
455
456 struct _UnityPanelViewAccessibleClass