* The grand 2005-2006 replace.

[lilypond.git] / lily / output-property-music-iterator.cc

diff --git a/lily/output-property-music-iterator.cc b/lily/output-property-music-iterator.cc
index 6b7cfca88aacf3b599e09d241542b9fca1863d0c..feffeedd2f61cf6b8e2ec2cdf85c898207558491 100644 (file)
--- a/lily/output-property-music-iterator.cc
+++ b/lily/output-property-music-iterator.cc
@@ -3,18 +3,17 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2003 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2006 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "input.hh"
-#include "music-list.hh"
 #include "simple-music-iterator.hh"
+#include "music.hh"
 
 class Output_property_music_iterator : public Simple_music_iterator
 {
 public:  
-  DECLARE_SCHEME_CALLBACK(constructor, ());
-  /* construction */
+  DECLARE_SCHEME_CALLBACK (constructor, ());
 protected:
   virtual void process (Moment);
 };
@@ -27,8 +26,8 @@ Output_property_music_iterator::process (Moment m)
     {
       bool accepted = try_music (get_music ());
       if (!accepted)
-       get_music ()->origin ()->warning (_f ("Junking event: `%s'",
-                                         classname (get_music ())));
+       get_music ()->origin ()->warning (_f ("junking event: `%s'",
+                                             get_music ()->class_name ()));
     }
   Simple_music_iterator::process (m);
 }