diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2018-08-30 16:31:18 +0100 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2018-08-30 16:36:30 +0100 |
| commit | 0bd0be4a563cbc227ef3b1cd4c7a53927816c474 (patch) | |
| tree | 4cba249b7f25deee2690620f543a51e6c10c6109 /pango/pangocoretext.c | |
| parent | 7e7f76622ffe25edf3a8d4988b2e9d04654093bd (diff) | |
| download | pango-0bd0be4a563cbc227ef3b1cd4c7a53927816c474.tar.gz | |
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.
Diffstat (limited to 'pango/pangocoretext.c')
| -rw-r--r-- | pango/pangocoretext.c | 10 |
1 files changed, 3 insertions, 7 deletions
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 |