Partial fix for @funindex (doesn't break anything).

[lilypond.git] / lily / gregorian-ligature.cc

diff --git a/lily/gregorian-ligature.cc b/lily/gregorian-ligature.cc
index 82a2110bc57041926bdb153e8721f969db63587d..5047fa928b9ee22f062105e99c8f442ba6bad21c 100644 (file)
--- a/lily/gregorian-ligature.cc
+++ b/lily/gregorian-ligature.cc
@@ -3,28 +3,27 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2003--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2003--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "gregorian-ligature.hh"
 
 #include "grob.hh"
-#include "string.hh"
 
-void check_prefix (String name, int mask, int prefix_set, String *str)
+void check_prefix (string name, int mask, int prefix_set, string *str)
 {
   if (prefix_set & mask)
     {
-      if (!str->is_empty ())
+      if (!str->empty ())
        *str += ", ";
       *str += name;
     }
 }
 
-String
+string
 Gregorian_ligature::prefixes_to_str (Grob *primitive)
 {
-  String str;
+  string str;
   int prefix_set
     = scm_to_int (primitive->get_property ("prefix-set"));
   check_prefix ("virga", VIRGA, prefix_set, &str);