Merge branch 'master' of ssh+git://gpercival@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / lily / slur.cc

diff --git a/lily/slur.cc b/lily/slur.cc
index a87feb68506e5f4643ca4695f14886abebc3c88c..269c6b551b5bf56c3fd42133a8b3c593b14c974b 100644 (file)
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -3,12 +3,12 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1996--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "slur.hh"
-
+#include "grob-info.hh"
 #include "grob-array.hh"
 #include "beam.hh"
 #include "bezier.hh"
@@ -212,7 +212,7 @@ void
 Slur::add_column (Grob *me, Grob *n)
 {
   Pointer_group_interface::add_grob (me, ly_symbol2scm ("note-columns"), n);
-  add_bound_item (dynamic_cast<Spanner *> (me), dynamic_cast<Item *> (n));
+  add_bound_item (dynamic_cast<Spanner *> (me), n);
 }
 
 void
@@ -320,7 +320,7 @@ Slur::outside_slur_callback (SCM grob, SCM offset_scm)
  * Used by Slur_engraver:: and Phrasing_slur_engraver::
  */
 void
-Slur::auxiliary_acknowledge_extra_object (Grob_info info,
+Slur::auxiliary_acknowledge_extra_object (Grob_info const &info,
                                          vector<Grob*> &slurs,
                                          vector<Grob*> &end_slurs)
 {
@@ -357,7 +357,7 @@ Slur::auxiliary_acknowledge_extra_object (Grob_info info,
 }
 
 
-ADD_INTERFACE (Slur, "slur-interface",
+ADD_INTERFACE (Slur,
               
               "A slur",