X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie-configuration.cc;h=19a2c68f724ec7c9a40da26540085b30b976c232;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=c415942b5d1c5b18bfa2a899fcd6122c58678b5f;hpb=4bb29573149a0ffa1f881c5e38a0fe68e9e76b67;p=lilypond.git diff --git a/lily/tie-configuration.cc b/lily/tie-configuration.cc index c415942b5d..19a2c68f72 100644 --- a/lily/tie-configuration.cc +++ b/lily/tie-configuration.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2005--2011 Han-Wen Nienhuys + Copyright (C) 2005--2015 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify @@ -102,7 +102,7 @@ Tie_configuration::distance (Tie_configuration const &a, } void -Tie_configuration::add_score (Real s, string desc) +Tie_configuration::add_score (Real s, const string &desc) { assert (!scored_); score_ += s; @@ -136,7 +136,7 @@ Ties_configuration::reset_score () } void -Ties_configuration::add_tie_score (Real s, int i, string desc) +Ties_configuration::add_tie_score (Real s, int i, const string &desc) { assert (!scored_); score_ += s; @@ -150,7 +150,7 @@ Ties_configuration::add_tie_score (Real s, int i, string desc) } void -Ties_configuration::add_score (Real s, string desc) +Ties_configuration::add_score (Real s, const string &desc) { assert (!scored_); score_ += s; @@ -170,7 +170,7 @@ Ties_configuration::complete_tie_card (vsize i) const string s; s += to_string ("%d (%.2f) %c: ", (*this)[i].position_, (*this)[i].delta_y_, ((*this)[i].dir_ == UP ? 'u' : 'd')) - + (*this)[i].card () + (*this).tie_card (i); + + (*this)[i].card () + tie_card (i); /* this is a little awkward, but we must decide where to put