X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Fstring-convert.hh;h=1277890929f73176253a00fedddc70cf9d09eb86;hb=9e69cb84d6ee5b0a861cd97869b10e3bdf0c833c;hp=198e365b964c950df4daf815f5229cd4a27964d0;hpb=b37e3f652677ae0298423db9fa0e552e5fce0c92;p=lilypond.git

diff --git a/flower/include/string-convert.hh b/flower/include/string-convert.hh
index 198e365b96..1277890929 100644
--- a/flower/include/string-convert.hh
+++ b/flower/include/string-convert.hh
@@ -9,46 +9,46 @@
 #include <cstdarg>
 using namespace std;
 
-#include "std-string.hh"
 #include "flower-proto.hh"
 
-/** The functor std::string_convert handles all conversions to/from std::string
+/** The functor string_convert handles all conversions to/from string
     (some time, anyway).  The class is quite empty from data view.  */
 class String_convert
 {
-  static int hex2bin (std::string hex_string, std::string &bin_string_r);
+  static int hex2bin (string hex_string, string &bin_string_r);
   static int hex2nibble (Byte byte);
   static Byte nibble2hex_byte (Byte byte);
 public:
-  static std::string pad_to (std::string s, int length);
-  static std::string bool_string (bool b);
-  static std::string bin2dec (std::string bin_string);
-  static std::string bin2hex (std::string bin_string);
-  static std::string dec2bin (std::string str);
-  static int bin2int (std::string bin_string);
-  static unsigned bin2unsigned (std::string bin_string);
-  static std::string char_string (char c, int n);
-  static int dec2int (std::string dec_string);
-  static double dec2double (std::string dec_string);
-  static std::string double_string (double f, char const *fmt = 0);
-  static std::string form_string (char const *format, ...);
-  static std::string vform_string (char const *format, va_list args);
-  static int hex2int (std::string str);
-  static unsigned hex2unsigned (std::string str);
-  static std::string hex2bin (std::string str);
-  static std::string int_string (int i, char const *fmt = 0);
-  static std::string long_string (long);
-  static std::string int2hex (int i, int length_i, char ch);
-  static std::string unsigned2hex (unsigned u, ssize length, char ch);
-  static std::string int2dec (int i, int length_i, char ch);
-  static std::string rational_string (Rational);
-  static std::string pointer_string (void const *);
-  static std::string precision_string (double x, int n);
-  static Array<std::string> split (std::string str, char c);
-  static std::string i64_string (I64, char const *fmt = 0);
-  static std::string to_lower (std::string s);
-  static std::string to_upper (std::string s);
-  static std::string reverse (std::string s);
+  static string pad_to (string s, int 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 char_string (char c, int n);
+  static int dec2int (string dec_string);
+  static double dec2double (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 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 int_string (int i, char const *fmt = 0);
+  static string unsigned_string (unsigned);
+  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 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);
+  static string reverse (string s);
 };
 
 #endif // __STRING_CONVERT_HH //