[pango: 2/2] Merge branch 'header-cleanup' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 2b6590fd2ed2b5a99f7d4c7628de78e4fd20bb7e
Merge: a1ad3ce6 d21ea13a
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Jul 4 21:31:43 2019 +0000

    Merge branch 'header-cleanup' into 'master'
    
    Header cleanup
    
    See merge request GNOME/pango!63

 pango/fonts.c                   |   2 +-
 pango/meson.build               |   4 -
 pango/pango-break.h             |   4 -
 pango/pango-context.c           |   3 +
 pango/pango-engine.h            |   4 +-
 pango/pango-font-private.h      | 194 ++++++++++++++++++++++++++++++++++++++++
 pango/pango-font.h              | 166 ----------------------------------
 pango/pango-fontmap-private.h   | 129 ++++++++++++++++++++++++++
 pango/pango-fontmap.c           |   3 +-
 pango/pango-fontmap.h           |  97 --------------------
 pango/pango-fontset-private.h   | 131 +++++++++++++++++++++++++++
 pango/pango-fontset.c           |   4 +-
 pango/pango-fontset.h           |  97 --------------------
 pango/pango-modules.h           |   4 +-
 pango/pango-ot.h                |   4 +-
 pango/pango-utils-private.h     |  59 ++++++++++++
 pango/pango-utils.c             |   1 +
 pango/pango-utils.h             |  30 -------
 pango/pangocairo-fc-private.h   |  48 ++++++++++
 pango/pangocairo-fc.h           |  14 ---
 pango/pangocairo-fcfont.c       |   4 +-
 pango/pangocairo-fcfontmap.c    |   4 +-
 pango/pangocairo-font.c         |   1 +
 pango/pangocairo-render.c       |   1 +
 pango/pangocoretext-private.h   |  37 ++++++++
 pango/pangocoretext.h           |  43 ---------
 pango/pangofc-font-private.h    | 148 ++++++++++++++++++++++++++++++
 pango/pangofc-font.c            |   2 +-
 pango/pangofc-font.h            | 108 +---------------------
 pango/pangofc-fontmap-private.h | 194 ++++++++++++++++++++++++++++++++++++++++
 pango/pangofc-fontmap.c         |   3 +-
 pango/pangofc-fontmap.h         | 162 ---------------------------------
 pango/pangofc-private.h         |   2 +-
 pango/pangofc-shape.c           |   2 +
 pango/pangoft2-private.h        |   2 +-
 pango/pangoft2-render.c         |   1 +
 pango/pangoft2.c                |   2 +-
 pango/pangowin32-private.h      |   3 +
 pango/pangowin32.h              |  16 ++--
 pango/pangoxft-fontmap.c        |   2 +-
 pango/pangoxft-private.h        |   1 +
 pango/pangoxft.h                |   9 +-
 tests/cxx-test.cpp              |   2 -
 tests/test-ot-tags.c            |   2 +-
 44 files changed, 988 insertions(+), 761 deletions(-)
---