brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup: Really stop using G_TYPE_INSTANCE_GET_PRIVATE()

Browse Source 
Commit 4259cfd4c6 missed some occurences, move those to the generated
get_instance_private() functions as well.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/691
This commit is contained in:
Florian Müllner 2019-07-20 16:26:56 +02:00 committed by Jonas Ådahl
parent c755fb6995
commit 87c734cef9
5 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clutter/clutter/clutter-script.c
View File

@ -263,8 +263,6 @@ enum
static GParamSpec *obj_props[PROP_LAST]; static GParamSpec *obj_props[PROP_LAST];
#define CLUTTER_SCRIPT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CLUTTER_TYPE_SCRIPT, ClutterScriptPrivate))
struct _ClutterScriptPrivate struct _ClutterScriptPrivate
{ {
GHashTable *objects; GHashTable *objects;
@ -377,7 +375,7 @@ object_info_free (gpointer data)
static void static void
clutter_script_finalize (GObject *gobject) clutter_script_finalize (GObject *gobject)
{ {
ClutterScriptPrivate *priv = CLUTTER_SCRIPT_GET_PRIVATE (gobject); ClutterScriptPrivate *priv = CLUTTER_SCRIPT (gobject)->priv;
g_object_unref (priv->parser); g_object_unref (priv->parser);
g_hash_table_destroy (priv->objects); g_hash_table_destroy (priv->objects);

2
clutter/tests/interactive/test-cogl-offscreen.c
View File

@ -77,7 +77,7 @@ struct _TestCoglboxPrivate
G_DEFINE_TYPE_WITH_PRIVATE (TestCoglbox, test_coglbox, CLUTTER_TYPE_ACTOR); G_DEFINE_TYPE_WITH_PRIVATE (TestCoglbox, test_coglbox, CLUTTER_TYPE_ACTOR);
#define TEST_COGLBOX_GET_PRIVATE(obj) \ #define TEST_COGLBOX_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE ((obj), TEST_TYPE_COGLBOX, TestCoglboxPrivate)) (test_coglbox_get_instance_private (TEST_COGLBOX ((obj))))
/* Coglbox implementation /* Coglbox implementation
*--------------------------------------------------*/ *--------------------------------------------------*/

2
clutter/tests/interactive/test-cogl-tex-convert.c
View File

@ -76,7 +76,7 @@ struct _TestCoglboxPrivate
G_DEFINE_TYPE_WITH_PRIVATE (TestCoglbox, test_coglbox, CLUTTER_TYPE_ACTOR); G_DEFINE_TYPE_WITH_PRIVATE (TestCoglbox, test_coglbox, CLUTTER_TYPE_ACTOR);
#define TEST_COGLBOX_GET_PRIVATE(obj) \ #define TEST_COGLBOX_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE ((obj), TEST_TYPE_COGLBOX, TestCoglboxPrivate)) (test_coglbox_get_instance_private (TEST_COGLBOX ((obj))))
/* Coglbox implementation /* Coglbox implementation
*--------------------------------------------------*/ *--------------------------------------------------*/

2
clutter/tests/interactive/test-cogl-tex-polygon.c
View File

@ -78,7 +78,7 @@ struct _TestCoglboxPrivate
G_DEFINE_TYPE_WITH_PRIVATE (TestCoglbox, test_coglbox, CLUTTER_TYPE_ACTOR); G_DEFINE_TYPE_WITH_PRIVATE (TestCoglbox, test_coglbox, CLUTTER_TYPE_ACTOR);
#define TEST_COGLBOX_GET_PRIVATE(obj) \ #define TEST_COGLBOX_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE ((obj), TEST_TYPE_COGLBOX, TestCoglboxPrivate)) ((TestCoglboxPrivate *)test_coglbox_get_instance_private (TEST_COGLBOX ((obj))))
/* Coglbox implementation /* Coglbox implementation
*--------------------------------------------------*/ *--------------------------------------------------*/

2
clutter/tests/interactive/test-cogl-tex-tile.c
View File

@ -77,7 +77,7 @@ struct _TestCoglboxPrivate
G_DEFINE_TYPE_WITH_PRIVATE (TestCoglbox, test_coglbox, CLUTTER_TYPE_ACTOR); G_DEFINE_TYPE_WITH_PRIVATE (TestCoglbox, test_coglbox, CLUTTER_TYPE_ACTOR);
#define TEST_COGLBOX_GET_PRIVATE(obj) \ #define TEST_COGLBOX_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE ((obj), TEST_TYPE_COGLBOX, TestCoglboxPrivate)) (test_coglbox_get_instance_private (TEST_COGLBOX ((obj))))
/* Coglbox implementation /* Coglbox implementation
*--------------------------------------------------*/ *--------------------------------------------------*/