[pangomm] Coverage: Change CoverageLevel to Coverage::Level.



commit e15d8d4577a9416c3f971f19d18d6901f933155e
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Apr 19 10:59:55 2017 +0200

    Coverage: Change CoverageLevel to Coverage::Level.

 pango/src/coverage.ccg    |    2 ++
 pango/src/coverage.hg     |    9 +++++----
 tools/m4/convert_pango.m4 |    2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/pango/src/coverage.ccg b/pango/src/coverage.ccg
index a205e2a..f72b2d3 100644
--- a/pango/src/coverage.ccg
+++ b/pango/src/coverage.ccg
@@ -21,6 +21,8 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+using Level = Pango::Coverage::Level;
+
 namespace Pango
 {
 
diff --git a/pango/src/coverage.hg b/pango/src/coverage.hg
index 9782e21..bc18390 100644
--- a/pango/src/coverage.hg
+++ b/pango/src/coverage.hg
@@ -27,10 +27,9 @@ namespace Pango
 {
 
 _CC_INCLUDE(pango/pango-enum-types.h)
-_WRAP_ENUM(CoverageLevel, PangoCoverageLevel)
 
 
-/** A Pango::Coverage represents a map from ISO-10646 character point to Pango::CoverageLevel.
+/** A Pango::Coverage represents a map from ISO-10646 character point to Pango::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.
  */
@@ -42,12 +41,14 @@ class Coverage final
   _IGNORE(pango_coverage_to_bytes)
 
 public:
+  _WRAP_ENUM(Level, PangoCoverageLevel)
+
   _WRAP_METHOD(static Glib::RefPtr<Coverage> create(const guchar* bytes, int n_bytes), 
pango_coverage_from_bytes)
 
   //_WRAP_METHOD(Glib::RefPtr<Coverage> copy() const, pango_coverage_copy) //see above
 
-  _WRAP_METHOD(CoverageLevel get(int index) const, pango_coverage_get)
-  _WRAP_METHOD(void set(int index, CoverageLevel level), pango_coverage_set)
+  _WRAP_METHOD(Level get(int index) const, pango_coverage_get)
+  _WRAP_METHOD(void set(int index, Level level), pango_coverage_set)
   _WRAP_METHOD(void max(const Glib::RefPtr<Coverage>& other) const, pango_coverage_max)
 
   /** Convert the coverage map into a flat binary format.
diff --git a/tools/m4/convert_pango.m4 b/tools/m4/convert_pango.m4
index 6edf6d5..fde37b9 100644
--- a/tools/m4/convert_pango.m4
+++ b/tools/m4/convert_pango.m4
@@ -3,7 +3,7 @@
 _CONV_ENUM(Pango,AttrType)
 _CONV_ENUM(Pango,Underline)
 _CONV_ENUM(Pango,Direction)
-_CONV_ENUM(Pango,CoverageLevel)
+_CONV_INCLASS_ENUM(Pango,Coverage,Level)
 _CONV_ENUM(Pango,Style)
 _CONV_ENUM(Pango,Variant)
 _CONV_ENUM(Pango,Stretch)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]