Run grand replace for 2015.

[lilypond.git] / lily / scheme-listener.cc

diff --git a/lily/scheme-listener.cc b/lily/scheme-listener.cc
index fe57c3a7194a1bef701ce94a504014c857c8efb1..9df6960bdf0e2af166ba7e764b28874caf20045b 100644 (file)
--- a/lily/scheme-listener.cc
+++ b/lily/scheme-listener.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2006--2014 Erik Sandberg  <mandolaerik@gmail.com>
+  Copyright (C) 2006--2015 Erik Sandberg  <mandolaerik@gmail.com>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -26,30 +26,25 @@ Scheme_listener::call (SCM ev)
   scm_call_1 (callback_, ev);
 }
 
-IMPLEMENT_SMOBS (Scheme_listener);
-IMPLEMENT_DEFAULT_EQUAL_P (Scheme_listener);
 
 Scheme_listener::Scheme_listener (SCM c)
 {
   callback_ = SCM_EOL;
-  self_scm_ = SCM_EOL;
   smobify_self ();
   callback_ = c;
 }
 
 SCM
-Scheme_listener::mark_smob (SCM obj)
+Scheme_listener::mark_smob ()
 {
-  Scheme_listener *me = (Scheme_listener *) SCM_CELL_WORD_1 (obj);
-  return me->callback_;
+  return callback_;
 }
 
 int
-Scheme_listener::print_smob (SCM obj, SCM p, scm_print_state *)
+Scheme_listener::print_smob (SCM p, scm_print_state *)
 {
-  Scheme_listener *me = (Scheme_listener *) SCM_CELL_WORD_1 (obj);
   scm_puts ("#<Scheme_listener ", p);
-  scm_write (me->callback_, p);
+  scm_write (callback_, p);
   scm_puts (">", p);
   return 1;
 }