X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Faxis-group-interface.hh;h=6a90cf5fcb7e4d4163f36ea59c9ac5bf10d88855;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=4098a19514b6efe4f7c04f660d7cd6d06f6e0cfa;hpb=60b7eedd586ad8f52e4aafdf68d600409769edf5;p=lilypond.git diff --git a/lily/include/axis-group-interface.hh b/lily/include/axis-group-interface.hh index 4098a19514..6a90cf5fcb 100644 --- a/lily/include/axis-group-interface.hh +++ b/lily/include/axis-group-interface.hh @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2000--2012 Han-Wen Nienhuys + Copyright (C) 2000--2014 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -49,7 +49,7 @@ class Axis_group_interface 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 *, string); + static SCM internal_calc_pure_relevant_grobs (Grob *, const string&); static Interval relative_group_extent (vector const &list, Grob *common, Axis); static Interval relative_maybe_bound_group_extent (vector const &list, @@ -62,7 +62,7 @@ class Axis_group_interface static Interval part_of_line_pure_height (Grob *me, bool begin, int, int); static Grob *outside_staff_ancestor (Grob *me); - static Skyline_pair skyline_spacing (Grob *me, vector elements); + static Skyline_pair skyline_spacing (Grob *me); static void add_element (Grob *me, Grob *); static void set_axes (Grob *, Axis, Axis); static bool has_axis (Grob *, Axis);