GNOME.org
 

[grilo] core: Remove deprecated g_type_class_add_private()

commit c76929fc7499d533fc6fb931ba2538147d5b9cb0
Author: Victor Toso <me victortoso com>
Date:   Tue Jul 24 23:54:44 2018 +0200

    core: Remove deprecated g_type_class_add_private()
    
    Instead we define the class with G_DEFINE_TYPE_WITH_PRIVATE().
    
    This also removes the usage of G_TYPE_INSTANCE_GET_PRIVATE() as we use
    instead the _get_instance_private()
    
    Notes:
    - grl-caps: G_DEFINE_TYPE_WITH_PRIVATE had to be moved after
      struct _GrlCapsPrivate definition;
    - grl-operation-options: Idem to grl-caps

 src/data/grl-config.c       |  9 ++-------
 src/data/grl-data.c         |  9 ++-------
 src/data/grl-media.c        | 12 ++----------
 src/data/grl-related-keys.c | 11 ++---------
 src/grl-caps.c              | 10 ++--------
 src/grl-operation-options.c |  9 ++-------
 src/grl-plugin.c            | 12 ++----------
 src/grl-registry.c          | 11 ++---------
 src/grl-source.c            | 17 +++++------------
 9 files changed, 21 insertions(+), 79 deletions(-)
---
diff --git a/src/data/grl-config.c b/src/data/grl-config.c
index 1e48f63..cc5e6ac 100644
--- a/src/data/grl-config.c
+++ b/src/data/grl-config.c
@@ -43,16 +43,13 @@
 #define GRL_LOG_DOMAIN_DEFAULT  config_log_domain
 GRL_LOG_DOMAIN(config_log_domain);
 
-#define GRL_CONFIG_GET_PRIVATE(o)                                         \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((o), GRL_TYPE_CONFIG, GrlConfigPrivate))
-
 struct _GrlConfigPrivate {
   GKeyFile *config;
 };
 
 static void grl_config_finalize (GObject *object);
 
