X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgregorian-ligature.cc;h=5047fa928b9ee22f062105e99c8f442ba6bad21c;hb=cd586e589daa7a550fa39200a78cb2012e853d99;hp=38b1d7a29a0952c576e6b7e11c695d1502d71e56;hpb=c659cb200486c2f908703696a1b2873e78c8160a;p=lilypond.git

diff --git a/lily/gregorian-ligature.cc b/lily/gregorian-ligature.cc
index 38b1d7a29a..5047fa928b 100644
--- a/lily/gregorian-ligature.cc
+++ b/lily/gregorian-ligature.cc
@@ -1,32 +1,31 @@
-/*   
+/*
   gregorian-ligature.cc -- implement Gregorian_ligature
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2003--2004 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;
-  int prefix_set =
-    scm_to_int (primitive->get_property ("prefix-set"));
+  string str;
+  int prefix_set
+    = scm_to_int (primitive->get_property ("prefix-set"));
   check_prefix ("virga", VIRGA, prefix_set, &str);
   check_prefix ("stropha", STROPHA, prefix_set, &str);
   check_prefix ("inclinatum", INCLINATUM, prefix_set, &str);
@@ -48,7 +47,7 @@ Gregorian_ligature::prefixes_to_str (Grob *primitive)
   by code of GregorianLigatureEngraver that is virtually invoked by a
   subclass like VaticanaLigatureEngraver.  The property is lateron
   read by the associated item class, such as VaticanaLigature.--jr
- */
+*/
 ADD_INTERFACE (Gregorian_ligature, "gregorian-ligature-interface",
 	       "A gregorian ligature",
 	       "virga stropha inclinatum auctum descendens ascendens "