X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=blobdiff_plain;f=lily%2Finclude%2Ffont-metric.hh;h=4d4694cb21edf5abca8c7da11f8a6bf2e9b89711;hb=cb0b407e567feca71cbc5f9479a06b266c69a26c;hp=d74c8157ca9f50003aa1777d9cb35ed3d8923b19;hpb=1de3d397c18622b6061402fef18e625701712bc5;p=lilypond.git

diff --git a/lily/include/font-metric.hh b/lily/include/font-metric.hh
index d74c8157ca..4d4694cb21 100644
--- a/lily/include/font-metric.hh
+++ b/lily/include/font-metric.hh
@@ -42,22 +42,22 @@ private:
 
 public:
   SCM description_;
-  string file_name_;
+  std::string file_name_;
 
-  // Return stencil for given string. output_state may be modified to
+  // Return stencil for given std::string. output_state may be modified to
   // record the font.
   virtual Stencil text_stencil (Output_def *output_state,
-                                const string &text, bool music) const;
+                                const std::string &text, bool music) const;
 
-  virtual string font_name () const;
+  virtual std::string font_name () const;
   virtual size_t count () const;
-  virtual Offset attachment_point (const string&) const;
+  virtual Offset attachment_point (const std::string&) const;
   virtual Offset get_indexed_wxwy (size_t) const;
   virtual Box get_indexed_char_dimensions (size_t index) const;
-  virtual size_t name_to_index (string) const=0;
+  virtual size_t name_to_index (std::string) const=0;
   virtual size_t index_to_charcode (size_t) const;
   virtual Real design_size () const;
-  virtual Stencil find_by_name (string) const;
+  virtual Stencil find_by_name (std::string) const;
   virtual SCM sub_fonts () const;
   virtual SCM font_file_name () const;