[cairo-commit] cairomm/cairomm context.cc, 1.5, 1.6 context.h, 1.4, 1.5

[Murray Cumming]

Committed by: murrayc

Update of /cvs/cairo/cairomm/cairomm
In directory gabe:/tmp/cvs-serv27393/cairomm

Modified Files:
	context.cc context.h 
Log Message:
2005-12-07  Murray Cumming <murrayc at murrayc.com>

        * cairomm/context.cc:
        * cairomm/context.h: font_extents(), stroke_extents(),
        glyph_extents(), fill_extents(): Add get_ prefix and
        make them const.


Index: context.cc
===================================================================
RCS file: /cvs/cairo/cairomm/cairomm/context.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- context.cc	7 Dec 2005 15:30:57 -0000	1.5
+++ context.cc	7 Dec 2005 15:36:44 -0000	1.6
@@ -381,13 +381,13 @@
   return result;
 }
 
-void Context::stroke_extents(double& x1, double& y1, double& x2, double& y2) const
+void Context::get_stroke_extents(double& x1, double& y1, double& x2, double& y2) const
 {
   cairo_stroke_extents(m_cobject, &x1, &y1, &x2, &y2);
   check_object_status_and_throw_exception(*this);
 }
 
-void Context::fill_extents(double& x1, double& y1, double& x2, double& y2) const
+void Context::get_fill_extents(double& x1, double& y1, double& x2, double& y2) const
 {
   cairo_fill_extents(m_cobject, &x1, &y1, &x2, &y2);
   check_object_status_and_throw_exception(*this);
@@ -460,7 +460,7 @@
   return FontFace(cfontface, false /* does not have reference */);
 }
 
-void Context::font_extents(FontExtents& extents)
+void Context::get_font_extents(FontExtents& extents) const
 {
   cairo_font_extents(m_cobject, &extents);
   check_object_status_and_throw_exception(*this);
@@ -472,13 +472,13 @@
   check_object_status_and_throw_exception(*this);
 }
 
-void Context::text_extents(const std::string& utf8, TextExtents& extents)
+void Context::get_text_extents(const std::string& utf8, TextExtents& extents) const
 {
   cairo_text_extents(m_cobject, utf8.c_str(), &extents);
   check_object_status_and_throw_exception(*this);
 }
 
-void Context::glyph_extents(const std::vector<Glyph>& glyphs, TextExtents& extents) const
+void Context::get_glyph_extents(const std::vector<Glyph>& glyphs, TextExtents& extents) const
 {
   cairo_glyph_extents(m_cobject, const_cast<cairo_glyph_t*>(&glyphs[0]), glyphs.size(), &extents);
   check_object_status_and_throw_exception(*this);

Index: context.h
===================================================================
RCS file: /cvs/cairo/cairomm/cairomm/context.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- context.h	7 Dec 2005 15:30:57 -0000	1.4
+++ context.h	7 Dec 2005 15:36:44 -0000	1.5
@@ -126,8 +126,8 @@
   void show_page();
   bool in_stroke(double x, double y) const;
   bool in_fill(double x, double y) const;
-  void stroke_extents(double& x1, double& y1, double& x2, double& y2) const;
-  void fill_extents(double& x1, double& y1, double& x2, double& y2) const;
+  void get_stroke_extents(double& x1, double& y1, double& x2, double& y2) const;
+  void get_fill_extents(double& x1, double& y1, double& x2, double& y2) const;
   void reset_clip();
   void clip();
   void clip_preserve();
@@ -139,10 +139,10 @@
   void show_text(const std::string& utf8);
   void show_glyphs(const std::vector<Glyph>& glyphs);
   FontFace get_font_face() const;
-  void font_extents(FontExtents& extents);
+  void get_font_extents(FontExtents& extents) const;
   void set_font_face(const FontFace& font_face);
-  void text_extents(const std::string& utf8, TextExtents& extents);
-  void glyph_extents(const std::vector<Glyph>& glyphs, TextExtents& extents) const;
+  void get_text_extents(const std::string& utf8, TextExtents& extents) const;
+  void get_glyph_extents(const std::vector<Glyph>& glyphs, TextExtents& extents) const;
   void text_path(const std::string& utf8);
   void glyph_path(const std::vector<Glyph>& glyphs); //TODO: Is this an output parameter?
   Operator get_operator() const;