[pangomm/pangomm-2-48] Don't include individual pango headers, part 2

From: Kjell Ahlstedt <kjellahl src gnome org>
To: commits-list gnome org
Cc:
Subject: [pangomm/pangomm-2-48] Don't include individual pango headers, part 2
Date: Wed, 25 Aug 2021 17:10:45 +0000 (UTC)
commit 97a48ded7f27fae443f3ac1f857b3995c28984ed
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date:   Wed Aug 25 18:42:38 2021 +0200

    Don't include individual pango headers, part 2

 pango/pangomm/types.h        | 6 +-----
 pango/src/attributes.hg      | 3 ---
 pango/src/color.hg           | 2 +-
 pango/src/context.ccg        | 5 -----
 pango/src/context.hg         | 5 +----
 pango/src/coverage.hg        | 4 +---
 pango/src/font.hg            | 2 +-
 pango/src/fontdescription.hg | 3 +--
 pango/src/fontface.hg        | 2 +-
 pango/src/fontfamily.hg      | 2 +-
 pango/src/fontmap.ccg        | 5 -----
 pango/src/fontmap.hg         | 2 +-
 pango/src/fontmetrics.hg     | 2 +-
 pango/src/fontset.hg         | 4 +---
 pango/src/glyph.hg           | 2 +-
 pango/src/glyphitem.hg       | 2 +-
 pango/src/glyphstring.hg     | 2 +-
 pango/src/item.ccg           | 1 -
 pango/src/item.hg            | 2 +-
 pango/src/language.ccg       | 3 ---
 pango/src/language.hg        | 2 +-
 pango/src/layout.hg          | 3 +--
 pango/src/layoutiter.hg      | 2 +-
 pango/src/layoutline.hg      | 2 +-
 pango/src/rectangle.hg       | 2 +-
 pango/src/renderer.ccg       | 3 +--
 pango/src/renderer.hg        | 4 +---
 pango/src/tabarray.hg        | 4 +---
 28 files changed, 23 insertions(+), 58 deletions(-)
---
diff --git a/pango/pangomm/types.h b/pango/pangomm/types.h
index 314ffb6..72de3d9 100644
--- a/pango/pangomm/types.h
+++ b/pango/pangomm/types.h
@@ -1,5 +1,3 @@
-/* $Id: types.h 295 2004-12-01 11:46:29Z murrayc $ */
-
 /* Copyright (C) 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -20,7 +18,7 @@
 #ifndef _PANGOMM_TYPES_H
 #define _PANGOMM_TYPES_H
 
-#include <pango/pango-types.h>
+#include <pango/pango.h>
 
 namespace Pango
 {
@@ -29,6 +27,4 @@ typedef PangoMatrix Matrix;
 
 } // namespace Pango
 
-
 #endif /* _PANGOMM_TYPES_H */
