Drop deprecated instance private data API

GLib 2.58 deprecated g_type_class_add_private(), at long last.

Use the G_ADD_PRIVATE macro, and the generated instance private data
getter function.

5 files changed, 20 insertions, 34 deletions

diff --git a/pango/pango-renderer.c b/pango/pango-renderer.c
index f82c4e48..00f90818 100644
--- a/pango/pango-renderer.c
+++ b/pango/pango-renderer.c
@@ -106,7 +106,8 @@ to_device (PangoMatrix *matrix,
     }
 }
 
-G_DEFINE_ABSTRACT_TYPE (PangoRenderer, pango_renderer, G_TYPE_OBJECT)
+G_DEFINE_ABSTRACT_TYPE_WITH_CODE (PangoRenderer, pango_renderer, G_TYPE_OBJECT,
+                                  G_ADD_PRIVATE (PangoRenderer))
 
 static void
 pango_renderer_class_init (PangoRendererClass *klass)
@@ -120,16 +121,12 @@ pango_renderer_class_init (PangoRendererClass *klass)
   klass->prepare_run = pango_renderer_default_prepare_run;
 
   gobject_class->finalize = pango_renderer_finalize;
-
-  g_type_class_add_private (gobject_class, sizeof (PangoRendererPrivate));
 }
 
 static void
 pango_renderer_init (PangoRenderer *renderer)
 {
-  renderer->priv = G_TYPE_INSTANCE_GET_PRIVATE (renderer,
-						PANGO_TYPE_RENDERER,
-						PangoRendererPrivate);
+  renderer->priv = pango_renderer_get_instance_private (renderer);
   renderer->matrix = NULL;
 }
 
diff --git a/pango/pangocoretext.c b/pango/pangocoretext.c
index 2aa1810a..bc606757 100644
--- a/pango/pangocoretext.c
+++ b/pango/pangocoretext.c
@@ -33,8 +33,6 @@
 #include "pangocoretext.h"
 #include "pangocoretext-private.h"
 
-G_DEFINE_TYPE (PangoCoreTextFont, pango_core_text_font, PANGO_TYPE_FONT);
-
 struct _PangoCoreTextFontPrivate
 {
   PangoCoreTextFace *face;
@@ -48,6 +46,8 @@ struct _PangoCoreTextFontPrivate
   PangoFontMap *fontmap;
 };
 
+G_DEFINE_TYPE_WITH_PRIVATE (PangoCoreTextFont, pango_core_text_font, PANGO_TYPE_FONT)
+
 static void
 pango_core_text_font_finalize (GObject *object)
 {
@@ -211,9 +211,7 @@ pango_core_text_font_get_font_map (PangoFont *font)
 static void
 pango_core_text_font_init (PangoCoreTextFont *ctfont)
 {
-  ctfont->priv = G_TYPE_INSTANCE_GET_PRIVATE (ctfont,
-                                              PANGO_TYPE_CORE_TEXT_FONT,
-                                              PangoCoreTextFontPrivate);
+  ctfont->priv = pango_core_text_font_get_instance_private (ctfont);
 }
 
 static void
@@ -229,8 +227,6 @@ pango_core_text_font_class_init (PangoCoreTextFontClass *class)
   font_class->get_coverage = pango_core_text_font_get_coverage;
   font_class->find_shaper = pango_core_text_font_find_shaper;
   font_class->get_font_map = pango_core_text_font_get_font_map;
-
-  g_type_class_add_private (object_class, sizeof (PangoCoreTextFontPrivate));
 }
 
 void
diff --git a/pango/pangofc-font.c b/pango/pangofc-font.c
index c35b77ee..5a48e782 100644
--- a/pango/pangofc-font.c
+++ b/pango/pangofc-font.c
@@ -94,7 +94,8 @@ static PangoFontDescription *pango_fc_font_describe_absolute (PangoFont        *
 #define PANGO_FC_FONT_LOCK_FACE(font)	(PANGO_FC_FONT_GET_CLASS (font)->lock_face (font))
 #define PANGO_FC_FONT_UNLOCK_FACE(font)	(PANGO_FC_FONT_GET_CLASS (font)->unlock_face (font))
 
-G_DEFINE_ABSTRACT_TYPE (PangoFcFont, pango_fc_font, PANGO_TYPE_FONT)
+G_DEFINE_ABSTRACT_TYPE_WITH_CODE (PangoFcFont, pango_fc_font, PANGO_TYPE_FONT,
+                                  G_ADD_PRIVATE (PangoFcFont))
 
 static void
 pango_fc_font_class_init (PangoFcFontClass *class)
@@ -129,16 +130,12 @@ pango_fc_font_class_init (PangoFcFontClass *class)
 							PANGO_TYPE_FC_FONT_MAP,
 							G_PARAM_READWRITE |
 							G_PARAM_STATIC_STRINGS));
-
-  g_type_class_add_private (object_class, sizeof (PangoFcFontPrivate));
 }
 
 static void
 pango_fc_font_init (PangoFcFont *fcfont)
 {
-  fcfont->priv = G_TYPE_INSTANCE_GET_PRIVATE (fcfont,
-					      PANGO_TYPE_FC_FONT,
-					      PangoFcFontPrivate);
+  fcfont->priv = pango_fc_font_get_instance_private (fcfont);
 }
 
 static void
diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c
index d491c75a..8b41018b 100644
--- a/pango/pangofc-fontmap.c
+++ b/pango/pangofc-fontmap.c
@@ -866,7 +866,8 @@ struct _PangoFcFontset
 };
 
 typedef PangoFontsetClass PangoFcFontsetClass;
-G_DEFINE_TYPE (PangoFcFontset, pango_fc_fontset, PANGO_TYPE_FONTSET);
+
+G_DEFINE_TYPE (PangoFcFontset, pango_fc_fontset, PANGO_TYPE_FONTSET)
 
 static PangoFcFontset *
 pango_fc_fontset_new (PangoFcFontsetKey *key,
@@ -1062,16 +1063,15 @@ pango_fc_fontset_foreach (PangoFontset           *fontset,
  * PangoFcFontMap
  */
 
-G_DEFINE_ABSTRACT_TYPE (PangoFcFontMap, pango_fc_font_map, PANGO_TYPE_FONT_MAP)
+G_DEFINE_ABSTRACT_TYPE_WITH_CODE (PangoFcFontMap, pango_fc_font_map, PANGO_TYPE_FONT_MAP,
+                                  G_ADD_PRIVATE (PangoFcFontMap))
 
 static void
 pango_fc_font_map_init (PangoFcFontMap *fcfontmap)
 {
   PangoFcFontMapPrivate *priv;
 
-  priv = fcfontmap->priv = G_TYPE_INSTANCE_GET_PRIVATE (fcfontmap,
-							PANGO_TYPE_FC_FONT_MAP,
-							PangoFcFontMapPrivate);
+  priv = fcfontmap->priv = pango_fc_font_map_get_instance_private (fcfontmap);
 
   priv->n_families = -1;
 
@@ -1140,8 +1140,6 @@ pango_fc_font_map_class_init (PangoFcFontMapClass *class)
   fontmap_class->load_fontset = pango_fc_font_map_load_fontset;
   fontmap_class->list_families = pango_fc_font_map_list_families;
   fontmap_class->shape_engine_type = PANGO_RENDER_TYPE_FC;
-
-  g_type_class_add_private (object_class, sizeof (PangoFcFontMapPrivate));
 }
 
 
@@ -2272,7 +2270,8 @@ pango_fc_font_description_from_pattern (FcPattern *pattern, gboolean include_siz
  */
 
 typedef PangoFontFaceClass PangoFcFaceClass;
-G_DEFINE_TYPE (PangoFcFace, pango_fc_face, PANGO_TYPE_FONT_FACE);
+
+G_DEFINE_TYPE (PangoFcFace, pango_fc_face, PANGO_TYPE_FONT_FACE)
 
 static PangoFontDescription *
 make_alias_description (PangoFcFamily *fcfamily,
@@ -2462,7 +2461,8 @@ pango_fc_face_class_init (PangoFcFaceClass *class)
  */
 
 typedef PangoFontFamilyClass PangoFcFamilyClass;
-G_DEFINE_TYPE (PangoFcFamily, pango_fc_family, PANGO_TYPE_FONT_FAMILY);
+
+G_DEFINE_TYPE (PangoFcFamily, pango_fc_family, PANGO_TYPE_FONT_FAMILY)
 
 static PangoFcFace *
 create_face (PangoFcFamily *fcfamily,
diff --git a/pango/pangoxft-render.c b/pango/pangoxft-render.c
index 9b3c936f..3e730c63 100644
--- a/pango/pangoxft-render.c
+++ b/pango/pangoxft-render.c
@@ -83,14 +83,12 @@ static void pango_xft_renderer_end            (PangoRenderer    *renderer);
 static void flush_trapezoids (PangoXftRenderer *xftrenderer);
 static void flush_glyphs (PangoXftRenderer *xftrenderer);
 
-G_DEFINE_TYPE (PangoXftRenderer, pango_xft_renderer, PANGO_TYPE_RENDERER)
+G_DEFINE_TYPE_WITH_PRIVATE (PangoXftRenderer, pango_xft_renderer, PANGO_TYPE_RENDERER)
 
 static void
 pango_xft_renderer_init (PangoXftRenderer *xftrenderer)
 {
-  xftrenderer->priv = G_TYPE_INSTANCE_GET_PRIVATE (xftrenderer,
-						   PANGO_TYPE_XFT_RENDERER,
-						   PangoXftRendererPrivate);
+  xftrenderer->priv = pango_xft_renderer_get_instance_private (xftrenderer);
   xftrenderer->priv->alpha = 0xffff;
 }
 
@@ -122,8 +120,6 @@ pango_xft_renderer_class_init (PangoXftRendererClass *klass)
 						     "The screen being rendered to",
 						     0, G_MAXINT, 0,
 						     G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
-
-  g_type_class_add_private (object_class, sizeof (PangoXftRendererPrivate));
 }
 
 static void