Issue 4903/4: Fold Slur_proto_engraver into Slur_engraver

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

diff --git a/lily/include/font-metric.hh b/lily/include/font-metric.hh
index 4d4694cb21edf5abca8c7da11f8a6bf2e9b89711..e385a1e7af7ad603a9bb043b0c7fa4dcb6b9a995 100644 (file)
--- a/lily/include/font-metric.hh
+++ b/lily/include/font-metric.hh
@@ -35,29 +35,29 @@ class Font_metric : public Smob<Font_metric>
 public:
   int print_smob (SCM, scm_print_state *) const;
   SCM mark_smob () const;
-  static const char type_p_name_[];
+  static const char * const type_p_name_;
   virtual ~Font_metric ();
 private:
   DECLARE_CLASSNAME (Font_metric);
 
 public:
   SCM description_;
-  std::string file_name_;
+  string file_name_;
 
-  // Return stencil for given std::string. output_state may be modified to
+  // Return stencil for given string. output_state may be modified to
   // record the font.
   virtual Stencil text_stencil (Output_def *output_state,
-                                const std::string &text, bool music) const;
+                                const string &text, bool music) const;
 
-  virtual std::string font_name () const;
+  virtual string font_name () const;
   virtual size_t count () const;
-  virtual Offset attachment_point (const std::string&) const;
+  virtual Offset attachment_point (const 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 (std::string) const=0;
+  virtual size_t name_to_index (string) const=0;
   virtual size_t index_to_charcode (size_t) const;
   virtual Real design_size () const;
-  virtual Stencil find_by_name (std::string) const;
+  virtual Stencil find_by_name (string) const;
   virtual SCM sub_fonts () const;
   virtual SCM font_file_name () const;