-G_DEFINE_TYPE (GrlConfig, grl_config, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (GrlConfig, grl_config, G_TYPE_OBJECT);
 
 static void
 grl_config_class_init (GrlConfigClass *klass)
@@ -60,14 +57,12 @@ grl_config_class_init (GrlConfigClass *klass)
   GObjectClass *gobject_class = (GObjectClass *)klass;
 
   gobject_class->finalize = grl_config_finalize;
-
-  g_type_class_add_private (klass, sizeof (GrlConfigPrivate));
 }
 
 static void
 grl_config_init (GrlConfig *self)
 {
-  self->priv = GRL_CONFIG_GET_PRIVATE (self);
+  self->priv = grl_config_get_instance_private (self);
   self->priv->config = g_key_file_new ();
 
   g_key_file_load_from_data (self->priv->config, "[]\n", -1, G_KEY_FILE_NONE, NULL);
diff --git a/src/data/grl-data.c b/src/data/grl-data.c
index db8bdfb..3b20f44 100644
--- a/src/data/grl-data.c
+++ b/src/data/grl-data.c
@@ -48,14 +48,11 @@ struct _GrlDataPrivate {
 static void grl_data_finalize (GObject *object);
 static void free_list_values (GrlKeyID key, GList *values, gpointer user_data);
 
-#define GRL_DATA_GET_PRIVATE(o)                                         \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((o), GRL_TYPE_DATA, GrlDataPrivate))
-
 static void free_list_values (GrlKeyID key, GList *values, gpointer user_data);
 
 /* ================ GrlData GObject ================ */
 
-G_DEFINE_TYPE (GrlData, grl_data, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (GrlData, grl_data, G_TYPE_OBJECT);
 
 static void
 grl_data_class_init (GrlDataClass *klass)
@@ -63,14 +60,12 @@ grl_data_class_init (GrlDataClass *klass)
   GObjectClass *gobject_class = (GObjectClass *)klass;
 
   gobject_class->finalize = grl_data_finalize;
-
-  g_type_class_add_private (klass, sizeof (GrlDataPrivate));
 }
 
 static void
 grl_data_init (GrlData *self)
 {
-  self->priv = GRL_DATA_GET_PRIVATE (self);
+  self->priv = grl_data_get_instance_private (self);
   self->priv->data = g_hash_table_new_full (g_direct_hash,
                                             g_direct_equal,
                                             NULL,
diff --git a/src/data/grl-media.c b/src/data/grl-media.c
index b298b95..a2103df 100644
--- a/src/data/grl-media.c
+++ b/src/data/grl-media.c
@@ -40,11 +40,6 @@
 #define GRL_LOG_DOMAIN_DEFAULT  media_log_domain
 GRL_LOG_DOMAIN(media_log_domain);
 
-#define GRL_MEDIA_GET_PRIVATE(object)             \
-  (G_TYPE_INSTANCE_GET_PRIVATE((object),          \
-                               GRL_TYPE_MEDIA,    \
-                               GrlMediaPrivate))
-
 #define RATING_MAX  5.00
 #define SERIAL_STRING_ALLOC 100
 
@@ -59,7 +54,7 @@ struct _GrlMediaPrivate {
 
 static void grl_media_finalize (GObject *object);
 
-G_DEFINE_TYPE (GrlMedia, grl_media, GRL_TYPE_DATA);
+G_DEFINE_TYPE_WITH_PRIVATE (GrlMedia, grl_media, GRL_TYPE_DATA);
 
 static void
 grl_media_set_property (GObject *object,
@@ -121,15 +116,12 @@ grl_media_class_init (GrlMediaClass *klass)
                                                       G_PARAM_READWRITE |
                                                       G_PARAM_CONSTRUCT |
                                                       G_PARAM_STATIC_STRINGS));
-
-  g_type_class_add_private (klass,
-                            sizeof (GrlMediaPrivate));
 }
 
 static void
 grl_media_init (GrlMedia *self)
 {
-  self->priv = GRL_MEDIA_GET_PRIVATE (self);
+  self->priv = grl_media_get_instance_private (self);
 }
 
 static void
diff --git a/src/data/grl-related-keys.c b/src/data/grl-related-keys.c
index 04cb38e..50a8038 100644
--- a/src/data/grl-related-keys.c
+++ b/src/data/grl-related-keys.c
@@ -50,14 +50,9 @@ struct _GrlRelatedKeysPrivate {
 static void grl_related_keys_finalize (GObject *object);
 static void free_value (GValue *val);
 
-#define GRL_RELATED_KEYS_GET_PRIVATE(o)                                 \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((o),                                    \
-                                GRL_TYPE_RELATED_KEYS,                  \
-                                GrlRelatedKeysPrivate))
-
 /* ================ GrlRelatedKeys GObject ================ */
 
-G_DEFINE_TYPE (GrlRelatedKeys, grl_related_keys, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (GrlRelatedKeys, grl_related_keys, G_TYPE_OBJECT);
 
 static void
 grl_related_keys_class_init (GrlRelatedKeysClass *klass)
@@ -65,14 +60,12 @@ grl_related_keys_class_init (GrlRelatedKeysClass *klass)
   GObjectClass *gobject_class = (GObjectClass *)klass;
 
   gobject_class->finalize = grl_related_keys_finalize;
-
-  g_type_class_add_private (klass, sizeof (GrlRelatedKeysPrivate));
 }
 
 static void
 grl_related_keys_init (GrlRelatedKeys *self)
 {
-  self->priv = GRL_RELATED_KEYS_GET_PRIVATE (self);
+  self->priv = grl_related_keys_get_instance_private (self);
   self->priv->data = g_hash_table_new_full (g_direct_hash,
                                             g_direct_equal,
                                             NULL,
diff --git a/src/grl-caps.c b/src/grl-caps.c
index d755de4..3902aa6 100644
--- a/src/grl-caps.c
+++ b/src/grl-caps.c
@@ -53,11 +53,6 @@
 #define GRL_CAPS_KEY_PAGINATION "pagination"
 #define GRL_CAPS_KEY_FLAGS "flags"
 
-G_DEFINE_TYPE (GrlCaps, grl_caps, G_TYPE_OBJECT);
-
-#define GRL_CAPS_GET_PRIVATE(o)\
-    (G_TYPE_INSTANCE_GET_PRIVATE ((o), GRL_CAPS_TYPE, GrlCapsPrivate))
-
 struct _GrlCapsPrivate {
   GHashTable *data;
   GrlTypeFilter type_filter;
@@ -65,7 +60,7 @@ struct _GrlCapsPrivate {
   GList *key_range_filter;
 };
 
-
+G_DEFINE_TYPE_WITH_PRIVATE (GrlCaps, grl_caps, G_TYPE_OBJECT);
 
 static void
 grl_caps_dispose (GrlCaps *self)
@@ -86,7 +81,7 @@ grl_caps_finalize (GrlCaps *self)
 static void
 grl_caps_init (GrlCaps *self)
 {
-  self->priv = GRL_CAPS_GET_PRIVATE (self);
+  self->priv = grl_caps_get_instance_private (self);
 
   self->priv->data = grl_g_value_hashtable_new ();
 
@@ -102,7 +97,6 @@ grl_caps_class_init (GrlCapsClass *self_class)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (self_class);
 
-  g_type_class_add_private (self_class, sizeof (GrlCapsPrivate));
   object_class->dispose = (void (*) (GObject *object)) grl_caps_dispose;
   object_class->finalize = (void (*) (GObject *object)) grl_caps_finalize;
 }
diff --git a/src/grl-operation-options.c b/src/grl-operation-options.c
index 4e038fc..74c823f 100644
--- a/src/grl-operation-options.c
+++ b/src/grl-operation-options.c
@@ -37,11 +37,6 @@
 #include "grl-operation-options-priv.h"
 #include "grl-type-builtins.h"
 
-G_DEFINE_TYPE (GrlOperationOptions, grl_operation_options, G_TYPE_OBJECT);
-
-#define GRL_OPERATION_OPTIONS_GET_PRIVATE(o)\
-    (G_TYPE_INSTANCE_GET_PRIVATE ((o), GRL_OPERATION_OPTIONS_TYPE, GrlOperationOptionsPrivate))
-
 struct _GrlOperationOptionsPrivate {
   GHashTable *data;
   GHashTable *key_filter;
@@ -49,6 +44,7 @@ struct _GrlOperationOptionsPrivate {
   GrlCaps *caps;
 };
 
+G_DEFINE_TYPE_WITH_PRIVATE (GrlOperationOptions, grl_operation_options, G_TYPE_OBJECT);
 
 #define SKIP_DEFAULT 0;
 #define COUNT_DEFAULT GRL_COUNT_INFINITY;
@@ -73,7 +69,7 @@ grl_operation_options_finalize (GrlOperationOptions *self)
 static void
 grl_operation_options_init (GrlOperationOptions *self)
 {
-  self->priv = GRL_OPERATION_OPTIONS_GET_PRIVATE (self);
+  self->priv = grl_operation_options_get_instance_private (self);
 
   self->priv->data = grl_g_value_hashtable_new ();
   self->priv->key_filter = grl_g_value_hashtable_new_direct ();
@@ -86,7 +82,6 @@ grl_operation_options_class_init (GrlOperationOptionsClass *self_class)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (self_class);
 
-  g_type_class_add_private (self_class, sizeof (GrlOperationOptionsPrivate));
   object_class->dispose = (void (*) (GObject *object)) grl_operation_options_dispose;
   object_class->finalize = (void (*) (GObject *object)) grl_operation_options_finalize;
 }
diff --git a/src/grl-plugin.c b/src/grl-plugin.c
index 4141db1..bf869aa 100644
--- a/src/grl-plugin.c
+++ b/src/grl-plugin.c
@@ -42,11 +42,6 @@
 #define GRL_LOG_DOMAIN_DEFAULT  plugin_log_domain
 GRL_LOG_DOMAIN(plugin_log_domain);
 
-#define GRL_PLUGIN_GET_PRIVATE(object)            \
-  (G_TYPE_INSTANCE_GET_PRIVATE((object),                \
-                               GRL_TYPE_PLUGIN,   \
-                               GrlPluginPrivate))
-
 enum {
   PROP_0,
   PROP_LOADED,
@@ -72,7 +67,7 @@ static void grl_plugin_get_property (GObject *object,
 
 /* ================ GrlPlugin GObject ================ */
 
-G_DEFINE_TYPE (GrlPlugin, grl_plugin, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (GrlPlugin, grl_plugin, G_TYPE_OBJECT);
 
 static void
 grl_plugin_class_init (GrlPluginClass *plugin_class)
@@ -100,15 +95,12 @@ grl_plugin_class_init (GrlPluginClass *plugin_class)
   g_object_class_install_property (gobject_class,
                                    PROP_LOADED,
                                    properties[PROP_LOADED]);
-
-  g_type_class_add_private (plugin_class,
-                            sizeof (GrlPluginPrivate));
 }
 
 static void
 grl_plugin_init (GrlPlugin *plugin)
 {
-  plugin->priv = GRL_PLUGIN_GET_PRIVATE (plugin);
+  plugin->priv = grl_plugin_get_instance_private (plugin);
 }
 
 static void
diff --git a/src/grl-registry.c b/src/grl-registry.c
index 8eb28e1..6a1106f 100644
--- a/src/grl-registry.c
+++ b/src/grl-registry.c
@@ -70,11 +70,6 @@ GRL_LOG_DOMAIN(registry_log_domain);
 #define SOURCE_IS_INVISIBLE(src)                                \
   GPOINTER_TO_INT(g_object_get_data(G_OBJECT(src), "invisible"))
 
-#define GRL_REGISTRY_GET_PRIVATE(object)                        \
-  (G_TYPE_INSTANCE_GET_PRIVATE((object),                        \
-                               GRL_TYPE_REGISTRY,               \
-                               GrlRegistryPrivate))
-
 /* GQuark-like implementation, where we manually assign the first IDs. */
 struct KeyIDHandler {
   GHashTable *string_to_id;
@@ -131,13 +126,11 @@ enum {
 };
 static gint registry_signals[SIG_LAST];
 
-G_DEFINE_TYPE (GrlRegistry, grl_registry, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (GrlRegistry, grl_registry, G_TYPE_OBJECT);
 
 static void
 grl_registry_class_init (GrlRegistryClass *klass)
 {
-  g_type_class_add_private (klass, sizeof (GrlRegistryPrivate));
-
   /**
    * GrlRegistry::source-added:
    * @registry: the registry
@@ -291,7 +284,7 @@ network_changed_cb (GObject     *gobject,
 static void
 grl_registry_init (GrlRegistry *registry)
 {
-  registry->priv = GRL_REGISTRY_GET_PRIVATE (registry);
+  registry->priv = grl_registry_get_instance_private (registry);
 
   registry->priv->configs =
     g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify) configs_free);
diff --git a/src/grl-source.c b/src/grl-source.c
index d90ef35..b368c88 100644
--- a/src/grl-source.c
+++ b/src/grl-source.c
@@ -54,11 +54,6 @@
 #define GRL_LOG_DOMAIN_DEFAULT  source_log_domain
 GRL_LOG_DOMAIN(source_log_domain);
 
-#define GRL_SOURCE_GET_PRIVATE(object)             \
-  (G_TYPE_INSTANCE_GET_PRIVATE((object),           \
-                               GRL_TYPE_SOURCE,    \
-                               GrlSourcePrivate))
-
 enum {
   PROP_0,
   PROP_ID,
@@ -260,9 +255,10 @@ static void source_cancel_cb (struct OperationState *op_state);
 
 /* ================ GrlSource GObject ================ */
 
-G_DEFINE_ABSTRACT_TYPE (GrlSource,
-                        grl_source,
-                        G_TYPE_OBJECT);
+G_DEFINE_ABSTRACT_TYPE_WITH_CODE (GrlSource,
+                                  grl_source,
+                                  G_TYPE_OBJECT,
+                                  G_ADD_PRIVATE (GrlSource));
 
 static void
 grl_source_class_init (GrlSourceClass *source_class)
@@ -518,15 +514,12 @@ grl_source_class_init (GrlSourceClass *source_class)
                  G_TYPE_PTR_ARRAY,
                  GRL_TYPE_SOURCE_CHANGE_TYPE,
                  G_TYPE_BOOLEAN);
-
-  g_type_class_add_private (source_class,
-                            sizeof (GrlSourcePrivate));
 }
 
 static void
 grl_source_init (GrlSource *source)
 {
-  source->priv = GRL_SOURCE_GET_PRIVATE (source);
+  source->priv = grl_source_get_instance_private (source);
   source->priv->tags = g_ptr_array_new_with_free_func (g_free);
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]