X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-info.cc;h=aab0d3cb8d61b352cf381969d479982d7300f08e;hb=77267b700c377fd170abcbf4863728937038eb5e;hp=419b7ff4fcf57a47d165bf20ff7e45186e2b6f79;hpb=f5e923a6ce8cebb7ef893c03ce56aa5e598002c9;p=lilypond.git

diff --git a/lily/grob-info.cc b/lily/grob-info.cc
index 419b7ff4fc..aab0d3cb8d 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--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 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
@@ -29,8 +29,6 @@ Grob_info::Grob_info (Translator *t, Grob *g)
 {
   origin_trans_ = t;
   grob_ = g;
-  start_end_ = START;
-  rerouting_daddy_context_ = 0;
 
   /*
     assert here, because this is easier to debug.
@@ -41,16 +39,14 @@ Grob_info::Grob_info (Translator *t, Grob *g)
 Grob_info::Grob_info ()
 {
   grob_ = 0;
-  start_end_ = START;
   origin_trans_ = 0;
-  rerouting_daddy_context_ = 0;
 }
 
 Stream_event *
 Grob_info::event_cause () const
 {
   SCM cause = grob_->get_property ("cause");
-  return Stream_event::unsmob (cause);
+  return unsmob<Stream_event> (cause);
 }
 
 vector<Context *>
@@ -90,11 +86,11 @@ Stream_event *
 Grob_info::ultimate_event_cause () const
 {
   SCM cause = grob_->self_scm ();
-  while (Grob::is_smob (cause))
+  while (unsmob<Grob> (cause))
     {
-      cause = Grob::unsmob (cause)->get_property ("cause");
+      cause = unsmob<Grob> (cause)->get_property ("cause");
     }
-  return Stream_event::unsmob (cause);
+  return unsmob<Stream_event> (cause);
 }
 
 bool