Merge branch 'issue4032'

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

diff --git a/lily/include/music-iterator.hh b/lily/include/music-iterator.hh
index e7d1ce2f2627948957d665272c616e0631ee410f..436318bd385dcda8effd8801147c0660c8101825 100644 (file)
--- a/lily/include/music-iterator.hh
+++ b/lily/include/music-iterator.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2014 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
@@ -64,7 +64,7 @@ protected:
   Moment music_length_;
   Moment start_mom_;
 
-  DECLARE_CLASSNAME(Music_iterator);
+  DECLARE_CLASSNAME (Music_iterator);
   DECLARE_SMOBS (Music_iterator);
   Music_iterator (Music_iterator const &);
 
@@ -73,8 +73,8 @@ public:
   Moment music_start_mom () const;
   Music_iterator ();
   void report_event (Music *);
-  Context *get_outlet () const;
-  void set_context (Context *);
+  virtual Context *get_outlet () const;
+  virtual void set_context (Context *);
   static SCM get_static_get_iterator (Music *mus);
   void init_context (Music *, Context *);
   void quit ();
@@ -102,17 +102,16 @@ private:
 
 bool is_child_context (Context *me, Context *child);
 
-#define IMPLEMENT_CTOR_CALLBACK(Class)                                 \
+#define IMPLEMENT_CTOR_CALLBACK(Class)                                  \
   LY_DEFINE_MEMBER_FUNCTION (Class, constructor, \
-                            mangle_cxx_identifier (string (#Class) + "::constructor").c_str(), \
-                            0, 0, 0,                                   \
-                            (),                                        \
-                            "")                                        \
-  {                                                                    \
-    Class *c = (new Class);                                            \
-    return c->unprotect ();                                            \
+                             mangle_cxx_identifier (string (#Class) + "::constructor").c_str(), \
+                             0, 0, 0,                                   \
+                             (),                                        \
+                             "")                                        \
+  {                                                                     \
+    Class *c = (new Class);                                             \
+    return c->unprotect ();                                             \
   }
 
-DECLARE_UNSMOB (Music_iterator, iterator);
 
 #endif // MUSIC_ITERATOR_HH