Run grand replace for 2015.

[lilypond.git] / lily / staff-grouper-interface.cc

diff --git a/lily/staff-grouper-interface.cc b/lily/staff-grouper-interface.cc
index 803e1ee82dcfa4958f94b2f2f94efc644b15bafb..6e496ca03ca13e0aad4eb492aa494ed34ab77f5b 100644 (file)
--- a/lily/staff-grouper-interface.cc
+++ b/lily/staff-grouper-interface.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2009--2011 Joe Neeman <joeneeman@gmail.com>
+  Copyright (C) 2009--2015 Joe Neeman <joeneeman@gmail.com>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -32,16 +32,16 @@ Staff_grouper_interface::maybe_pure_within_group (Grob *me, Grob *child, bool pu
 {
   extract_grob_set (me, "elements", elts);
 
-  vector<Grob*>::const_iterator i = find (elts, child);
+  vector<Grob *>::const_iterator i = find (elts, child);
 
   if (i == elts.end ())
     return false;
 
   for (++i; i != elts.end (); ++i)
     if (Page_layout_problem::is_spaceable (*i)
-       && ((pure && !Hara_kiri_group_spanner::request_suicide (*i, start, end))
-           || (!pure && (*i)->is_live ())))
-      return me == unsmob_grob ((*i)->get_object ("staff-grouper"));
+        && ((pure && !Hara_kiri_group_spanner::request_suicide (*i, start, end))
+            || (!pure && (*i)->is_live ())))
+      return me == Grob::unsmob ((*i)->get_object ("staff-grouper"));
 
   // If there was no spaceable, living child after me, I don't
   // count as within the group.
@@ -49,10 +49,10 @@ Staff_grouper_interface::maybe_pure_within_group (Grob *me, Grob *child, bool pu
 }
 
 ADD_INTERFACE (Staff_grouper_interface,
-              "A grob that collects staves together.",
+               "A grob that collects staves together.",
 
-              /* properties */
-              "staff-staff-spacing "
-              "staffgroup-staff-spacing "
-              );
+               /* properties */
+               "staff-staff-spacing "
+               "staffgroup-staff-spacing "
+              );