[pango/pango2: 101/115] Drop PangoFontsetSimple

[Matthias Clasen <matthiasc src gnome org>]

commit 6e81550651e55dda7a2e404d7411418efd8ae528
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Jun 7 21:43:26 2022 -0400

    Drop PangoFontsetSimple
    
    There's no strong reason to provide this as api.

 pango/meson.build                    |  1 -
 pango/pango-fontmap.c                |  8 ++----
 pango/pango-fontset-simple-private.h | 20 +++++++++++--
 pango/pango-fontset-simple.h         | 56 ------------------------------------
 pango/pango.h                        |  1 -
 5 files changed, 19 insertions(+), 67 deletions(-)
---
diff --git a/pango/meson.build b/pango/meson.build
index 9aa1c6f5..4985daac 100644
--- a/pango/meson.build
+++ b/pango/meson.build
@@ -69,7 +69,6 @@ pango_headers = [
   'pango-font-metrics.h',
   'pango-fontmap.h',
   'pango-fontset.h',
-  'pango-fontset-simple.h',
   'pango-generic-family.h',
   'pango-glyph.h',
   'pango-glyph-item.h',
diff --git a/pango/pango-fontmap.c b/pango/pango-fontmap.c
index 41355608..5bf81547 100644
--- a/pango/pango-fontmap.c
+++ b/pango/pango-fontmap.c
@@ -24,7 +24,7 @@
 #include <gio/gio.h>
 
 #include "pango-fontmap-private.h"
-#include "pango-fontset-simple.h"
+#include "pango-fontset-simple-private.h"
 #include "pango-impl-utils.h"
 #include <stdlib.h>
 
@@ -209,11 +209,7 @@ pango_font_map_real_load_fontset (PangoFontMap               *fontmap,
       G_UNLOCK (warned_fonts);
       g_free (ctmp1);
 
-      pango_font_map_fontset_add_fonts (fontmap,
-                                        context,
-                                        fonts,
-                                        tmp_desc,
-                                        "Sans");
+      pango_font_map_fontset_add_fonts (fontmap, context, fonts, tmp_desc, "Sans");
     }
 
   /* We couldn't try with Sans and the specified style. Try Sans Normal
diff --git a/pango/pango-fontset-simple-private.h b/pango/pango-fontset-simple-private.h
index cf88100c..bae1ff75 100644
--- a/pango/pango-fontset-simple-private.h
+++ b/pango/pango-fontset-simple-private.h
@@ -19,10 +19,14 @@
 
 #pragma once
 
+#include <pango/pango-types.h>
 #include <pango/pango-fontset-private.h>
-#include <pango/pango-fontset-simple.h>
+#include <glib-object.h>
 
 
+typedef struct _PangoFontsetSimple  PangoFontsetSimple;
+typedef struct _PangoFontsetSimpleClass  PangoFontsetSimpleClass;
+
 struct _PangoFontsetSimple
 {
   PangoFontset parent_instance;
@@ -31,9 +35,19 @@ struct _PangoFontsetSimple
   PangoLanguage *language;
 };
 
-typedef struct _PangoFontsetSimpleClass  PangoFontsetSimpleClass;
-
 struct _PangoFontsetSimpleClass
 {
   PangoFontsetClass parent_class;
 };
+
+
+#define PANGO_TYPE_FONTSET_SIMPLE       (pango_fontset_simple_get_type ())
+#define PANGO_FONTSET_SIMPLE(object)    (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_FONTSET_SIMPLE, 
PangoFontsetSimple))
+#define PANGO_IS_FONTSET_SIMPLE(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_FONTSET_SIMPLE))
+
+GType                   pango_fontset_simple_get_type (void) G_GNUC_CONST;
+
+PangoFontsetSimple *    pango_fontset_simple_new    (PangoLanguage      *language);
+void                    pango_fontset_simple_append (PangoFontsetSimple *fontset,
+                                                     PangoFont          *font);
+int                     pango_fontset_simple_size   (PangoFontsetSimple *fontset);
diff --git a/pango/pango.h b/pango/pango.h
index e30a1c0f..ee1d3309 100644
--- a/pango/pango.h
+++ b/pango/pango.h
@@ -36,7 +36,6 @@
 #include <pango/pango-font-metrics.h>
 #include <pango/pango-fontmap.h>
 #include <pango/pango-fontset.h>
-#include <pango/pango-fontset-simple.h>
 #include <pango/pango-generic-family.h>
 #include <pango/pango-glyph.h>
 #include <pango/pango-glyph-item.h>