From 220f62ed61861265a5b734052806de2d1c656335 Mon Sep 17 00:00:00 2001 From: David Kastrup Date: Sat, 18 Jun 2016 10:13:10 +0200 Subject: [PATCH] Issue 4899/4: Listeners should not be virtual Gregorian_ligature_engraver::listen_pes_or_flexa and Ligature_engraver::listen_pes_or_flexa were accidentally declared virtual, but their registration already caters for what amounts to virtual overrides in effect. --- lily/include/gregorian-ligature-engraver.hh | 2 +- lily/include/ligature-engraver.hh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lily/include/gregorian-ligature-engraver.hh b/lily/include/gregorian-ligature-engraver.hh index e1adc3c643..fcac99c322 100644 --- a/lily/include/gregorian-ligature-engraver.hh +++ b/lily/include/gregorian-ligature-engraver.hh @@ -34,7 +34,7 @@ public: protected: Gregorian_ligature_engraver (); - virtual void listen_pes_or_flexa (Stream_event *ev); + void listen_pes_or_flexa (Stream_event *ev); virtual void build_ligature (Spanner *ligature, vector const &primitives); virtual void transform_heads (Spanner *ligature, diff --git a/lily/include/ligature-engraver.hh b/lily/include/ligature-engraver.hh index 726496e91f..a46c3fe22a 100644 --- a/lily/include/ligature-engraver.hh +++ b/lily/include/ligature-engraver.hh @@ -32,7 +32,7 @@ protected: void acknowledge_rest (Grob_info); void acknowledge_ligature_head (Grob_info); - virtual void listen_ligature (Stream_event *ev); + void listen_ligature (Stream_event *ev); void process_music (); virtual Spanner *create_ligature_spanner () = 0; virtual void typeset_ligature (Spanner *ligature, -- 2.39.5