From cc1ddd780681ecb659d5c8a5a5de157d3eb370e0 Mon Sep 17 00:00:00 2001 From: David Kastrup Date: Sun, 5 Jun 2016 23:09:33 +0200 Subject: [PATCH] Issue 4887: Remove delegating listener stubs ADD_LISTENER can delegate directly to base class listeners. --- lily/auto-beam-engraver.cc | 11 ++--------- lily/kievan-ligature-engraver.cc | 9 +-------- lily/mensural-ligature-engraver.cc | 9 +-------- lily/phrasing-slur-engraver.cc | 9 +-------- lily/slur-engraver.cc | 20 ++------------------ lily/vaticana-ligature-engraver.cc | 18 ++---------------- 6 files changed, 9 insertions(+), 67 deletions(-) diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc index 9e4a1ac28c..a7a92d9d6d 100644 --- a/lily/auto-beam-engraver.cc +++ b/lily/auto-beam-engraver.cc @@ -580,8 +580,7 @@ ADD_TRANSLATOR (Auto_beam_engraver, class Grace_auto_beam_engraver : public Auto_beam_engraver { TRANSLATOR_DECLARATIONS (Grace_auto_beam_engraver); - TRANSLATOR_INHERIT (Auto_beam_engraver) - void listen_beam_forbid (Stream_event *); + TRANSLATOR_INHERIT (Auto_beam_engraver); private: Moment last_grace_start_; // Full starting time of last grace group @@ -598,12 +597,6 @@ Grace_auto_beam_engraver::Grace_auto_beam_engraver () // not considered. } -void -Grace_auto_beam_engraver::listen_beam_forbid (Stream_event *ev) -{ - Auto_beam_engraver::listen_beam_forbid (ev); -} - bool Grace_auto_beam_engraver::is_same_grace_state (Moment, Moment) { @@ -646,7 +639,7 @@ Grace_auto_beam_engraver::test_moment (Direction dir, Moment test_mom, Moment) void Grace_auto_beam_engraver::boot () { - ADD_LISTENER (Grace_auto_beam_engraver, beam_forbid); + ADD_LISTENER (Auto_beam_engraver, beam_forbid); ADD_ACKNOWLEDGER (Auto_beam_engraver, stem); ADD_ACKNOWLEDGER (Auto_beam_engraver, bar_line); ADD_ACKNOWLEDGER (Auto_beam_engraver, beam); diff --git a/lily/kievan-ligature-engraver.cc b/lily/kievan-ligature-engraver.cc index f5de30f9b9..fd96d0f99a 100644 --- a/lily/kievan-ligature-engraver.cc +++ b/lily/kievan-ligature-engraver.cc @@ -36,7 +36,6 @@ protected: virtual Spanner *create_ligature_spanner (); virtual void build_ligature (Spanner *ligature, vector const &primitives); - void listen_ligature (Stream_event *); public: TRANSLATOR_DECLARATIONS (Kievan_ligature_engraver); @@ -46,12 +45,6 @@ private: void fold_up_primitives (vector const &primitives, Real padding, Real &min_length); }; -void -Kievan_ligature_engraver::listen_ligature (Stream_event *ev) -{ - Ligature_engraver::listen_ligature (ev); -} - Kievan_ligature_engraver::Kievan_ligature_engraver () { @@ -139,7 +132,7 @@ Kievan_ligature_engraver::build_ligature (Spanner *ligature, void Kievan_ligature_engraver::boot () { - ADD_LISTENER (Kievan_ligature_engraver, ligature); + ADD_LISTENER (Ligature_engraver, ligature); ADD_ACKNOWLEDGER (Ligature_engraver, rest); ADD_ACKNOWLEDGER (Ligature_engraver, ligature_head); } diff --git a/lily/mensural-ligature-engraver.cc b/lily/mensural-ligature-engraver.cc index adff282c1b..41652a1006 100644 --- a/lily/mensural-ligature-engraver.cc +++ b/lily/mensural-ligature-engraver.cc @@ -59,7 +59,6 @@ protected: virtual Spanner *create_ligature_spanner (); virtual void build_ligature (Spanner *ligature, vector const &primitives); - void listen_ligature (Stream_event *); public: TRANSLATOR_DECLARATIONS (Mensural_ligature_engraver); @@ -74,12 +73,6 @@ private: Real &min_length); }; -void -Mensural_ligature_engraver::listen_ligature (Stream_event *ev) -{ - Ligature_engraver::listen_ligature (ev); -} - Mensural_ligature_engraver::Mensural_ligature_engraver () { brew_ligature_primitive_proc @@ -499,7 +492,7 @@ Mensural_ligature_engraver::build_ligature (Spanner *ligature, void Mensural_ligature_engraver::boot () { - ADD_LISTENER (Mensural_ligature_engraver, ligature); + ADD_LISTENER (Ligature_engraver, ligature); ADD_ACKNOWLEDGER (Ligature_engraver, rest); ADD_ACKNOWLEDGER (Ligature_engraver, ligature_head); } diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc index c53d242c8c..2753707f29 100644 --- a/lily/phrasing-slur-engraver.cc +++ b/lily/phrasing-slur-engraver.cc @@ -35,7 +35,6 @@ class Phrasing_slur_engraver : public Slur_proto_engraver { protected: void listen_phrasing_slur (Stream_event *); - void listen_note (Stream_event *); void acknowledge_slur (Grob_info); public: @@ -62,12 +61,6 @@ Phrasing_slur_engraver::listen_phrasing_slur (Stream_event *ev) Slur_proto_engraver::listen_slur (ev); } -void -Phrasing_slur_engraver::listen_note (Stream_event *ev) -{ - Slur_proto_engraver::listen_note (ev); -} - void Phrasing_slur_engraver::acknowledge_slur (Grob_info info) { @@ -79,7 +72,7 @@ void Phrasing_slur_engraver::boot () { ADD_LISTENER (Phrasing_slur_engraver, phrasing_slur); - ADD_LISTENER (Phrasing_slur_engraver, note); + ADD_LISTENER (Slur_proto_engraver, note); ADD_ACKNOWLEDGER (Slur_proto_engraver, inline_accidental); ADD_ACKNOWLEDGER (Slur_proto_engraver, fingering) ADD_ACKNOWLEDGER (Slur_proto_engraver, note_column); diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc index f8b0465885..2ea4595fc1 100644 --- a/lily/slur-engraver.cc +++ b/lily/slur-engraver.cc @@ -35,10 +35,6 @@ class Slur_engraver : public Slur_proto_engraver { virtual void set_melisma (bool); -protected: - void listen_slur (Stream_event *); - void listen_note (Stream_event *); - public: SCM event_symbol (); TRANSLATOR_DECLARATIONS (Slur_engraver); @@ -57,18 +53,6 @@ Slur_engraver::event_symbol () return ly_symbol2scm ("slur-event"); } -void -Slur_engraver::listen_slur (Stream_event *ev) -{ - Slur_proto_engraver::listen_slur (ev); -} - -void -Slur_engraver::listen_note (Stream_event *ev) -{ - Slur_proto_engraver::listen_note (ev); -} - void Slur_engraver::set_melisma (bool m) { @@ -78,8 +62,8 @@ Slur_engraver::set_melisma (bool m) void Slur_engraver::boot () { - ADD_LISTENER (Slur_engraver, slur); - ADD_LISTENER (Slur_engraver, note); + ADD_LISTENER (Slur_proto_engraver, slur); + ADD_LISTENER (Slur_proto_engraver, note); ADD_ACKNOWLEDGER (Slur_proto_engraver, inline_accidental); ADD_ACKNOWLEDGER (Slur_proto_engraver, fingering); ADD_ACKNOWLEDGER (Slur_proto_engraver, note_column); diff --git a/lily/vaticana-ligature-engraver.cc b/lily/vaticana-ligature-engraver.cc index ce3929d9f9..0cf4d6f2a6 100644 --- a/lily/vaticana-ligature-engraver.cc +++ b/lily/vaticana-ligature-engraver.cc @@ -82,22 +82,8 @@ protected: virtual Spanner *create_ligature_spanner (); virtual void transform_heads (Spanner *ligature, vector const &primitives); - void listen_pes_or_flexa (Stream_event *); - void listen_ligature (Stream_event *); }; -void -Vaticana_ligature_engraver::listen_pes_or_flexa (Stream_event *ev) -{ - Gregorian_ligature_engraver::listen_pes_or_flexa (ev); -} - -void -Vaticana_ligature_engraver::listen_ligature (Stream_event *ev) -{ - Ligature_engraver::listen_ligature (ev); -} - Vaticana_ligature_engraver::Vaticana_ligature_engraver () { brew_ligature_primitive_proc @@ -742,8 +728,8 @@ Vaticana_ligature_engraver::transform_heads (Spanner *ligature, void Vaticana_ligature_engraver::boot () { - ADD_LISTENER (Vaticana_ligature_engraver, pes_or_flexa); - ADD_LISTENER (Vaticana_ligature_engraver, ligature); + ADD_LISTENER (Gregorian_ligature_engraver, pes_or_flexa); + ADD_LISTENER (Ligature_engraver, ligature); ADD_ACKNOWLEDGER (Ligature_engraver, rest); ADD_ACKNOWLEDGER (Ligature_engraver, ligature_head); } -- 2.39.5