From: Dan Eble Date: Fri, 24 Jul 2015 17:20:16 +0000 (-0400) Subject: Issue 4527: remove declarations of undefined callbacks X-Git-Tag: release/2.19.25-1~20 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d0699f72d927b07e9a72f1f33ccb4105d51efcf7;p=lilypond.git Issue 4527: remove declarations of undefined callbacks --- diff --git a/lily/include/align-interface.hh b/lily/include/align-interface.hh index f893b75efd..66548410f4 100644 --- a/lily/include/align-interface.hh +++ b/lily/include/align-interface.hh @@ -29,7 +29,6 @@ class Align_interface public: DECLARE_SCHEME_CALLBACK (align_to_minimum_distances, (SCM)); DECLARE_SCHEME_CALLBACK (align_to_ideal_distances, (SCM)); - DECLARE_SCHEME_CALLBACK (full_score_pure_minimum_translations, (SCM)); static void align_elements_to_minimum_distances (Grob *, Axis a); static void align_elements_to_ideal_distances (Grob *); static vector get_minimum_translations (Grob *, vector const &, Axis a); diff --git a/lily/include/axis-group-interface.hh b/lily/include/axis-group-interface.hh index cd16c1e95f..1987d9289b 100644 --- a/lily/include/axis-group-interface.hh +++ b/lily/include/axis-group-interface.hh @@ -46,8 +46,6 @@ class Axis_group_interface DECLARE_SCHEME_CALLBACK (calc_staff_staff_spacing, (SCM)); DECLARE_SCHEME_CALLBACK (calc_pure_staff_staff_spacing, (SCM, SCM, SCM)); DECLARE_SCHEME_CALLBACK (calc_pure_relevant_grobs, (SCM)); - DECLARE_SCHEME_CALLBACK (calc_pure_relevant_items, (SCM)); - DECLARE_SCHEME_CALLBACK (calc_pure_relevant_spanners, (SCM)); DECLARE_SCHEME_CALLBACK (calc_pure_y_common, (SCM)); static SCM internal_calc_pure_relevant_grobs (Grob *, const string&); static Interval relative_group_extent (vector const &list, diff --git a/lily/include/beam.hh b/lily/include/beam.hh index a1b651a357..afa3a805ab 100644 --- a/lily/include/beam.hh +++ b/lily/include/beam.hh @@ -75,7 +75,6 @@ public: DECLARE_SCHEME_CALLBACK (calc_beaming, (SCM)); DECLARE_SCHEME_CALLBACK (calc_stem_shorten, (SCM)); DECLARE_SCHEME_CALLBACK (calc_direction, (SCM)); - DECLARE_SCHEME_CALLBACK (calc_positions, (SCM)); DECLARE_SCHEME_CALLBACK (calc_normal_stems, (SCM)); DECLARE_SCHEME_CALLBACK (set_stem_lengths, (SCM)); DECLARE_SCHEME_CALLBACK (calc_cross_staff, (SCM)); diff --git a/lily/include/break-align-interface.hh b/lily/include/break-align-interface.hh index 55c1e34f97..5eba16efee 100644 --- a/lily/include/break-align-interface.hh +++ b/lily/include/break-align-interface.hh @@ -31,7 +31,6 @@ public: static void add_element (Grob *me, Grob *add); static SCM break_align_order (Item *me); DECLARE_SCHEME_CALLBACK (calc_positioning_done, (SCM element)); - DECLARE_SCHEME_CALLBACK (self_align_callback, (SCM element)); }; struct Break_aligned_interface diff --git a/lily/include/breathing-sign.hh b/lily/include/breathing-sign.hh index c140bfd1b4..5718bf2473 100644 --- a/lily/include/breathing-sign.hh +++ b/lily/include/breathing-sign.hh @@ -21,8 +21,6 @@ class Grob; class Breathing_sign { public: - DECLARE_SCHEME_CALLBACK (print, (SCM)); - DECLARE_SCHEME_CALLBACK (railtracks, (SCM)); DECLARE_SCHEME_CALLBACK (divisio_minima, (SCM)); DECLARE_SCHEME_CALLBACK (divisio_maior, (SCM)); DECLARE_SCHEME_CALLBACK (divisio_maxima, (SCM)); diff --git a/lily/include/hara-kiri-group-spanner.hh b/lily/include/hara-kiri-group-spanner.hh index 41d0c52496..b8ccba5bee 100644 --- a/lily/include/hara-kiri-group-spanner.hh +++ b/lily/include/hara-kiri-group-spanner.hh @@ -31,7 +31,6 @@ public: DECLARE_SCHEME_CALLBACK (calc_skylines, (SCM smob)); DECLARE_SCHEME_CALLBACK (pure_height, (SCM smob, SCM start, SCM end)); DECLARE_SCHEME_CALLBACK (force_hara_kiri_in_y_parent_callback, (SCM)); - DECLARE_SCHEME_CALLBACK (after_line_breaking, (SCM)); DECLARE_GROB_INTERFACE (); static bool request_suicide (Grob *me, int start, int end); static bool request_suicide_alone (Grob *me, int start, int end); diff --git a/lily/include/multi-measure-rest.hh b/lily/include/multi-measure-rest.hh index 0c4dd88b6f..bf3c7083a7 100644 --- a/lily/include/multi-measure-rest.hh +++ b/lily/include/multi-measure-rest.hh @@ -33,7 +33,6 @@ public: static void add_column (Grob *, Item *); DECLARE_SCHEME_CALLBACK (set_spacing_rods, (SCM)); DECLARE_SCHEME_CALLBACK (set_text_rods, (SCM)); - DECLARE_SCHEME_CALLBACK (centered_stencil, (SCM)); static void calculate_spacing_rods (Grob *me, Real length); static Stencil big_rest (Grob *, Real); diff --git a/lily/include/note-head.hh b/lily/include/note-head.hh index 451bdb9f8d..d14fbcfe77 100644 --- a/lily/include/note-head.hh +++ b/lily/include/note-head.hh @@ -27,7 +27,6 @@ class Note_head { public: DECLARE_SCHEME_CALLBACK (print, (SCM)); - DECLARE_SCHEME_CALLBACK (brew_ez_stencil, (SCM)); DECLARE_SCHEME_CALLBACK (stem_x_shift, (SCM)); DECLARE_SCHEME_CALLBACK (calc_stem_attachment, (SCM)); DECLARE_SCHEME_CALLBACK (include_ledger_line_height, (SCM)); diff --git a/lily/include/repeated-music.hh b/lily/include/repeated-music.hh index e0e7cdf376..a346f6a388 100644 --- a/lily/include/repeated-music.hh +++ b/lily/include/repeated-music.hh @@ -62,7 +62,6 @@ public: /* How often do we repeat? */ static int repeat_count (Music *); - DECLARE_SCHEME_CALLBACK (relative_callback, (SCM, SCM)); static Moment body_get_length (Music *); static Moment alternatives_get_length (Music *, bool fold); diff --git a/lily/include/rest.hh b/lily/include/rest.hh index d8ddde60f3..548e031e55 100644 --- a/lily/include/rest.hh +++ b/lily/include/rest.hh @@ -36,7 +36,6 @@ public: static SCM brew_internal_stencil (Grob *, bool); static SCM generic_extent_callback (Grob *, Axis); static void translate (Grob *me, int dy); - DECLARE_SCHEME_CALLBACK (polyphonic_offset_callback, (SCM)); DECLARE_SCHEME_CALLBACK (print, (SCM)); DECLARE_SCHEME_CALLBACK (width, (SCM)); DECLARE_SCHEME_CALLBACK (height, (SCM)); diff --git a/lily/include/side-position-interface.hh b/lily/include/side-position-interface.hh index ac0e2c7c0f..c98189f087 100644 --- a/lily/include/side-position-interface.hh +++ b/lily/include/side-position-interface.hh @@ -32,8 +32,6 @@ struct Side_position_interface { public: - DECLARE_SCHEME_CALLBACK (y_aligned_on_support_refpoints, (SCM element)); - DECLARE_SCHEME_CALLBACK (pure_y_aligned_on_support_refpoints, (SCM element, SCM start, SCM end)); DECLARE_SCHEME_CALLBACK (x_aligned_side, (SCM element, SCM current)); DECLARE_SCHEME_CALLBACK (y_aligned_side, (SCM element, SCM current)); DECLARE_SCHEME_CALLBACK (pure_y_aligned_side, (SCM element, SCM start, SCM end, SCM current)); diff --git a/lily/include/stem.hh b/lily/include/stem.hh index 23ece790d2..0aeb83ee6a 100644 --- a/lily/include/stem.hh +++ b/lily/include/stem.hh @@ -66,7 +66,6 @@ public: DECLARE_SCHEME_CALLBACK (calc_default_direction, (SCM)); DECLARE_SCHEME_CALLBACK (offset_callback, (SCM element)); DECLARE_SCHEME_CALLBACK (calc_direction, (SCM)); - DECLARE_SCHEME_CALLBACK (calc_beaming, (SCM)); DECLARE_SCHEME_CALLBACK (calc_length, (SCM)); DECLARE_SCHEME_CALLBACK (pure_calc_length, (SCM, SCM, SCM)); DECLARE_SCHEME_CALLBACK (calc_stem_begin_position, (SCM)); diff --git a/lily/include/tie.hh b/lily/include/tie.hh index 162637e514..186c0a4d38 100644 --- a/lily/include/tie.hh +++ b/lily/include/tie.hh @@ -38,7 +38,6 @@ public: Tie_details const &); static SCM get_default_control_points (Spanner *); DECLARE_SCHEME_CALLBACK (print, (SCM)); - DECLARE_SCHEME_CALLBACK (set_spacing_rods, (SCM)); DECLARE_SCHEME_CALLBACK (calc_direction, (SCM)); DECLARE_SCHEME_CALLBACK (calc_control_points, (SCM)); static bool less (Grob *s1, Grob *s2);