From bc83724a59b7aa64460dd120a9c684398d59e3de Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 20:05:37 +0000 Subject: [PATCH] lilypond-0.1.44 --- flower/include/string.hh | 5 ----- flower/string-convert.cc | 16 ++++++++-------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/flower/include/string.hh b/flower/include/string.hh index fcec32ae89..613202bb8c 100644 --- a/flower/include/string.hh +++ b/flower/include/string.hh @@ -171,11 +171,6 @@ public: /// the length of the string int length_i () const; - // ***** depreciated - int len () const { - return length_i (); - } - /// convert to an integer int value_i () const; diff --git a/flower/string-convert.cc b/flower/string-convert.cc index 23ab488cf3..659bf76921 100644 --- a/flower/string-convert.cc +++ b/flower/string-convert.cc @@ -275,12 +275,12 @@ String_convert::precision_str (double x, int n) String str = double_str (abs (x), format.ch_C ()); int exp = str.right_str (3).value_i (); - str = str.left_str (str.len () - 4); + str = str.left_str (str.length_i () - 4); - while (str[str.len () - 1] == '0') - str = str.left_str (str.len () - 1); - if (str[str.len () - 1] == '.') - str = str.left_str (str.len () - 1); + while (str[str.length_i () - 1] == '0') + str = str.left_str (str.length_i () - 1); + if (str[str.length_i () - 1] == '.') + str = str.left_str (str.length_i () - 1); if (exp == 0) return (sign (x) > 0 ? str : "-" + str); @@ -289,9 +289,9 @@ String_convert::precision_str (double x, int n) int dot = 1 + exp; if (dot <= 0) str = "0." + String ('0', -dot) + str; - else if (dot >= str.len ()) - str += String ('0', dot - str.len ()); - else if (( dot > 0) && (dot < str.len ())) + else if (dot >= str.length_i ()) + str += String ('0', dot - str.length_i ()); + else if (( dot > 0) && (dot < str.length_i ())) str = str.left_str (dot) + '.' + str.cut (dot, INT_MAX); else assert (0); -- 2.39.5