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

cleanup: Don't use G_TYPE_INSTANCE_GET_PRIVATE()

Browse Source 
It has been deprecated in favor of the get_instance_private() function
generated by the G_ADD_PRIVATE() macro.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/689
This commit is contained in:
Florian Müllner 2019-07-17 17:51:43 +02:00
parent 4fdefb5b2e
commit 4259cfd4c6
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backends/meta-barrier.c
View File

@ -302,7 +302,7 @@ meta_barrier_destroy (MetaBarrier *barrier)
static void static void
meta_barrier_init (MetaBarrier *barrier) meta_barrier_init (MetaBarrier *barrier)
{ {
barrier->priv = G_TYPE_INSTANCE_GET_PRIVATE (barrier, META_TYPE_BARRIER, MetaBarrierPrivate); barrier->priv = meta_barrier_get_instance_private (barrier);
} }
void void

5
src/compositor/meta-module.c
View File

@ -41,9 +41,6 @@ struct _MetaModulePrivate
GType plugin_type; GType plugin_type;
}; };
#define META_MODULE_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE ((obj), META_TYPE_MODULE, MetaModulePrivate))
G_DEFINE_TYPE_WITH_PRIVATE (MetaModule, meta_module, G_TYPE_TYPE_MODULE); G_DEFINE_TYPE_WITH_PRIVATE (MetaModule, meta_module, G_TYPE_TYPE_MODULE);
static gboolean static gboolean
@ -192,7 +189,7 @@ meta_module_class_init (MetaModuleClass *klass)
static void static void
meta_module_init (MetaModule *self) meta_module_init (MetaModule *self)
{ {
self->priv = META_MODULE_GET_PRIVATE (self); self->priv = meta_module_get_instance_private (self);
} }
GType GType

5
src/compositor/plugins/default.c
View File

@ -50,9 +50,6 @@
#define META_IS_DEFAULT_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), META_TYPE_DEFAULT_PLUGIN)) #define META_IS_DEFAULT_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), META_TYPE_DEFAULT_PLUGIN))
#define META_DEFAULT_PLUGIN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), META_TYPE_DEFAULT_PLUGIN, MetaDefaultPluginClass)) #define META_DEFAULT_PLUGIN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), META_TYPE_DEFAULT_PLUGIN, MetaDefaultPluginClass))
#define META_DEFAULT_PLUGIN_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE ((obj), META_TYPE_DEFAULT_PLUGIN, MetaDefaultPluginPrivate))
typedef struct _MetaDefaultPlugin MetaDefaultPlugin; typedef struct _MetaDefaultPlugin MetaDefaultPlugin;
typedef struct _MetaDefaultPluginClass MetaDefaultPluginClass; typedef struct _MetaDefaultPluginClass MetaDefaultPluginClass;
typedef struct _MetaDefaultPluginPrivate MetaDefaultPluginPrivate; typedef struct _MetaDefaultPluginPrivate MetaDefaultPluginPrivate;
@ -218,7 +215,7 @@ meta_default_plugin_init (MetaDefaultPlugin *self)
{ {
MetaDefaultPluginPrivate *priv; MetaDefaultPluginPrivate *priv;
self->priv = priv = META_DEFAULT_PLUGIN_GET_PRIVATE (self); self->priv = priv = meta_default_plugin_get_instance_private (self);
priv->info.name = "Default Effects"; priv->info.name = "Default Effects";
priv->info.version = "0.1"; priv->info.version = "0.1";