Run grand replace for 2015.

[lilypond.git] / lily / include / translator.icc

diff --git a/lily/include/translator.icc b/lily/include/translator.icc
index 7bab0cfa74e848f13568a43d9b58f955ad7303b5..0362b5b6c5971e5a04458464507a70ec9168821f 100644 (file)
--- a/lily/include/translator.icc
+++ b/lily/include/translator.icc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--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
@@ -36,8 +36,8 @@
   static void _ ## T ## _adder ()                                       \
   {                                                                     \
     T *t = new T;                                                       \
-    T::static_description_ = t->static_translator_description ();       \
-    scm_permanent_object (T::static_description_);                      \
+    T::static_description_ =                                            \
+      scm_permanent_object (t->static_translator_description ());       \
     add_translator (t);                                                 \
   }                                                                     \
   SCM T::translator_description () const                                \
@@ -153,7 +153,7 @@ IMPLEMENT_LISTENER (cl, _listen_scm_ ## m)              \
 void                                                    \
 cl::_listen_scm_ ## m (SCM sev)                         \
 {                                                       \
-  Stream_event *ev = unsmob_stream_event (sev);         \
+  Stream_event *ev = Stream_event::unsmob (sev);         \
   protect_event (sev);                                  \
   listen_ ## m (ev);                                    \
 }