X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fsimple-music-iterator.hh;h=10d8e4690387f7e9df8533912c04d9e28d51b1d9;hb=9ae52034113dcfbbc98fd7a0f8075ca3ea2cf3c9;hp=9f6348e00a28e5d2771e6306cb8b5acf2dcbf3fb;hpb=5b6181075e3615dce049711973d3cd5caa60e5db;p=lilypond.git

diff --git a/lily/include/simple-music-iterator.hh b/lily/include/simple-music-iterator.hh
index 9f6348e00a..10d8e46903 100644
--- a/lily/include/simple-music-iterator.hh
+++ b/lily/include/simple-music-iterator.hh
@@ -1,10 +1,10 @@
-/*   
+/*
   simple-music-iterator.hh -- declare Simple_music_iterator
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
- */
+
+  (c) 2000--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #ifndef SIMPLE_MUSIC_ITERATOR_HH
 #define SIMPLE_MUSIC_ITERATOR_HH
@@ -14,22 +14,19 @@
 /*
   Iterator for atomic music objects: events are generated at the
   beginning and at the end of the music.
-  
- */
+*/
 class Simple_music_iterator : public Music_iterator
 {
 protected:
+  DECLARE_CLASSNAME(Simple_music_iterator);
 
   Moment last_processed_mom_;
 public:
-  VIRTUAL_COPY_CONS (Music_iterator);
-  static SCM constructor_cxx_function; 
+  DECLARE_SCHEME_CALLBACK (constructor, ());
   Simple_music_iterator ();
-  Simple_music_iterator (Simple_music_iterator const &);
   virtual void process (Moment);
   virtual bool ok ()const;
   virtual Moment pending_moment ()const;
-  virtual void skip (Moment);
 };
 
 #endif /* SIMPLE_MUSIC_ITERATOR_HH */