Fix cut&paste code in Phrasing_slur_engraver:: and Slur_engraver::, and fix a bug...

[lilypond.git] / lily / include / time-scaled-music-iterator.hh

diff --git a/lily/include/time-scaled-music-iterator.hh b/lily/include/time-scaled-music-iterator.hh
index 2ddcdf298c2fbb1f8b41bd6f49af134836cf6d4d..e8e9ee186fa96c4ac225f66d920b2ce4d15776ef 100644 (file)
--- a/lily/include/time-scaled-music-iterator.hh
+++ b/lily/include/time-scaled-music-iterator.hh
@@ -1,11 +1,10 @@
-/*   
+/*
   compressed-music-iterator.hh -- declare Time_scaled_music_iterator
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #ifndef Time_scaled_music_ITERATOR_HH
 #define Time_scaled_music_ITERATOR_HH
@@ -14,14 +13,13 @@
 
 class Time_scaled_music_iterator : public Music_wrapper_iterator
 {
-public:  
-  VIRTUAL_COPY_CONS (Music_iterator);
-  static SCM constructor_cxx_function; 
+public:
+  DECLARE_SCHEME_CALLBACK (constructor, ());
   /* construction */
+  DECLARE_CLASSNAME(Time_scaled_music_iterator);
 protected:
   virtual void process (Moment);
 };
 
-
 #endif /* Time_scaled_music_ITERATOR_HH */