(LY_DEFINE): remove Protected_scm global variable.

[lilypond.git] / lily / item.cc

diff --git a/lily/item.cc b/lily/item.cc
index b12a801571d3d13680e8736f41eb3d595441a5ef..32882aac71303f656978bb72eeee7863529304d2 100644 (file)
--- a/lily/item.cc
+++ b/lily/item.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "item.hh"
@@ -39,7 +39,7 @@ Item::Item (Item const &s, int copy_count)
 bool
 Item::is_breakable (Grob *me)
 {
-  if (me->original_)
+  if (me->original ())
     return false;
 
   if (!dynamic_cast<Item *> (me))
@@ -73,7 +73,7 @@ Item::copy_breakable_items ()
     {
       Grob *dolly = clone (count++);
       Item *item = dynamic_cast<Item *> (dolly);
-      pscore_->root_system ()->typeset_grob (item);
+      get_root_system (this)->typeset_grob (item);
       new_copies[i] = item;
     }
   while (flip (&i) != LEFT);
@@ -130,9 +130,9 @@ Item::find_prebroken_piece (Direction d) const
 Direction
 Item::break_status_dir () const
 {
-  if (original_)
+  if (original ())
     {
-      Item *i = dynamic_cast<Item *> (original_);
+      Item *i = dynamic_cast<Item *> (original ());
 
       return (i->broken_to_drul_[LEFT] == this) ? LEFT : RIGHT;
     }