X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fbar-check-iterator.cc;h=f7513b9f6de3c1eeb924f155ffcf0e5fc5fdeca3;hb=7aabfb20c46e0a1de41698ddc6859ccd3a6dea85;hp=eef193136e22d951969c11fa65022a3f0f8487a7;hpb=dd8db61d85d5ca9fa0cf9fa02e3fa1593f712a4e;p=lilypond.git

diff --git a/lily/bar-check-iterator.cc b/lily/bar-check-iterator.cc
index eef193136e..f7513b9f6d 100644
--- a/lily/bar-check-iterator.cc
+++ b/lily/bar-check-iterator.cc
@@ -4,12 +4,12 @@
 
      source file of the GNU LilyPond music typesetter
 
-     (c) 2001--2002  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+     (c) 2001--2003  Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
  */
 
 #include "simple-music-iterator.hh"
-#include "command-request.hh"
+#include "event.hh"
 #include "translator-group.hh"
 
 /*
@@ -22,17 +22,10 @@ public:
   VIRTUAL_COPY_CONS(Bar_check_iterator);
   virtual void process (Moment);
   Bar_check_iterator( );
-  static SCM constructor_cxx_function;
+  DECLARE_SCHEME_CALLBACK(constructor, ());
 };
 
-IMPLEMENT_CTOR_CALLBACK (Bar_check_iterator);
-
-Music * get_barcheck ()
-{
-  Music *bc = new Music;
-  bc->set_mus_property ("iterator-ctor", Bar_check_iterator::constructor_cxx_function);
-  return bc;
-}
+IMPLEMENT_CTOR_CALLBACK(Bar_check_iterator);
 
 Bar_check_iterator::Bar_check_iterator()
 {
@@ -44,7 +37,7 @@ Bar_check_iterator::process (Moment m)
   Simple_music_iterator::process(m);
   if (!m.to_bool ())
     {
-      Translator_group *tr = report_to_l ();
+      Translator_group *tr = report_to ();
 
       SCM mp = tr->get_property ("measurePosition");
       SCM sync= tr->get_property ("barCheckSynchronize");
@@ -55,8 +48,8 @@ Bar_check_iterator::process (Moment m)
       
       if (where->main_part_)
 	{
-	  music_l ()->origin ()->warning (_f ("barcheck failed at: %s", 
-					      where->str ()));
+	  get_music ()->origin ()->warning (_f ("barcheck failed at: %s", 
+					      where->string ()));
 	  if (to_boolean (sync))
 	    {
 	      tr = tr->where_defined (ly_symbol2scm("measurePosition"));