*** empty log message ***

[lilypond.git] / lily / include / modified-font-metric.hh

diff --git a/lily/include/modified-font-metric.hh b/lily/include/modified-font-metric.hh
index 274e031b39094018d760dc49d19e6639f6487325..d0f73f10665140773590b58e15497af821e63e94 100644 (file)
--- a/lily/include/modified-font-metric.hh
+++ b/lily/include/modified-font-metric.hh
@@ -15,14 +15,14 @@
 struct Modified_font_metric : public Font_metric
 {
 public:
-  virtual Box text_dimension (String) const;
-  virtual Stencil text_stencil (String) const;
+  virtual Box text_dimension (std::string) const;
+  virtual Stencil text_stencil (std::string) const;
 
   static SCM make_scaled_font_metric (Font_metric *fm, Real magnification);
   virtual int count () const;
   virtual Offset get_indexed_wxwy (int) const;
-  virtual Offset attachment_point (String) const;
-  virtual int name_to_index (String) const;
+  virtual Offset attachment_point (std::string) const;
+  virtual int name_to_index (std::string) const;
   virtual unsigned index_to_charcode (int) const;
   Font_metric *original_font () const;
 
@@ -32,13 +32,13 @@ protected:
 
   Modified_font_metric (Font_metric *fm, Real magnification);
   virtual SCM sub_fonts () const;
-  virtual String font_name () const;
+  virtual std::string font_name () const;
   virtual Real design_size () const;
   virtual void derived_mark () const;
   virtual Box get_indexed_char (int) const;
   virtual int index_to_ascii (int) const;
   virtual Box get_ascii_char (int) const;
-  Box tex_kludge (String) const;
+  Box tex_kludge (std::string) const;
 };
 
 #endif /* MODIFIED_FONT_METRIC_HH */