X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Fstring-convert.hh;h=8e1695bd5ceb9d6154fe3d3a5edc5f22e5595a6f;hb=8706e77a804e412e751fdd47385c8ccfdc28e732;hp=4717bfc49bfd71998312e8c3cf9c809f507ac94d;hpb=8347f6f06cd4c56d7a2d2ec482647afaaade1267;p=lilypond.git

diff --git a/flower/include/string-convert.hh b/flower/include/string-convert.hh
index 4717bfc49b..8e1695bd5c 100644
--- a/flower/include/string-convert.hh
+++ b/flower/include/string-convert.hh
@@ -9,8 +9,8 @@
 #include <cstdarg>
 using namespace std;
 
-#include "std-string.hh"
 #include "flower-proto.hh"
+#include "std-string.hh"
 
 /** The functor string_convert handles all conversions to/from string
     (some time, anyway).  The class is quite empty from data view.  */
@@ -20,32 +20,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 (string bin_string);
-  static string dec2bin (string str);
-  static int bin2int (string bin_string);
-  static unsigned bin2unsigned (string bin_string);
+  static string bin2hex (Byte bin_char);
+  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, ...);
+  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<string> 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);