X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur-proto-engraver.cc;h=9d6d1349589cb47087a7f403fdc32a8930d21055;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=fbc5f00b844ae5488b6bfb889548e42c01d143fc;hpb=ffd278ab691a1ada9b0ff0f8fd7548ab791f1647;p=lilypond.git

diff --git a/lily/slur-proto-engraver.cc b/lily/slur-proto-engraver.cc
index fbc5f00b84..9d6d134958 100644
--- a/lily/slur-proto-engraver.cc
+++ b/lily/slur-proto-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2013 Mike Solomon <mike@mikesolomon.org>
+  Copyright (C) 2013--2015 Mike Solomon <mike@mikesolomon.org>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -123,9 +123,9 @@ Slur_proto_engraver::finalize ()
 }
 
 void
-Slur_proto_engraver::create_slur (string spanner_id, Stream_event *ev_cause, Grob *g_cause, Direction dir, bool left_broken)
+Slur_proto_engraver::create_slur (const string &spanner_id, Stream_event *ev_cause, Grob *g_cause, Direction dir, bool left_broken)
 {
-  Grob *ccc = unsmob_grob (get_property ("currentCommandColumn"));
+  Grob *ccc = Grob::unsmob (get_property ("currentCommandColumn"));
   SCM cause = ev_cause ? ev_cause->self_scm () : g_cause->self_scm ();
   Spanner *slur = make_spanner (grob_name_, cause);
   slur->set_property ("spanner-id", ly_string2scm (spanner_id));
@@ -149,7 +149,7 @@ Slur_proto_engraver::create_slur (string spanner_id, Stream_event *ev_cause, Gro
 }
 
 bool
-Slur_proto_engraver::can_create_slur (string id, vsize old_slurs, vsize *event_idx, Stream_event *ev)
+Slur_proto_engraver::can_create_slur (const string &id, vsize old_slurs, vsize *event_idx, Stream_event *ev)
 {
   for (vsize j = slurs_.size (); j--;)
     {
@@ -176,7 +176,7 @@ Slur_proto_engraver::can_create_slur (string id, vsize old_slurs, vsize *event_i
           if (!updown)
             return false;
 
-          Stream_event *c = unsmob_stream_event (slur->get_property ("cause"));
+          Stream_event *c = Stream_event::unsmob (slur->get_property ("cause"));
 
           if (!c)
             {
@@ -266,7 +266,7 @@ Slur_proto_engraver::set_melisma (bool)
 void
 Slur_proto_engraver::stop_translation_timestep ()
 {
-  if (Grob *g = unsmob_grob (get_property ("currentCommandColumn")))
+  if (Grob *g = Grob::unsmob (get_property ("currentCommandColumn")))
     {
       for (vsize i = 0; i < end_slurs_.size (); i++)
         Slur::add_extra_encompass (end_slurs_[i], g);
@@ -280,7 +280,7 @@ Slur_proto_engraver::stop_translation_timestep ()
     {
       Spanner *s = dynamic_cast<Spanner *> (end_slurs_[i]);
       if (!s->get_bound (RIGHT))
-        s->set_bound (RIGHT, unsmob_grob (get_property ("currentMusicalColumn")));
+        s->set_bound (RIGHT, Grob::unsmob (get_property ("currentMusicalColumn")));
       announce_end_grob (s, SCM_EOL);
     }