(do_chroot_jail): paranoia security for webserver

[lilypond.git] / lily / change-iterator.cc

diff --git a/lily/change-iterator.cc b/lily/change-iterator.cc
index aa03614babe8b8afa051086ea1dff54e1b95f6f4..5099f8bdf62ed70dc572021a26e8d6dff622cb78 100644 (file)
--- a/lily/change-iterator.cc
+++ b/lily/change-iterator.cc
@@ -3,16 +3,16 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "change-iterator.hh"
+
 #include "context.hh"
 #include "music.hh"
 #include "warn.hh"
 #include "input.hh"
 
-
 void
 Change_iterator::error (String reason)
 {
@@ -27,7 +27,7 @@ Change_iterator::error (String reason)
    */
   String warn2= "Change_iterator::process (): " 
     + get_outlet ()->context_name () + " = `"
-    + get_outlet ()->id_string_ + "': ";
+    + get_outlet ()->id_string () + "': ";
   warning (warn2);
   get_music ()->origin ()->warning (warn1);
 }
@@ -52,10 +52,10 @@ Change_iterator::process (Moment m)
   while (current && !current->is_alias (to_type))
     {
       last = current;
-      current = current->daddy_context_;
+      current = current->get_parent_context ();
     }
 
-  if (current && current->id_string_ == to_id)
+  if (current && current->id_string () == to_id)
     {
       String msg;
       msg += _ ("Can't switch translators, I'm there already");
@@ -68,8 +68,8 @@ Change_iterator::process (Moment m)
        Context * where = get_outlet ();
        while (!dest && where)
          {
-           dest = where->find_context_below (to_type, to_id);
-           where = where->daddy_context_;
+           dest = find_context_below (where, to_type, to_id);
+           where = where->get_parent_context ();
          }
        
        if (dest)
@@ -88,7 +88,7 @@ Change_iterator::process (Moment m)
          We could change the current translator's id, but that would make 
          errors hard to catch
          
-          last->translator_id_string_  = get_change ()->change_to_id_string_;
+          last->translator_id_string ()  = get_change ()->change_to_id_string ();
        */
        error (_ ("I'm one myself"));
       }