X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-info.cc;h=ee79e4ec661aebbc5414d4794dc5b8c804385336;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=b710477a8e4073ef21a2bc0812e198fa99ba8ab9;hpb=2f320e9722ec20d6f13ec567d007763cc912c5da;p=lilypond.git diff --git a/lily/grob-info.cc b/lily/grob-info.cc index b710477a8e..ee79e4ec66 100644 --- a/lily/grob-info.cc +++ b/lily/grob-info.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2011 Han-Wen Nienhuys + Copyright (C) 1997--2015 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -50,14 +50,14 @@ Stream_event * Grob_info::event_cause () const { SCM cause = grob_->get_property ("cause"); - return unsmob_stream_event (cause); + return Stream_event::unsmob (cause); } -vector +vector Grob_info::origin_contexts (Translator *end) const { Context *t = origin_trans_->context (); - vector r; + vector r; do { r.push_back (t); @@ -90,11 +90,11 @@ Stream_event * Grob_info::ultimate_event_cause () const { SCM cause = grob_->self_scm (); - while (unsmob_grob (cause)) + while (Grob::is_smob (cause)) { - cause = unsmob_grob (cause)->get_property ("cause"); + cause = Grob::unsmob (cause)->get_property ("cause"); } - return unsmob_stream_event (cause); + return Stream_event::unsmob (cause); } bool