X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fproperty-iterator.hh;h=2da1a159a3c6d30cc3091a83fdbc46f22dd46af7;hb=d1d00ad7111adbd421dd7f1d72863cde14fd7497;hp=9dd3b2cce08abb650bd8cca34278ee5991359e6b;hpb=d9b43b93f2c885409bafdb157138158f65cc49aa;p=lilypond.git

diff --git a/lily/include/property-iterator.hh b/lily/include/property-iterator.hh
index 9dd3b2cce0..2da1a159a3 100644
--- a/lily/include/property-iterator.hh
+++ b/lily/include/property-iterator.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -21,10 +21,11 @@
 class Property_iterator : public Simple_music_iterator
 {
 public:
-  VIRTUAL_COPY_CONS (Music_iterator);
-  static SCM constructor_cxx_function;
-  /* construction */
+  DECLARE_SCHEME_CALLBACK(constructor, ());
+  DECLARE_SCHEME_CALLBACK(once_finalization, (SCM, SCM ));
+
 protected:
+  virtual void do_quit();
   virtual void process (Moment);
 };
 
@@ -37,9 +38,7 @@ protected:
 class Property_unset_iterator : public Simple_music_iterator
 {
 public:
-  VIRTUAL_COPY_CONS (Music_iterator);
-  static SCM constructor_cxx_function;
-  /* construction */
+  DECLARE_SCHEME_CALLBACK(constructor, ());
 protected:
   virtual void process (Moment);
 };
@@ -47,20 +46,18 @@ protected:
 class Push_property_iterator : public Simple_music_iterator
 {
 public:
-  VIRTUAL_COPY_CONS (Music_iterator);
-  static SCM constructor_cxx_function;  
+  DECLARE_SCHEME_CALLBACK(constructor, ());  
+  DECLARE_SCHEME_CALLBACK(once_finalization, (SCM, SCM));
 protected:
-  /* construction */
   virtual void process (Moment);
+  virtual void do_quit();
 };
 
 class Pop_property_iterator : public Simple_music_iterator
 {
 public:
-  static SCM constructor_cxx_function;
-  VIRTUAL_COPY_CONS (Music_iterator);
+  DECLARE_SCHEME_CALLBACK(constructor, ());
 protected:
-  /* construction */
   virtual void process (Moment);
 };