*** empty log message ***

[lilypond.git] / lily / include / grob.hh

diff --git a/lily/include/grob.hh b/lily/include/grob.hh
index c5413c5e74a206327f547f9cdc0e96ceaa8ca928..0652c9f8153761602ade78c9a50b2cf330d1108a 100644 (file)
--- a/lily/include/grob.hh
+++ b/lily/include/grob.hh
@@ -73,7 +73,7 @@ public:
   bool is_live () const;
 
   /* naming. */
-  String name () const;
+  std::string name () const;
 
   /* Properties */
   SCM get_property_alist_chain (SCM) const;
@@ -85,8 +85,8 @@ public:
   void internal_set_object (SCM sym, SCM val);
 
   /* messages */  
-  void warning (String) const;
-  void programming_error (String) const;
+  void warning (std::string) const;
+  void programming_error (std::string) const;
 
 
   /* class hierarchy */