Fixed errors in Catalan translation

[lilypond.git] / flower / string-convert.cc

diff --git a/flower/string-convert.cc b/flower/string-convert.cc
index d46426e8c6fc0271ea9d6e5e36d8eaee39ac79b8..eebcd92708076919e17f874ddab85e8b28474270 100644 (file)
--- a/flower/string-convert.cc
+++ b/flower/string-convert.cc
@@ -43,7 +43,7 @@ String_convert::bin2hex (Byte bin_char)
 }
 
 string
-String_convert::bin2hex (string bin_string)
+String_convert::bin2hex (const string &bin_string)
 {
   string str;
   Byte const *byte = (Byte const *)bin_string.data ();
@@ -56,13 +56,13 @@ String_convert::bin2hex (string bin_string)
 }
 
 int
-String_convert::bin2int (string bin_string)
+String_convert::bin2int (const string &bin_string)
 {
   return bin2unsigned (bin_string);
 }
 
 unsigned
-String_convert::bin2unsigned (string bin_string)
+String_convert::bin2unsigned (const string &bin_string)
 {
   assert (bin_string.length () <= (int)sizeof (unsigned));
 
@@ -76,7 +76,7 @@ String_convert::bin2unsigned (string bin_string)
 }
 
 int
-String_convert::dec2int (string dec_string)
+String_convert::dec2int (const string &dec_string)
 {
   if (!dec_string.length ())
     return 0;
@@ -100,7 +100,7 @@ String_convert::i64_string (I64 i64, char const *fmt)
 }
 // breendet imp from string
 double
-String_convert::dec2double (string dec_string)
+String_convert::dec2double (const string &dec_string)
 {
   if (!dec_string.length ())
     return 0;
@@ -134,7 +134,7 @@ String_convert::hex2bin (string hex_string, string &bin_string_r)
 }
 
 string
-String_convert::hex2bin (string hex_string)
+String_convert::hex2bin (const string &hex_string)
 {
   string str;
 
@@ -158,7 +158,7 @@ String_convert::hex2nibble (Byte byte)
 
 // stupido.  Should use int_string ()
 string
-String_convert::int2dec (int i, int length_i, char ch)
+String_convert::int2dec (int i, size_t length_i, char ch)
 {
   char fill_char = ch;
   if (fill_char)
@@ -168,12 +168,12 @@ String_convert::int2dec (int i, int length_i, char ch)
   string dec_string = to_string (i);
 
   // ugh
-  return to_string (fill_char, length_i - dec_string.length ()) + dec_string;
+  return to_string (fill_char, ssize_t (length_i - dec_string.length ())) + dec_string;
 }
 
 // stupido.  Should use int_string ()
 string
-String_convert::unsigned2hex (unsigned u, ssize length, char fill_char)
+String_convert::unsigned2hex (unsigned u, size_t length, char fill_char)
 {
   string str;
   if (!u)
@@ -189,7 +189,7 @@ String_convert::unsigned2hex (unsigned u, ssize length, char fill_char)
   str += int_string (u, "%x");  // hmm. %lx vs. %x -> portability?
 #endif
 
-  str = to_string (fill_char, length - str.length ()) + str;
+  str = to_string (fill_char, ssize_t (length - str.length ())) + str;
   while ((str.length () > length) && (str[ 0 ] == 'f'))
     str = str.substr (2);
 
@@ -197,7 +197,7 @@ String_convert::unsigned2hex (unsigned u, ssize length, char fill_char)
 }
 
 string
-String_convert::int2hex (int i, int length_i, char fill_char)
+String_convert::int2hex (int i, size_t length_i, char fill_char)
 {
   return unsigned2hex ((unsigned)i, length_i, fill_char);
 }
@@ -344,7 +344,15 @@ String_convert::unsigned_string (unsigned u)
 }
 
 string
-String_convert::pad_to (string s, int n)
+String_convert::unsigned_long_string (unsigned long ul)
+{
+  char s[STRING_BUFFER_LEN];
+  sprintf (s, "%lu", ul);
+  return s;
+}
+
+string
+String_convert::pad_to (const string &s, size_t n)
 {
   return s + string (max (int (n - s.length ()), 0), ' ');
 }
@@ -352,13 +360,13 @@ String_convert::pad_to (string s, int n)
 string
 String_convert::to_upper (string s)
 {
-  return strnupr ((char *)s.c_str (), s.length ());
+  return strnupr (const_cast<char*>(s.c_str ()), s.length ());
 }
 
 string
 String_convert::to_lower (string s)
 {
-  return strnlwr ((char *)s.c_str (), s.length ());
+  return strnlwr (const_cast<char*>(s.c_str ()), s.length ());
 }
 
 string