Imported Upstream version 2.19.45

[lilypond.git] / lily / include / change-iterator.hh

diff --git a/lily/include/change-iterator.hh b/lily/include/change-iterator.hh
index 4ab9d99e4a8851199fe51c9dca4a7ca32d8b15b1..1ba16c09071916727300214f903ffbb6d83ea6e5 100644 (file)
--- a/lily/include/change-iterator.hh
+++ b/lily/include/change-iterator.hh
@@ -1,29 +1,41 @@
 /*
-  change-iterator.hh -- declare Change_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--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 CHANGE_ITERATOR_HH
 #define CHANGE_ITERATOR_HH
 
-#include "music-iterator.hh"
+#include "simple-music-iterator.hh"
 
-
-class Change_iterator : public Music_iterator
+class Change_iterator : public Simple_music_iterator
 {
-  void  error (String);
+public:
+  /* constructor is public */
+  virtual void process (Moment);
+  DECLARE_SCHEME_CALLBACK (constructor, ());
+  DECLARE_CLASSNAME (Change_iterator);
 
-protected:
-  virtual void do_process_and_next (Moment);
+  // returns an error message (empty on success)
+  static string change_to (Music_iterator &it,
+                           SCM to_type, const string &to_id);
 
-public:
-  /*
-    CTOR is public
-   */
+private:
+  void error (const string&);
 };
 
 #endif