GNOME.org
 

[pango/pango2-cleanups: 1/15] Drop remnants of engines and modules


commit 8d2d20df80d860586716785d439dfe4c884a0fd8
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Jan 10 09:25:03 2022 -0500

    Drop remnants of engines and modules
    
    Drop all of this.

 pango/fonts.c                 |  20 --
 pango/meson.build             |   4 -
 pango/modules.c               | 101 ----------
 pango/pango-engine.c          |  82 --------
 pango/pango-engine.h          | 457 ------------------------------------------
 pango/pango-font.h            |   6 -
 pango/pango-fontmap-private.h |   3 -
 pango/pango-fontmap.c         |  21 --
 pango/pango-fontmap.h         |   3 -
 pango/pango-item.h            |   5 -
 pango/pango-layout.c          |   1 -
 pango/pango-modules.h         |  84 --------
 pango/pango-types.h           |   6 +-
 pango/pango.h                 |   1 -
 pango/pangocoretext-fontmap.c |   1 -
 pango/pangocoretext-private.h |   8 -
 pango/pangofc-font-private.h  |   9 -
 pango/pangofc-fontmap.c       |   1 -
 pango/pangoft2.h              |  14 --
 pango/pangowin32-fontmap.c    |   1 -
 pango/pangowin32.h            |   8 -
 pango/pangoxft.h              |  14 --
 22 files changed, 1 insertion(+), 849 deletions(-)
---
diff --git a/pango/fonts.c b/pango/fonts.c
index 004089fc..8cc02b48 100644
--- a/pango/fonts.c
+++ b/pango/fonts.c
@@ -1863,26 +1863,6 @@ pango_font_get_coverage (PangoFont     *font,
   return PANGO_FONT_GET_CLASS (font)->get_coverage (font, language);
 }
 
-/**
- * pango_font_find_shaper:
- * @font: a `PangoFont`
- * @language: the language tag
- * @ch: a Unicode character.
- *
- * Finds the best matching shaper for a font for a particular
- * language tag and character point.
- *
- * Return value: (transfer none): the best matching shaper.
- * Deprecated: Shape engines are no longer used
- */
-PangoEngineShape *
-pango_font_find_shaper (PangoFont     *font,
-                        PangoLanguage *language,
-                        guint32        ch)
-{
-  return NULL;
-}
-
 /**
  * pango_font_get_glyph_extents:
  * @font: (nullable): a `PangoFont`
diff --git a/pango/meson.build b/pango/meson.build
index 9f4c49be..aca5b1e8 100644
--- a/pango/meson.build
+++ b/pango/meson.build
@@ -4,14 +4,12 @@ pango_sources = [
   'fonts.c',
   'glyphstring.c',
   'itemize.c',
-  'modules.c',
   'pango-attributes.c',
   'pango-bidi-type.c',
   'pango-color.c',
   'pango-context.c',
   'pango-coverage.c',
   'pango-emoji.c',
-  'pango-engine.c',
   'pango-fontmap.c',
   'pango-fontset.c',
   'pango-fontset-simple.c',
@@ -42,7 +40,6 @@ pango_headers = [
   'pango-context.h',
   'pango-coverage.h',
   'pango-direction.h',
-  'pango-engine.h',
   'pango-font.h',
   'pango-fontmap.h',
   'pango-fontset.h',
@@ -55,7 +52,6 @@ pango_headers = [
   'pango-layout.h',
   'pango-matrix.h',
   'pango-markup.h',
-  'pango-modules.h',
   'pango-renderer.h',
   'pango-script.h',
   'pango-tabs.h',
diff --git a/pango/pango-font.h b/pango/pango-font.h
index 350e4e29..dc689166 100644
--- a/pango/pango-font.h
+++ b/pango/pango-font.h
@@ -595,12 +595,6 @@ PangoFontDescription *pango_font_describe_with_absolute_size (PangoFont        *
 PANGO_AVAILABLE_IN_ALL
 PangoCoverage *       pango_font_get_coverage      (PangoFont        *font,
                                                     PangoLanguage    *language);
-#ifndef __GI_SCANNER__
-PANGO_DEPRECATED_IN_1_44
-PangoEngineShape *    pango_font_find_shaper       (PangoFont        *font,
-                                                    PangoLanguage    *language,
-                                                    guint32           ch);
-#endif
 PANGO_AVAILABLE_IN_ALL
 PangoFontMetrics *    pango_font_get_metrics       (PangoFont        *font,
                                                     PangoLanguage    *language);
diff --git a/pango/pango-fontmap-private.h b/pango/pango-fontmap-private.h
index 935fd713..8d87f0fa 100644
--- a/pango/pango-fontmap-private.h
+++ b/pango/pango-fontmap-private.h
@@ -28,9 +28,6 @@
 
 G_BEGIN_DECLS
 
-PANGO_DEPRECATED_IN_1_38
-const char   *pango_font_map_get_shape_engine_type (PangoFontMap *fontmap);
-
 G_END_DECLS
 
 #endif /* __PANGO_FONTMAP_PRIVATE_H__ */
