X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fproperty-iterator.hh;h=52fead07734b9abeb5315bbf30ec4e76b0f03c59;hb=99b6f3aa3558b01c9d4158b19a1f1794c534f89c;hp=66c7143656c65092f9260591c7efe1b556a24484;hpb=08c8760ee53ee597eaf6ac24dd783af6938d632d;p=lilypond.git

diff --git a/lily/include/property-iterator.hh b/lily/include/property-iterator.hh
index 66c7143656..52fead0773 100644
--- a/lily/include/property-iterator.hh
+++ b/lily/include/property-iterator.hh
@@ -1,47 +1,72 @@
 /*
-  property-iterator.hh -- declare Property_iterator
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-*/
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
 
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #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, SCM));
+  DECLARE_CLASSNAME (Property_iterator);
 
+protected:
+  virtual void do_quit ();
+  virtual void process (Moment);
+};
 
 /**
-  Iterate a property.  
- */
-class Property_iterator : public Music_iterator
+   Iterate a property.
+*/
+class Property_unset_iterator : public Simple_music_iterator
 {
 public:
-  VIRTUAL_COPY_CONS (Music_iterator);
-  // construction  
+  DECLARE_SCHEME_CALLBACK (constructor, ());
+  DECLARE_CLASSNAME (Property_unset_iterator);
 protected:
-  virtual void do_process_and_next (Moment);
+  virtual void process (Moment);
 };
 
-class Push_property_iterator : public Music_iterator
+class Push_property_iterator : public Simple_music_iterator
 {
 public:
-  VIRTUAL_COPY_CONS (Music_iterator);
+  DECLARE_SCHEME_CALLBACK (constructor, ());
+  DECLARE_SCHEME_CALLBACK (once_finalization, (SCM, SCM));
+  DECLARE_CLASSNAME (Push_property_iterator);
 protected:
-  virtual void do_process_and_next (Moment);
+  virtual void process (Moment);
+  virtual void do_quit ();
 };
 
-class Pop_property_iterator : public Music_iterator
+class Pop_property_iterator : public Simple_music_iterator
 {
 public:
-  VIRTUAL_COPY_CONS (Music_iterator);
+  DECLARE_SCHEME_CALLBACK (constructor, ());
+  DECLARE_CLASSNAME (Pop_property_iterator);
 protected:
-  virtual void do_process_and_next (Moment);
+  virtual void process (Moment);
 };
 
-
 #endif // PROPERTY_ITERATOR_HH