X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Fstring-convert.hh;h=6b4fba023f4f1ebb23efec44ecf006d471b2c9db;hb=c054eb280fd9953596eb164f67b0f9d5555c5a32;hp=21ec7f189e2dcd7789623ae1f31df4b8af29c7d3;hpb=14c7123e678938b7cc858c9f087788fd6516c1a2;p=lilypond.git diff --git a/flower/include/string-convert.hh b/flower/include/string-convert.hh index 21ec7f189e..6b4fba023f 100644 --- a/flower/include/string-convert.hh +++ b/flower/include/string-convert.hh @@ -19,33 +19,29 @@ class String_convert static int hex2nibble (Byte byte); static Byte nibble2hex_byte (Byte byte); public: - static string pad_to (string s, int length); + static string pad_to (const string &s, size_t length); static string bool_string (bool b); - static string bin2dec (string bin_string); static string bin2hex (Byte bin_char); - static string bin2hex (string bin_string); - static string dec2bin (string str); - static int bin2int (string bin_string); - static unsigned bin2unsigned (string bin_string); + static string bin2hex (const string &bin_string); + static int bin2int (const string &bin_string); + static unsigned bin2unsigned (const string &bin_string); static string char_string (char c, int n); - static int dec2int (string dec_string); - static double dec2double (string dec_string); + static int dec2int (const string &dec_string); + static double dec2double (const string &dec_string); static string double_string (double f, char const *fmt = 0); - static string form_string (char const *format, ...) __attribute__ ((format (printf, 1,2))); + static string form_string (char const *format, ...) __attribute__ ((format (printf, 1, 2))); static string vform_string (char const *format, va_list args); - static int hex2int (string str); - static unsigned hex2unsigned (string str); - static string hex2bin (string str); + static string hex2bin (const string &str); static string int_string (int i, char const *fmt = 0); static string unsigned_string (unsigned); + static string unsigned_long_string (unsigned long); static string long_string (long); - static string int2hex (int i, int length_i, char ch); - static string unsigned2hex (unsigned u, ssize length, char ch); - static string int2dec (int i, int length_i, char ch); + static string int2hex (int i, size_t length_i, char ch); + static string unsigned2hex (unsigned u, size_t length, char ch); + static string int2dec (int i, size_t length_i, char ch); static string rational_string (Rational); static string pointer_string (void const *); static string precision_string (double x, int n); - // static vector split (string str, char c); static string i64_string (I64, char const *fmt = 0); static string to_lower (string s); static string to_upper (string s);