diff --git a/pango/pango-fontmap.c b/pango/pango-fontmap.c
index 71e3e20c..2cb1b175 100644
--- a/pango/pango-fontmap.c
+++ b/pango/pango-fontmap.c
@@ -292,27 +292,6 @@ pango_font_map_real_load_fontset (PangoFontMap               *fontmap,
   return PANGO_FONTSET (fonts);
 }
 
-/**
- * pango_font_map_get_shape_engine_type:
- * @fontmap: a `PangoFontMap`
- *
- * Returns the render ID for shape engines for this fontmap.
- * See the `render_type` field of `PangoEngineInfo`.
-  *
- * Return value (transfer none): the ID string for shape engines
- *   for this fontmap
- *
- * Since: 1.4
- * Deprecated: 1.38
- */
-const char *
-pango_font_map_get_shape_engine_type (PangoFontMap *fontmap)
-{
-  g_return_val_if_fail (PANGO_IS_FONT_MAP (fontmap), NULL);
-
-  return PANGO_FONT_MAP_GET_CLASS (fontmap)->shape_engine_type;
-}
-
 /**
  * pango_font_map_get_serial:
  * @fontmap: a `PangoFontMap`
diff --git a/pango/pango-fontmap.h b/pango/pango-fontmap.h
index cc85899b..1f42da0f 100644
--- a/pango/pango-fontmap.h
+++ b/pango/pango-fontmap.h
@@ -60,7 +60,6 @@ struct _PangoFontMap
  * pango_font_map_list_families().
  * @load_fontset: a function to load a fontset with a given given description
  * suitable for a particular language. See pango_font_map_load_fontset().
- * @shape_engine_type: the type of rendering-system-dependent engines that
  * can handle fonts of this fonts loaded with this fontmap.
  * @get_serial: a function to get the serial number of the fontmap.
  * See pango_font_map_get_serial().
@@ -86,8 +85,6 @@ struct _PangoFontMapClass
                                   const PangoFontDescription *desc,
                                   PangoLanguage              *language);
 
-  const char     *shape_engine_type;
-
   guint         (*get_serial)    (PangoFontMap               *fontmap);
   void          (*changed)       (PangoFontMap               *fontmap);
 
diff --git a/pango/pango-item.h b/pango/pango-item.h
index f0eebc01..a23af665 100644
--- a/pango/pango-item.h
+++ b/pango/pango-item.h
@@ -76,13 +76,8 @@ typedef struct _PangoItem PangoItem;
  */
 struct _PangoAnalysis
 {
-#ifndef __GI_SCANNER__
-  PangoEngineShape *shape_engine;
-  PangoEngineLang  *lang_engine;
-#else
   gpointer shape_engine;
   gpointer lang_engine;
-#endif
   PangoFont *font;
 
   guint8 level;
diff --git a/pango/pango-layout.c b/pango/pango-layout.c
index 9167883c..753a8a6e 100644
--- a/pango/pango-layout.c
+++ b/pango/pango-layout.c
@@ -77,7 +77,6 @@
 #include "pango-glyph.h"                /* For pango_shape() */
 #include "pango-break.h"
 #include "pango-item-private.h"
-#include "pango-engine.h"
 #include "pango-impl-utils.h"
 #include "pango-glyph-item.h"
 #include <string.h>
diff --git a/pango/pango-types.h b/pango/pango-types.h
index ed86f699..94db77d7 100644
--- a/pango/pango-types.h
+++ b/pango/pango-types.h
@@ -31,12 +31,8 @@ G_BEGIN_DECLS
 
 typedef struct _PangoLogAttr PangoLogAttr;
 
-#ifndef __GI_SCANNER__
-typedef struct _PangoEngineLang PangoEngineLang;
-typedef struct _PangoEngineShape PangoEngineShape;
-#endif
-
 typedef struct _PangoFont    PangoFont;
+
 typedef struct _PangoFontMap PangoFontMap;
 
 typedef struct _PangoRectangle PangoRectangle;
diff --git a/pango/pango.h b/pango/pango.h
index eca66265..a6220a8c 100644
--- a/pango/pango.h
+++ b/pango/pango.h
@@ -29,7 +29,6 @@
 #include <pango/pango-context.h>
 #include <pango/pango-coverage.h>
 #include <pango/pango-direction.h>
-#include <pango/pango-engine.h>
 #include <pango/pango-enum-types.h>
 #include <pango/pango-features.h>
 #include <pango/pango-font.h>
diff --git a/pango/pangocoretext-fontmap.c b/pango/pangocoretext-fontmap.c
index 40e62eed..04ee9a56 100644
--- a/pango/pangocoretext-fontmap.c
+++ b/pango/pangocoretext-fontmap.c
@@ -1541,7 +1541,6 @@ pango_core_text_font_map_class_init (PangoCoreTextFontMapClass *class)
   fontmap_class->load_font = pango_core_text_font_map_load_font;
   fontmap_class->list_families = pango_core_text_font_map_list_families;
   fontmap_class->load_fontset = pango_core_text_font_map_load_fontset;
-  fontmap_class->shape_engine_type = PANGO_RENDER_TYPE_CORE_TEXT;
   fontmap_class->get_serial = pango_core_text_font_map_get_serial;
   fontmap_class->changed = pango_core_text_font_map_changed;
   fontmap_class->get_face = pango_core_text_font_map_get_face;
diff --git a/pango/pangocoretext-private.h b/pango/pangocoretext-private.h
index 88187df4..eae7a0c0 100644
--- a/pango/pangocoretext-private.h
+++ b/pango/pangocoretext-private.h
@@ -30,14 +30,6 @@
 
 G_BEGIN_DECLS
 
-/**
- * PANGO_RENDER_TYPE_CORE_TEXT:
- *
- * A string constant identifying the CoreText renderer. The associated quark (see
- * g_quark_from_string()) is used to identify the renderer in pango_find_map().
- */
-#define PANGO_RENDER_TYPE_CORE_TEXT "PangoRenderCoreText"
-
 #define PANGO_CORE_TEXT_FONT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_CORE_TEXT_FONT, 
PangoCoreTextFontClass))
 #define PANGO_IS_CORE_TEXT_FONT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_CORE_TEXT_FONT))
 #define PANGO_CORE_TEXT_FONT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_CORE_TEXT_FONT, 
