Run grand replace for 2015.

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

diff --git a/lily/include/simple-music-iterator.hh b/lily/include/simple-music-iterator.hh
index 324c9b952ab95815af37b5136542e33b910b5de7..46551101a90727ca90a0e424da0e8d0d53720035 100644 (file)
--- a/lily/include/simple-music-iterator.hh
+++ b/lily/include/simple-music-iterator.hh
@@ -1,25 +1,43 @@
-/*   
-  simple-music-iterator.hh -- declare Simple_music_iterator
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 2000--2015 Han-Wen Nienhuys <hanwen@xs4all.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 SIMPLE_MUSIC_ITERATOR_HH
 #define SIMPLE_MUSIC_ITERATOR_HH
 
 #include "music-iterator.hh"
 
+/*
+  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);
+  DECLARE_SCHEME_CALLBACK (constructor, ());
   Simple_music_iterator ();
-  Simple_music_iterator (Simple_music_iterator const &);
-
-protected:
-  virtual void do_process_and_next (Moment );
+  virtual void process (Moment);
+  virtual bool ok ()const;
+  virtual Moment pending_moment ()const;
 };
 
 #endif /* SIMPLE_MUSIC_ITERATOR_HH */