*** empty log message ***

[lilypond.git] / lily / include / open-type-font.hh

diff --git a/lily/include/open-type-font.hh b/lily/include/open-type-font.hh
index c27c9a66ffa55a14b3011731b35a2d6e0144546e..1a19ab3ccb6f317cb9cb3d8f83753c43bcde67df 100644 (file)
--- a/lily/include/open-type-font.hh
+++ b/lily/include/open-type-font.hh
@@ -38,22 +38,22 @@ public:
   SCM get_char_table () const;
   SCM glyph_list () const;
     
-  String get_otf_table (String tag) const;
-  static SCM make_otf (String);
-  virtual String font_name () const;
+  std::string get_otf_table (std::string tag) const;
+  static SCM make_otf (std::string);
+  virtual std::string font_name () const;
   virtual ~Open_type_font ();
-  virtual Offset attachment_point (String) const;
+  virtual Offset attachment_point (std::string) const;
   virtual int count () const;
   virtual Box get_indexed_char (int) const;
-  virtual int name_to_index (String) const;
-  //virtual unsigned glyph_name_to_charcode (String) const;
+  virtual int name_to_index (std::string) const;
+  //virtual unsigned glyph_name_to_charcode (std::string) const;
   virtual unsigned index_to_charcode (int) const;
   virtual void derived_mark () const;
   virtual SCM sub_fonts () const;
   virtual Real design_size () const;
 };
 
-String get_otf_table (FT_Face face, String tag);
-FT_Face open_ft_face (String str);
+std::string get_otf_table (FT_Face face, std::string tag);
+FT_Face open_ft_face (std::string str);
 
 #endif /* OPEN_TYPE_FONT_HH */