X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fproperty-iterator.hh;h=2f70d027e01f54e42ccba09f27a757a2e5e877a8;hb=99539bb94e2fef6ed6c053564c40db64f7808f36;hp=08eb9bf54775946b304e3a7b13d8543a138d5675;hpb=cec6dfa6bf0fb931eb7f42b1ee44ca2ec19a9f34;p=lilypond.git

diff --git a/lily/include/property-iterator.hh b/lily/include/property-iterator.hh
index 08eb9bf547..2f70d027e0 100644
--- a/lily/include/property-iterator.hh
+++ b/lily/include/property-iterator.hh
@@ -3,24 +3,59 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #ifndef PROPERTY_ITERATOR_HH
 #define PROPERTY_ITERATOR_HH
 
-#include "music-iterator.hh"
+#include "simple-music-iterator.hh"
+
+/**
+   Iterate a property.
+*/
+class Property_iterator : public Simple_music_iterator
+{
+public:
+  DECLARE_SCHEME_CALLBACK (constructor, ());
+  DECLARE_SCHEME_CALLBACK (once_finalization, (SCM, SCM));
+  DECLARE_CLASSNAME(Property_iterator);
+
+protected:
+  virtual void do_quit ();
+  virtual void process (Moment);
+};
+
+/**
+   Iterate a property.
+*/
+class Property_unset_iterator : public Simple_music_iterator
+{
+public:
+  DECLARE_SCHEME_CALLBACK (constructor, ());
+  DECLARE_CLASSNAME(Property_unset_iterator);
+protected:
+  virtual void process (Moment);
+};
+
+class Push_property_iterator : public Simple_music_iterator
+{
+public:
+  DECLARE_SCHEME_CALLBACK (constructor, ());
+  DECLARE_SCHEME_CALLBACK (once_finalization, (SCM, SCM));
+  DECLARE_CLASSNAME(Push_property_iterator);
+protected:
+  virtual void process (Moment);
+  virtual void do_quit ();
+};
 
-class Property_iterator : public Music_iterator
+class Pop_property_iterator : public Simple_music_iterator
 {
-  Translation_property *property_l_;
-  
 public:
-  DECLARE_MY_RUNTIME_TYPEINFO;
-  Property_iterator (Translation_property* prop_l);
+  DECLARE_SCHEME_CALLBACK (constructor, ());
+  DECLARE_CLASSNAME(Pop_property_iterator);
 protected:
-  virtual void process_and_next (Moment);
+  virtual void process (Moment);
 };
 
 #endif // PROPERTY_ITERATOR_HH