X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-iterator.cc;h=e6fbf64304f0b1329ffcc96f90c4087838674877;hb=4ebb61bb6f16135ecbe329c5acb2f88969981a91;hp=ce0bf4140e8b0a00b9a78b1ede73431d5fac55a4;hpb=28976d28a04cfb9abe97af7214d7dce11f732604;p=lilypond.git

diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index ce0bf4140e..e6fbf64304 100644
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -9,10 +9,12 @@
 /*
   UGH. too many includes.
  */
-#include <stdio.h>
 
-#include "warn.hh"
 #include "music-iterator.hh"
+
+#include <cstdio>
+
+#include "warn.hh"
 #include "context.hh"
 #include "music-wrapper.hh"
 #include "music-wrapper-iterator.hh"
@@ -42,9 +44,9 @@ Music_iterator::get_outlet () const
 }
 
 void
-Music_iterator::set_translator (Context *trans)
+Music_iterator::set_context (Context *trans)
 {
-  handle_.set_translator (trans);
+  handle_.set_context (trans);
 }
 
 void
@@ -74,11 +76,11 @@ Music_iterator::ok () const
 SCM
 Music_iterator::get_static_get_iterator (Music *m)
 {
-  Music_iterator * p =0;
+  Music_iterator * p = 0;
 
   SCM ctor = m->get_property ("iterator-ctor") ;
   SCM iter = SCM_EOL;
-  if (is_procedure (ctor))
+  if (ly_c_procedure_p (ctor))
     {
       iter = scm_call_0 (ctor);
       p = unsmob_iterator (iter);
@@ -121,14 +123,14 @@ Music_iterator::init_translator (Music *m, Context *report)
   music_ = m;
   assert (m);
   if (! get_outlet ())
-    set_translator (report);
+    set_context (report);
 }
 
 void
 Music_iterator::substitute_outlet (Context *f, Context *t)
 {
   if (get_outlet () == f)
-    set_translator (t);
+    set_context (t);
   derived_substitute (f,t);
 }
 
@@ -243,7 +245,7 @@ is_child_context (Context *me, Context *child)
 {
   while (child && child != me)
     {
-      child = child->daddy_context_;
+      child = child->get_parent_context ();
     }
   
   return child == me;
@@ -258,5 +260,5 @@ Music_iterator::descend_to_child (Context * child_report)
 {
   Context * me_report = get_outlet ();
   if (is_child_context (me_report, child_report))
-    set_translator (child_report);
+    set_context (child_report);
 }