-
diff --git a/pango/src/attributes.hg b/pango/src/attributes.hg
index 0be8c2e..99bdf71 100644
--- a/pango/src/attributes.hg
+++ b/pango/src/attributes.hg
@@ -27,9 +27,6 @@ _DEFS(pangomm,pango)
 
 namespace Pango
 {
-
-_CC_INCLUDE(pango/pango-enum-types.h)
-
 /** Pango::AttrType distinguishes between different types of attributes.
  * Along with the predefined values, it is possible to allocate additional values for
  * custom attributes using Pango::Attribute::register_type(). The predefined values
diff --git a/pango/src/color.hg b/pango/src/color.hg
index edba231..4c9c9e0 100644
--- a/pango/src/color.hg
+++ b/pango/src/color.hg
@@ -19,7 +19,7 @@ _CONFIGINCLUDE(pangommconfig.h)
 
 #include <glibmm/value.h>
 #include <glibmm/utility.h>
-#include <pango/pango-attributes.h>
+#include <pango/pango.h>
 
 _DEFS(pangomm,pango)
 
diff --git a/pango/src/context.ccg b/pango/src/context.ccg
index 6650cd0..a8e54a1 100644
--- a/pango/src/context.ccg
+++ b/pango/src/context.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: context.ccg,v 1.3 2006/06/10 15:26:24 murrayc Exp $ */
-
 /* 
- *
  * Copyright 1998-1999 The Gtk-- Development Team
  * Copyright 2001      Free Software Foundation
  *
@@ -22,7 +18,6 @@
  */
 
 #include <pango/pangocairo.h>
-#include <pango/pango-types.h> //For PANGO_MATRIX_INIT
 
 namespace Pango
 {
diff --git a/pango/src/context.hg b/pango/src/context.hg
index ae5dadb..47dc9d8 100644
--- a/pango/src/context.hg
+++ b/pango/src/context.hg
@@ -1,5 +1,3 @@
-/* $Id: context.hg,v 1.7 2006/06/10 15:26:24 murrayc Exp $ */
-
 /* context.h
  * 
  * Copyright (C) 1998-1999 The gtkmm Development Team 
@@ -28,7 +26,7 @@
 #include <pangomm/item.h>
 #include <pangomm/attrlist.h>
 #include <pangomm/types.h> //For Matrix
-#include <pango/pango-context.h>
+#include <pango/pango.h>
 #include <cairomm/context.h>
 #include <cairomm/fontoptions.h>
 
@@ -38,7 +36,6 @@ _PINCLUDE(glibmm/private/object_p.h)
 namespace Pango
 {
 
-_CC_INCLUDE(pango/pango-enum-types.h)
 _WRAP_ENUM(Direction, PangoDirection, decl_prefix PANGOMM_API)
 _WRAP_ENUM(GravityHint, PangoGravityHint, decl_prefix PANGOMM_API)
 
diff --git a/pango/src/coverage.hg b/pango/src/coverage.hg
index b48005b..b73147d 100644
--- a/pango/src/coverage.hg
+++ b/pango/src/coverage.hg
@@ -20,15 +20,13 @@
 _CONFIGINCLUDE(pangommconfig.h)
 
 #include <glibmm/value.h>
-#include <pango/pango-font.h>
+#include <pango/pango.h>
 
 _DEFS(pangomm,pango)
 
 namespace Pango
 {
 
-_CC_INCLUDE(pango/pango-enum-types.h)
-
 /** A Pango::Coverage represents a map from ISO-10646 character point to Pango::Coverage::Level.
  * It is often necessary in pango to determine if a particular font can represent a particular character,
  * and also how well it can represent that character. Pango::Coverage holds this information.
diff --git a/pango/src/font.hg b/pango/src/font.hg
index 652a6d5..66e0126 100644
--- a/pango/src/font.hg
+++ b/pango/src/font.hg
@@ -25,7 +25,7 @@
 #include <pangomm/fontdescription.h>
 #include <pangomm/fontmetrics.h>
 #include <pangomm/coverage.h>
-#include <pango/pango-font.h>
+#include <pango/pango.h>
 
 _DEFS(pangomm,pango)
 _PINCLUDE(glibmm/private/object_p.h)
diff --git a/pango/src/fontdescription.hg b/pango/src/fontdescription.hg
index cb6286a..340457b 100644
--- a/pango/src/fontdescription.hg
+++ b/pango/src/fontdescription.hg
@@ -20,14 +20,13 @@
 _CONFIGINCLUDE(pangommconfig.h)
 
 #include <glibmm/value.h>
-#include <pango/pango-font.h>
+#include <pango/pango.h>
 
 _DEFS(pangomm,pango)
 
 namespace Pango
 {
 
-_CC_INCLUDE(pango/pango-enum-types.h)
 _WRAP_ENUM(Style, PangoStyle, decl_prefix PANGOMM_API)
 _WRAP_ENUM(Variant, PangoVariant, decl_prefix PANGOMM_API)
 _WRAP_ENUM(Stretch, PangoStretch, decl_prefix PANGOMM_API)
diff --git a/pango/src/fontface.hg b/pango/src/fontface.hg
index 65bf71c..086fa0d 100644
--- a/pango/src/fontface.hg
+++ b/pango/src/fontface.hg
@@ -19,7 +19,7 @@
 
 #include <pangomm/fontdescription.h>
 #include <glibmm/object.h>
-#include <pango/pango-font.h>
+#include <pango/pango.h>
 
 _DEFS(pangomm,pango)
 _PINCLUDE(glibmm/private/object_p.h)
diff --git a/pango/src/fontfamily.hg b/pango/src/fontfamily.hg
index d6ab740..62ae2ce 100644
--- a/pango/src/fontfamily.hg
+++ b/pango/src/fontfamily.hg
@@ -20,7 +20,7 @@
 #include <glibmm/object.h>
 #include <giomm/listmodel.h>
 #include <pangomm/fontface.h>
-#include <pango/pango-font.h>
+#include <pango/pango.h>
 
 _DEFS(pangomm,pango)
 _PINCLUDE(glibmm/private/object_p.h)
diff --git a/pango/src/fontmap.ccg b/pango/src/fontmap.ccg
index 65ce514..0dae2af 100644
--- a/pango/src/fontmap.ccg
+++ b/pango/src/fontmap.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: fontmap.ccg,v 1.2 2004/03/03 01:07:40 murrayc Exp $ */
-
 /* 
- *
  * Copyright 2001      The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -21,7 +17,6 @@
  */
 
 #include <pangomm/context.h>
-#include <pango/pango-fontmap.h>
 
 namespace Pango
 {
diff --git a/pango/src/fontmap.hg b/pango/src/fontmap.hg
index a87be51..353f559 100644
--- a/pango/src/fontmap.hg
+++ b/pango/src/fontmap.hg
@@ -22,7 +22,7 @@
 #include <pangomm/font.h>
 #include <pangomm/fontset.h>
 #include <pangomm/fontfamily.h>
-#include <pango/pango-fontmap.h>
+#include <pango/pango.h>
 
 _DEFS(pangomm,pango)
 _PINCLUDE(glibmm/private/object_p.h)
diff --git a/pango/src/fontmetrics.hg b/pango/src/fontmetrics.hg
index 0eb8954..869f0a1 100644
--- a/pango/src/fontmetrics.hg
+++ b/pango/src/fontmetrics.hg
@@ -20,7 +20,7 @@
 _CONFIGINCLUDE(pangommconfig.h)
 
 #include <glibmm/value.h>
-#include <pango/pango-font.h>
+#include <pango/pango.h>
 
 _DEFS(pangomm,pango)
 
diff --git a/pango/src/fontset.hg b/pango/src/fontset.hg
index dff0cf4..03b36ab 100644
--- a/pango/src/fontset.hg
+++ b/pango/src/fontset.hg
@@ -1,5 +1,3 @@
-/* $Id: fontset.hg,v 1.3 2005/11/30 14:10:50 murrayc Exp $ */
-
 /* fontset.h
  *
  * Copyright 2001      The gtkmm Development Team
@@ -23,7 +21,7 @@
 #include <pangomm/language.h>
 #include <pangomm/font.h>
 #include <pangomm/fontmetrics.h>
-#include <pango/pango-fontset.h>
+#include <pango/pango.h>
 
 _DEFS(pangomm,pango)
 _PINCLUDE(glibmm/private/object_p.h)
diff --git a/pango/src/glyph.hg b/pango/src/glyph.hg
index 3bea674..48c97f9 100644
--- a/pango/src/glyph.hg
+++ b/pango/src/glyph.hg
@@ -19,7 +19,7 @@
 
 _CONFIGINCLUDE(pangommconfig.h)
 
-#include <pango/pango-glyph.h>
+#include <pango/pango.h>
 
 _DEFS(pangomm,pango)
 
diff --git a/pango/src/glyphitem.hg b/pango/src/glyphitem.hg
index 12ce884..c531687 100644
--- a/pango/src/glyphitem.hg
+++ b/pango/src/glyphitem.hg
@@ -18,7 +18,7 @@
  */
 
 #include <pangomm/attributes.h> //For LogAttr.
-#include <pango/pango-glyph-item.h>
+#include <pango/pango.h>
 
 _DEFS(pangomm,pango)
 
diff --git a/pango/src/glyphstring.hg b/pango/src/glyphstring.hg
index 8577905..6df1641 100644
--- a/pango/src/glyphstring.hg
+++ b/pango/src/glyphstring.hg
@@ -21,7 +21,7 @@
 #include <pangomm/glyph.h>
 #include <pangomm/item.h> // for Analysis and ShapeFlags
 #include <cairomm/context.h>
-#include <pango/pango-glyph.h>
+#include <pango/pango.h>
 
 _DEFS(pangomm,pango)
 
diff --git a/pango/src/item.ccg b/pango/src/item.ccg
index 199a554..9bb29c7 100644
--- a/pango/src/item.ccg
+++ b/pango/src/item.ccg
@@ -15,7 +15,6 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <pango/pango-enum-types.h> // for pango_shape_flags_get_type()
 #include <pangomm/font.h>
 #include <pangomm/attributes.h>
 #include <pangomm/glyphstring.h>
diff --git a/pango/src/item.hg b/pango/src/item.hg
index 37b8fce..d388ade 100644
--- a/pango/src/item.hg
+++ b/pango/src/item.hg
@@ -17,7 +17,7 @@
  
 #include <pangomm/attributes.h>
 #include <pangomm/language.h>
-#include <pango/pango-item.h>
+#include <pango/pango.h>
 
 _DEFS(pangomm,pango)
 
diff --git a/pango/src/language.ccg b/pango/src/language.ccg
index 8ef2034..f6b9178 100644
--- a/pango/src/language.ccg
+++ b/pango/src/language.ccg
@@ -15,9 +15,6 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <pango/pango-enum-types.h>
-#include <pango/pango-script.h>
-
 namespace Pango
 {
 
diff --git a/pango/src/language.hg b/pango/src/language.hg
index 6477526..f018cb8 100644
--- a/pango/src/language.hg
+++ b/pango/src/language.hg
@@ -18,7 +18,7 @@
 _CONFIGINCLUDE(pangommconfig.h)
 
 #include <glibmm/value.h>
-#include <pango/pango-attributes.h>
+#include <pango/pango.h>
 
 _DEFS(pangomm,pango)
 
diff --git a/pango/src/layout.hg b/pango/src/layout.hg
index 749f339..f5c5975 100644
--- a/pango/src/layout.hg
+++ b/pango/src/layout.hg
@@ -25,7 +25,7 @@
 #include <pangomm/tabarray.h>
 #include <pangomm/layoutline.h>
 #include <pangomm/layoutiter.h>
-#include <pango/pango-layout.h>
+#include <pango/pango.h>
 
 _DEFS(pangomm,pango)
 _PINCLUDE(glibmm/private/object_p.h)
@@ -33,7 +33,6 @@ _PINCLUDE(glibmm/private/object_p.h)
 namespace Pango
 {
 
-_CC_INCLUDE(pango/pango-enum-types.h)
 _WRAP_ENUM(Alignment, PangoAlignment, decl_prefix PANGOMM_API)
 _WRAP_ENUM(WrapMode, PangoWrapMode, decl_prefix PANGOMM_API)
 _WRAP_ENUM(EllipsizeMode, PangoEllipsizeMode, decl_prefix PANGOMM_API)
diff --git a/pango/src/layoutiter.hg b/pango/src/layoutiter.hg
index 2fd263e..96e9d16 100644
--- a/pango/src/layoutiter.hg
+++ b/pango/src/layoutiter.hg
@@ -19,7 +19,7 @@
 
 #include <pangomm/layoutline.h>
 #include <pangomm/glyphitem.h>
-#include <pango/pango-layout.h>
+#include <pango/pango.h>
 
 _DEFS(pangomm,pango)
 
diff --git a/pango/src/layoutline.hg b/pango/src/layoutline.hg
index 1f307f3..efee914 100644
--- a/pango/src/layoutline.hg
+++ b/pango/src/layoutline.hg
@@ -20,7 +20,7 @@
 #include <glibmm/refptr.h>
 #include <pangomm/rectangle.h>
 #include <cairomm/context.h>
-#include <pango/pango-layout.h>
+#include <pango/pango.h>
 
 _DEFS(pangomm,pango)
 
diff --git a/pango/src/rectangle.hg b/pango/src/rectangle.hg
index 44a0f4b..cbb9e9e 100644
--- a/pango/src/rectangle.hg
+++ b/pango/src/rectangle.hg
@@ -17,7 +17,7 @@
 
 _CONFIGINCLUDE(pangommconfig.h)
 
-#include <pango/pango-types.h>
+#include <pango/pango.h>
 
 _DEFS(pangomm,pango)
 
diff --git a/pango/src/renderer.ccg b/pango/src/renderer.ccg
index e1b79c5..c2c8793 100644
--- a/pango/src/renderer.ccg
+++ b/pango/src/renderer.ccg
@@ -16,8 +16,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <pango/pango-renderer.h>
-#include <pango/pango-types.h> //For PANGO_MATRIX_INIT
+#include <pango/pango.h>
 
 using Part = Pango::Renderer::Part;
 
diff --git a/pango/src/renderer.hg b/pango/src/renderer.hg
index ae7d4dd..a8c78e0 100644
--- a/pango/src/renderer.hg
+++ b/pango/src/renderer.hg
@@ -27,13 +27,11 @@
 
 _DEFS(pangomm,pango)
 _PINCLUDE(glibmm/private/object_p.h)
-_PINCLUDE(pango/pango-renderer.h)
+_PINCLUDE(pango/pango.h)
 
 namespace Pango
 {
 
-_CC_INCLUDE(pango/pango-enum-types.h)
-
 /** Pango::Renderer is a base class that contains the necessary logic for rendering a Pango::Layout or 
Pango::LayoutLine. 
  * By subclassing Pango::Renderer and overriding operations such as draw_glyphs and draw_rectangle, 
  * renderers for particular font backends and destinations can be created.
diff --git a/pango/src/tabarray.hg b/pango/src/tabarray.hg
index 7a5d002..a5f7048 100644
--- a/pango/src/tabarray.hg
+++ b/pango/src/tabarray.hg
@@ -18,8 +18,7 @@
  */
 
 #include <pangomm/attrlist.h>
-#include <pango/pango-tabs.h>
-#include <pango/pango-break.h> /* For PangoLogAttrs */
+#include <pango/pango.h>
 #include <utility>
 
 _DEFS(pangomm,pango)
@@ -27,7 +26,6 @@ _DEFS(pangomm,pango)
 namespace Pango
 {
 
-_CC_INCLUDE(pango/pango-enum-types.h)
 _WRAP_ENUM(TabAlign, PangoTabAlign, decl_prefix PANGOMM_API)
 
 /** A Pango::TabArray contains an array of tab stops.
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]