[pango/code-reorg: 3/6] Cosmetics: Clean up pango-context.h

[Matthias Clasen <matthiasc src gnome org>]

commit bd816f9f4568a75c19455202a6ab1e7fa72a254d
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Aug 20 10:09:41 2021 -0400

    Cosmetics: Clean up pango-context.h
    
    Move itemize functions to pango-item.h, and move
    the PangoContext typedef to pango-types.h.

 pango/pango-context.h | 18 +-----------------
 pango/pango-fontmap.h |  2 +-
 pango/pango-item.h    | 17 +++++++++++++++++
 pango/pango-types.h   |  1 +
 4 files changed, 20 insertions(+), 18 deletions(-)
---
diff --git a/pango/pango-context.h b/pango/pango-context.h
index b44bd623..b25c777d 100644
--- a/pango/pango-context.h
+++ b/pango/pango-context.h
@@ -22,6 +22,7 @@
 #ifndef __PANGO_CONTEXT_H__
 #define __PANGO_CONTEXT_H__
 
+#include <pango/pango-types.h>
 #include <pango/pango-font.h>
 #include <pango/pango-fontmap.h>
 #include <pango/pango-attributes.h>
@@ -33,7 +34,6 @@ G_BEGIN_DECLS
  * to handle scripts
  */
 
-/* PangoContext typedefed in pango-fontmap.h */
 typedef struct _PangoContextClass PangoContextClass;
 
 #define PANGO_TYPE_CONTEXT              (pango_context_get_type ())
@@ -119,22 +119,6 @@ void                      pango_context_set_round_glyph_positions (PangoContext
 PANGO_AVAILABLE_IN_1_44
 gboolean                  pango_context_get_round_glyph_positions (PangoContext *context);
 
-PANGO_AVAILABLE_IN_ALL
-GList *pango_itemize                (PangoContext      *context,
-                                    const char        *text,
-                                    int                start_index,
-                                    int                length,
-                                    PangoAttrList     *attrs,
-                                    PangoAttrIterator *cached_iter);
-PANGO_AVAILABLE_IN_1_4
-GList *pango_itemize_with_base_dir  (PangoContext      *context,
-                                    PangoDirection     base_dir,
-                                    const char        *text,
-                                    int                start_index,
-                                    int                length,
-                                    PangoAttrList     *attrs,
-                                    PangoAttrIterator *cached_iter);
-
 G_END_DECLS
 
 #endif /* __PANGO_CONTEXT_H__ */
diff --git a/pango/pango-fontmap.h b/pango/pango-fontmap.h
index aec18eeb..0e0edd43 100644
--- a/pango/pango-fontmap.h
+++ b/pango/pango-fontmap.h
@@ -22,6 +22,7 @@
 #ifndef __PANGO_FONTMAP_H__
 #define __PANGO_FONTMAP_H__
 
+#include <pango/pango-types.h>
 #include <pango/pango-font.h>
 #include <pango/pango-fontset.h>
 
@@ -35,7 +36,6 @@ G_BEGIN_DECLS
 #define PANGO_FONT_MAP_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_FONT_MAP, 
PangoFontMapClass))
 
 typedef struct _PangoFontMapClass PangoFontMapClass;
-typedef struct _PangoContext PangoContext;
 
 /**
  * PangoFontMap:
diff --git a/pango/pango-item.h b/pango/pango-item.h
index a1e95086..40847682 100644
--- a/pango/pango-item.h
+++ b/pango/pango-item.h
@@ -134,6 +134,23 @@ PANGO_AVAILABLE_IN_1_44
 void       pango_item_apply_attrs (PangoItem         *item,
                                    PangoAttrIterator *iter);
 
+PANGO_AVAILABLE_IN_ALL
+GList *pango_itemize                (PangoContext      *context,
+                                     const char        *text,
+                                     int                start_index,
+                                     int                length,
+                                     PangoAttrList     *attrs,
+                                     PangoAttrIterator *cached_iter);
+
+PANGO_AVAILABLE_IN_1_4
+GList *pango_itemize_with_base_dir  (PangoContext      *context,
+                                     PangoDirection     base_dir,
+                                     const char        *text,
+                                     int                start_index,
+                                     int                length,
+                                     PangoAttrList     *attrs,
+                                     PangoAttrIterator *cached_iter);
+
 G_END_DECLS
 
 #endif /* __PANGO_ITEM_H__ */
diff --git a/pango/pango-types.h b/pango/pango-types.h
index a7bcd747..34b798d4 100644
--- a/pango/pango-types.h
+++ b/pango/pango-types.h
@@ -41,6 +41,7 @@ typedef struct _PangoFontMap PangoFontMap;
 
 typedef struct _PangoRectangle PangoRectangle;
 
+typedef struct _PangoContext PangoContext;
 
 
 /* A index of a glyph into a font. Rendering system dependent */