X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob.cc;h=0ad308bdb154c1cdf7064c2dd31d7c3611053ede;hb=65e4bcba1fc315549d641d65d269e700bd59c495;hp=bb27448cacc801390eac7e875c3cf59ff7375622;hpb=55a66be7325a00f803b7fd6aaf3dbbbf9b2aeb37;p=lilypond.git

diff --git a/lily/grob.cc b/lily/grob.cc
index bb27448cac..0ad308bdb1 100644
--- a/lily/grob.cc
+++ b/lily/grob.cc
@@ -3,34 +3,26 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "grob.hh"
 
 #include <cstring>
 
-#include "main.hh"
 #include "input-smob.hh"
-#include "warn.hh"
-#include "pointer-group-interface.hh"
-#include "misc.hh"
-#include "paper-score.hh"
-#include "stencil.hh"
-#include "warn.hh"
-#include "system.hh"
+#include "international.hh"
 #include "item.hh"
-#include "stencil.hh"
+#include "main.hh"
 #include "misc.hh"
 #include "music.hh"
-#include "item.hh"
-#include "paper-score.hh"
-#include "ly-smobs.icc"
 #include "output-def.hh"
+#include "pointer-group-interface.hh"
+#include "stencil.hh"
+#include "system.hh"
+#include "warn.hh"
 
-
-
-
+#include "ly-smobs.icc"
 
 Grob *
 Grob::clone (int count) const
@@ -438,7 +430,7 @@ Grob::fixup_refpoint ()
   MESSAGES
 ****************************************************************/
 void
-Grob::warning (String s) const
+Grob::warning (std::string s) const
 {
   SCM cause = self_scm ();
   while (Grob *g = unsmob_grob (cause))
@@ -451,7 +443,7 @@ Grob::warning (String s) const
 }
 
 
-String
+std::string
 Grob::name () const
 {
   SCM meta = get_property ("meta");
@@ -461,7 +453,7 @@ Grob::name () const
 }
 
 void
-Grob::programming_error (String s) const
+Grob::programming_error (std::string s) const
 {
   SCM cause = self_scm ();
   while (Grob *g = unsmob_grob (cause))