X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fsimultaneous-music-iterator.hh;h=0135a7a191b8e62905e2e7c6f6acdb25cf325f89;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=446e3ae1e54aaf8b51b5e0aa4e42cbed578c8885;hpb=573882a49a89b0047570af080dbece7364a020c5;p=lilypond.git

diff --git a/lily/include/simultaneous-music-iterator.hh b/lily/include/simultaneous-music-iterator.hh
index 446e3ae1e5..0135a7a191 100644
--- a/lily/include/simultaneous-music-iterator.hh
+++ b/lily/include/simultaneous-music-iterator.hh
@@ -1,11 +1,21 @@
 /*
-  simultaneous-music-iterator.hh -- declare Simultaneous_music_iterator
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c)  1997--2003 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 SIMULTANEOUS_MUSIC_ITERATOR_HH
 #define SIMULTANEOUS_MUSIC_ITERATOR_HH
@@ -15,27 +25,24 @@
 class Simultaneous_music_iterator : public Music_iterator
 {
 public:
-  VIRTUAL_COPY_CONS (Music_iterator);
   Simultaneous_music_iterator ();
-  Simultaneous_music_iterator (Simultaneous_music_iterator const&);
-  virtual void derived_substitute (Translator_group*f, Translator_group*t) ;
+  Simultaneous_music_iterator (Simultaneous_music_iterator const &);
+  virtual void derived_substitute (Context *f, Context *t);
   virtual void derived_mark () const;
-  DECLARE_SCHEME_CALLBACK(constructor, ());
-  
+  DECLARE_SCHEME_CALLBACK (constructor, ());
+  DECLARE_CLASSNAME (Simultaneous_music_iterator);
+
   /// make a new context for every child.
-  bool separate_contexts_b_;
+  bool create_separate_contexts_;
 
   virtual void construct_children ();
   virtual Moment pending_moment () const;
-  virtual void do_quit(); 
+  virtual void do_quit ();
   virtual bool ok () const;
-  virtual SCM get_pending_events (Moment)const;
-  virtual void skip (Moment);
   virtual bool run_always () const;
-  
+
 protected:
   virtual void process (Moment);
-  virtual Music_iterator *try_music_in_children (Music *) const;
 
 private:
   SCM children_list_;