X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-iterator.cc;h=c076b7ad65867e9e9b3cdb9266ae0748c1dd7586;hb=46cf3e09145fe5b25ac507e071634c0e94896ed6;hp=ecb1172c8acbc8b80238fd60c154fa690ba067f0;hpb=e18531db1f79fb685fbd16d6a2a67bf4b6c09915;p=lilypond.git

diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index ecb1172c8a..c076b7ad65 100644
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -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--2012 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
@@ -17,7 +17,6 @@
   along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #include <cstdio>
 using namespace std;
 
@@ -51,7 +50,7 @@ Music_iterator::~Music_iterator ()
 Context *
 Music_iterator::get_outlet () const
 {
-  return handle_.get_outlet ();
+  return handle_.get_context ();
 }
 
 void
@@ -97,11 +96,11 @@ Music_iterator::get_static_get_iterator (Music *m)
   else
     {
       if (dynamic_cast<Music_wrapper *> (m))
-	p = new Music_wrapper_iterator;
+        p = new Music_wrapper_iterator;
       else if (m->is_mus_type ("event"))
         p = new Event_iterator;
       else
-	p = new Simple_music_iterator;
+        p = new Simple_music_iterator;
 
       iter = p->self_scm ();
       p->unprotect ();
@@ -170,16 +169,16 @@ Music_iterator::descend_to_bottom_context ()
     set_context (get_outlet ()->get_default_interpreter ());
 }
 
-void 
+void
 Music_iterator::report_event (Music *m)
 {
   descend_to_bottom_context ();
 
   /*
-    FIXME: then don't do it. 
+    FIXME: then don't do it.
   */
   if (!m->is_mus_type ("event"))
-    m->origin ()->programming_error (_ ("Sending non-event to context"));
+    m->origin ()->programming_error ("Sending non-event to context");
 
   m->send_to_context (get_outlet ());
 }
@@ -217,7 +216,7 @@ Music_iterator::mark_smob (SCM smob)
 }
 
 int
-Music_iterator::print_smob (SCM sm, SCM port, scm_print_state*)
+Music_iterator::print_smob (SCM sm, SCM port, scm_print_state *)
 {
   char s[1000];