PangoCoreTextFontClass))
diff --git a/pango/pangofc-font-private.h b/pango/pangofc-font-private.h
index 532aed2f..1a97a6ab 100644
--- a/pango/pangofc-font-private.h
+++ b/pango/pangofc-font-private.h
@@ -27,15 +27,6 @@
 
 G_BEGIN_DECLS
 
-/**
- * PANGO_RENDER_TYPE_FC:
- *
- * A string constant used to identify shape engines that work
- * with the fontconfig based backends. See the @engine_type field
- * of `PangoEngineInfo`.
- **/
-#define PANGO_RENDER_TYPE_FC "PangoRenderFc"
-
 #define PANGO_FC_FONT_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_FC_FONT, 
PangoFcFontClass))
 #define PANGO_IS_FC_FONT_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_FC_FONT))
 #define PANGO_FC_FONT_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_FC_FONT, 
PangoFcFontClass))
diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c
index 4c39ea1f..4af53122 100644
--- a/pango/pangofc-fontmap.c
+++ b/pango/pangofc-fontmap.c
@@ -1494,7 +1494,6 @@ pango_fc_font_map_class_init (PangoFcFontMapClass *class)
   fontmap_class->list_families = pango_fc_font_map_list_families;
   fontmap_class->get_family = pango_fc_font_map_get_family;
   fontmap_class->get_face = pango_fc_font_map_get_face;
