X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftranslator-dispatch-list.cc;h=10bf06407598f452fffffd5b034caa42f7a2f7dc;hb=01b15679731ac5fcaf8edac1ad5bce6acba10ff0;hp=4298ffedafd9a43be3125c7533347c632fcc81b0;hpb=0387f04497978e37b335a8b99eec905499d6ad0f;p=lilypond.git

diff --git a/lily/translator-dispatch-list.cc b/lily/translator-dispatch-list.cc
index 4298ffedaf..10bf064075 100644
--- a/lily/translator-dispatch-list.cc
+++ b/lily/translator-dispatch-list.cc
@@ -1,15 +1,25 @@
 /*
-  translator-dispatch-list.cc -- implement Translator_dispatch_list
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005--2008 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "translator-dispatch-list.hh"
 #include "engraver.hh"
 
-#include "ly-smobs.icc"
 
 void
 Engraver_dispatch_list::apply (Grob_info gi)
@@ -19,63 +29,45 @@ Engraver_dispatch_list::apply (Grob_info gi)
     {
       Engraver_dispatch_entry const &e (dispatch_entries_[i]);
       if (e.engraver_ == origin)
-	continue;
+        continue;
 
-      (*e.function_) (e.engraver_, gi);
+      (e.engraver_->*e.function_) (gi);
     }
 }
 
 SCM
 Engraver_dispatch_list::create (SCM trans_list,
-				SCM iface_list, Direction start_end)
+                                SCM iface_list, Direction start_end)
 {
   SCM retval = Engraver_dispatch_list ().smobbed_copy ();
-  Engraver_dispatch_list *list = Engraver_dispatch_list::unsmob (retval);
+  Engraver_dispatch_list *list = unsmob<Engraver_dispatch_list> (retval);
 
   Engraver_dispatch_entry entry;
   bool found = false;
   for (SCM s = trans_list; scm_is_pair (s); s = scm_cdr (s))
     {
       Engraver *eng
-	= dynamic_cast<Engraver *> (unsmob_translator (scm_car (s)));
+        = unsmob<Engraver> (scm_car (s));
 
       if (!eng)
-	continue;
+        continue;
 
       entry.engraver_ = eng;
       for (SCM i = iface_list; scm_is_pair (i); i = scm_cdr (i))
-	{
-	  Engraver_void_function_engraver_grob_info ptr
-	    = (start_end == START)
-	    ? eng->get_acknowledger (scm_car (i))
-	    : eng->get_end_acknowledger (scm_car (i));
-	  
-	  if (ptr)
-	    {
-	      entry.function_ = ptr;
-	      list->dispatch_entries_.push_back (entry);
-	      found = true;
-	    }
-	}
+        {
+          Translator::Grob_info_callback ptr
+            = (start_end == START)
+              ? eng->get_acknowledger (scm_car (i))
+              : eng->get_end_acknowledger (scm_car (i));
+
+          if (ptr)
+            {
+              entry.function_ = ptr;
+              list->dispatch_entries_.push_back (entry);
+              found = true;
+            }
+        }
     }
 
   return found ? retval : SCM_EOL;
 }
-
-SCM
-Engraver_dispatch_list::mark_smob (SCM x)
-{
-  (void)x;
-  return SCM_BOOL_F;
-}
-
-int
-Engraver_dispatch_list::print_smob (SCM x, SCM p, scm_print_state *)
-{
-  (void)x;
-  scm_puts ("#<Engraver_dispatch_list>", p);
-  return 1;
-}
-
-IMPLEMENT_SIMPLE_SMOBS (Engraver_dispatch_list);
-IMPLEMENT_DEFAULT_EQUAL_P (Engraver_dispatch_list);