small changes + patch from Dekel

[lyx.git] / src / support / lstrings.h

diff --git a/src/support/lstrings.h b/src/support/lstrings.h
index d718b57243511c8aa934268c7972201b077d2329..bffbc0d865ccd4514300d36ce2bd18752605bc7f 100644 (file)
--- a/src/support/lstrings.h
+++ b/src/support/lstrings.h
@@ -44,9 +44,15 @@ int compare(char const * a, char const * b, unsigned int len)
 ///
 bool isStrInt(string const & str);
 
+/// does the string represent an unsigned integer value ?
+bool isStrUnsignedInt(string const & str);
+
 ///
 int strToInt(string const & str);
 
+/// convert string to an unsigned integer
+unsigned int strToUnsignedInt(string const & str);
+
 ///
 bool isStrDbl(string const & str);
 
@@ -70,7 +76,7 @@ template<typename T>
 inline
 string const tostr(T const & t) 
 {
-       std::ostringstream ostr;
+       ostringstream ostr;
        ostr << t;
        return ostr.str().c_str();
        // We need to use the .c_str since we sometimes are using
@@ -86,7 +92,15 @@ string const tostr(bool const & b)
 {
        return (b ? "true" : "false");
 }
-       
+
+///
+template<>
+inline
+string const tostr(string const & s)
+{
+       return s;
+}
+
 /// Does the string start with this prefix?
 bool prefixIs(string const &, char const *);
 
@@ -127,7 +141,7 @@ bool containsOnly(char const *, char const *);
 bool containsOnly(char const *, string const &);
 
 /// Counts how many of character c there is in a
-unsigned int countChar(string const & a, char c);
+string::size_type countChar(string const & a, char c);
 
 /** Extracts a token from this string at the nth delim.
   Doesn't modify the original string. Similar to strtok.