Run grand replace for 2015.

[lilypond.git] / lily / global-context.cc

diff --git a/lily/global-context.cc b/lily/global-context.cc
index f0f138f324336c338543c737c924610b0573d0b4..5e940a670d161959d191fbe133f4bbc211b6cbe3 100644 (file)
--- a/lily/global-context.cc
+++ b/lily/global-context.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
@@ -46,7 +46,7 @@ Global_context::Global_context (Output_def *o)
                                  ly_symbol2scm ("Prepare"));
   events_below ()->register_as_listener (event_source_);
 
-  Context_def *globaldef = unsmob_context_def (definition_);
+  Context_def *globaldef = Context_def::unsmob (definition_);
   if (!globaldef)
     programming_error ("no `Global' context found");
   else
@@ -92,8 +92,8 @@ IMPLEMENT_LISTENER (Global_context, prepare);
 void
 Global_context::prepare (SCM sev)
 {
-  Stream_event *ev = unsmob_stream_event (sev);
-  Moment *mom = unsmob_moment (ev->get_property ("moment"));
+  Stream_event *ev = Stream_event::unsmob (sev);
+  Moment *mom = Moment::unsmob (ev->get_property ("moment"));
 
   assert (mom);
 
@@ -114,7 +114,7 @@ Context *
 Global_context::get_score_context () const
 {
   return (scm_is_pair (context_list_))
-         ? unsmob_context (scm_car (context_list_))
+         ? Context::unsmob (scm_car (context_list_))
          : 0;
 }
 
@@ -207,9 +207,3 @@ Global_context::get_default_interpreter (const string &/* context_id */)
   else
     return Context::get_default_interpreter ();
 }
-
-Global_context *
-unsmob_global_context (SCM x)
-{
-  return dynamic_cast<Global_context *> (unsmob_context (x));
-}