pre-ontgaar mods

diff --git a/flower/source-file.cc b/flower/source-file.cc
index e8d55966f1753c00f0d3cf0d3e10d83d46275819..1598cf1e51179623ca8bf23f6a28fa019e9d2d59 100644 (file)
--- a/flower/source-file.cc
+++ b/flower/source-file.cc
@@ -244,6 +244,6 @@ Source_file::forward_ch_C (int n)
 String
 Source_file::get_str (int n)
 {
-  String str ((Byte const*)forward_ch_C (n), n);
+  String str = String ((Byte const*)forward_ch_C (n), n);
   return str;
 }

diff --git a/lily/lily-version.cc b/lily/lily-version.cc
index bc9c2bd876073e4b7734af036c55b277ed26c254..978e2654f89054483a1e5c55647307a2546b56b0 100644 (file)
--- a/lily/lily-version.cc
+++ b/lily/lily-version.cc
@@ -13,7 +13,7 @@
 String
 version_str ()
 {
-  String str (MAJOR_VERSION "." MINOR_VERSION "."  PATCH_LEVEL);
+  String str = MAJOR_VERSION "." MINOR_VERSION "."  PATCH_LEVEL;
   String mpl ("." MY_PATCH_LEVEL);
   if (mpl != ".")
     str += mpl;

diff --git a/lily/moment.cc b/lily/moment.cc
index d44af366e2c294c8b9401b625eedd12253d248dd..29747441dab2e8799163ee02c6737ec127be6255 100644 (file)
--- a/lily/moment.cc
+++ b/lily/moment.cc
@@ -37,7 +37,7 @@ Moment::print_smob (SCM s, SCM port, scm_print_state *)
   Moment  *r = (Moment *) ly_cdr (s);
      
   scm_puts ("#<Mom ", port);
-  String str (r->str ());
+  String str = r->str ();
   scm_puts ((char *)str.ch_C (), port);
   scm_puts (" >", port);
   

diff --git a/lily/script-column.cc b/lily/script-column.cc
index 33aacb3e5e0c51db3d05936cde40e5d78a146ee6..5556d715201efc1cdbec8b7f52ca4afb38b9e123 100644 (file)
--- a/lily/script-column.cc
+++ b/lily/script-column.cc
@@ -58,7 +58,8 @@ Script_column::before_line_breaking (SCM smob)
 
   Direction d = DOWN;
   do {
-    Link_array<Grob> &arr (arrs[d]);
+    Link_array<Grob> &arr
+      (arrs[d]);
     
     arr.sort (staff_side_compare);
 

diff --git a/lily/tie.cc b/lily/tie.cc
index bcf59d80f1583b9290bb61d4d06ce8290275f05c..14c3d7be5fc2cfcb7ddbc1304d43dc4cdbede50c 100644 (file)
--- a/lily/tie.cc
+++ b/lily/tie.cc
@@ -37,13 +37,13 @@
 
 
 void
-Tie::set_head (Grob*me,Direction d, Item * head_l)
+Tie::set_head (Grob*me,Direction d, Item * h)
 {
   assert (!head (me,d));
-  index_set_cell (me->get_grob_property ("heads"), d, head_l->self_scm ());
+  index_set_cell (me->get_grob_property ("heads"), d, h->self_scm ());
   
-  dynamic_cast<Spanner*> (me)->set_bound (d, head_l);
-  me->add_dependency (head_l);
+  dynamic_cast<Spanner*> (me)->set_bound (d, h);
+  me->add_dependency (h);
 }
 
 void