-  fontmap_class->shape_engine_type = PANGO_RENDER_TYPE_FC;
   fontmap_class->changed = pango_fc_font_map_changed;
 }
 
diff --git a/pango/pangoft2.h b/pango/pangoft2.h
index 239eb05e..86cb84c9 100644
--- a/pango/pangoft2.h
+++ b/pango/pangoft2.h
@@ -34,20 +34,6 @@
 
 G_BEGIN_DECLS
 
-#ifndef __GI_SCANNER__
-
-#ifndef PANGO_DISABLE_DEPRECATED
-/**
- * PANGO_RENDER_TYPE_FT2: (skip)
- *
- * A string constant that was used to identify shape engines that work
- * with the FreeType backend. See %PANGO_RENDER_TYPE_FC for the replacement.
- */
-#define PANGO_RENDER_TYPE_FT2 "PangoRenderFT2"
-#endif
-
-#endif /* __GI_SCANNER__ */
-
 #ifdef __GI_SCANNER__
 #define PANGO_FT2_TYPE_FONT_MAP              (pango_ft2_font_map_get_type ())
 #define PANGO_FT2_FONT_MAP(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_FT2_TYPE_FONT_MAP, 
PangoFT2FontMap))
diff --git a/pango/pangowin32-fontmap.c b/pango/pangowin32-fontmap.c
index 43cffc37..f59eddf4 100644
--- a/pango/pangowin32-fontmap.c
+++ b/pango/pangowin32-fontmap.c
@@ -798,7 +798,6 @@ _pango_win32_font_map_class_init (PangoWin32FontMapClass *class)
   /* we now need a load_fontset implementation for the Win32 backend */
   fontmap_class->load_fontset = pango_win32_font_map_load_fontset;
   fontmap_class->list_families = pango_win32_font_map_list_families;
-  fontmap_class->shape_engine_type = PANGO_RENDER_TYPE_WIN32;
   fontmap_class->get_face = pango_win32_font_map_get_face;
   class->aliases = g_hash_table_new_full ((GHashFunc)alias_hash,
                                           (GEqualFunc)alias_equal,
diff --git a/pango/pangowin32.h b/pango/pangowin32.h
index 406c428b..a2045f0f 100644
--- a/pango/pangowin32.h
+++ b/pango/pangowin32.h
@@ -37,14 +37,6 @@ G_BEGIN_DECLS
 #include <windows.h>
 #undef STRICT
 
-/**
- * PANGO_RENDER_TYPE_WIN32:
- *
- * A string constant identifying the Win32 renderer. The associated quark (see
- * g_quark_from_string()) is used to identify the renderer in pango_find_map().
- */
-#define PANGO_RENDER_TYPE_WIN32 "PangoRenderWin32"
-
 /* Calls for applications
  */
 #ifndef PANGO_DISABLE_DEPRECATED
diff --git a/pango/pangoxft.h b/pango/pangoxft.h
index 105de5c2..b035d79e 100644
--- a/pango/pangoxft.h
+++ b/pango/pangoxft.h
@@ -32,20 +32,6 @@
 
 G_BEGIN_DECLS
 
-#ifndef __GI_SCANNER__
-
-/**
- * PANGO_RENDER_TYPE_XFT: (skip)
- *
- * A string constant that was used to identify shape engines that work
- * with the Xft backend. See %PANGO_RENDER_TYPE_FC for the replacement.
- */
-#ifndef PANGO_DISABLE_DEPRECATED
-#define PANGO_RENDER_TYPE_XFT "PangoRenderXft"
-#endif
-
-#endif /* __GI_SCANNER__ */
-
 /**
  * PangoXftFontMap:
  *
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]