Add a bunch of c_str() for string stream uses; remove lyxfunc symbol-insert.

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

diff --git a/src/support/lstrings.C b/src/support/lstrings.C
index 3d040d78f97d3bfd54dbd44615afdb575540244b..547d0790aa234b5876a600fffa0b6cde410fc414 100644 (file)
--- a/src/support/lstrings.C
+++ b/src/support/lstrings.C
@@ -32,7 +32,8 @@ using std::transform;
 using std::tolower;
 using std::toupper;
 #endif
-       
+
+
 int compare_no_case(string const & s, string const & s2)
 {
        // ANSI C
@@ -58,7 +59,6 @@ int compare_no_case(string const & s, string const & s2)
 
 int compare_no_case(string const & s, string const & s2, unsigned int len)
 {
-//#warning verify this func please
        string::const_iterator p = s.begin();
        string::const_iterator p2 = s2.begin();
        unsigned int i = 0;
@@ -84,11 +84,11 @@ bool isStrInt(string const & str)
        if (str.empty()) return false;
        
        // Remove leading and trailing white space chars.
-       string tmpstr = frontStrip(strip(str, ' '), ' ');
+       string const tmpstr = frontStrip(strip(str, ' '), ' ');
        if (tmpstr.empty()) return false;
        
        string::const_iterator cit = tmpstr.begin();
-       if ( (*cit) == '-') ++cit;
+       if ((*cit) == '-') ++cit;
        string::const_iterator end = tmpstr.end();
        for (; cit != end; ++cit) {
                if (!isdigit((*cit))) return false;
@@ -101,9 +101,9 @@ int strToInt(string const & str)
 {
        if (isStrInt(str)) {
                // Remove leading and trailing white space chars.
-               string tmpstr = frontStrip(strip(str, ' '), ' ');
+               string const tmpstr = frontStrip(strip(str, ' '), ' ');
                // Do the conversion proper.
-               return atoi(tmpstr.c_str());
+               return lyx::atoi(tmpstr);
        } else {
                return 0;
        }
@@ -115,13 +115,13 @@ bool isStrDbl(string const & str)
        if (str.empty()) return false;
        
        // Remove leading and trailing white space chars.
-       string tmpstr = frontStrip(strip(str, ' '), ' ');
+       string const tmpstr = frontStrip(strip(str, ' '), ' ');
        if (tmpstr.empty()) return false;
        //      if (1 < tmpstr.count('.')) return false;
 
        string::const_iterator cit = tmpstr.begin();
        bool found_dot(false);
-       if ( (*cit) == '-') ++cit;
+       if ((*cit) == '-') ++cit;
        string::const_iterator end = tmpstr.end();
        for (; cit != end; ++cit) {
                if (!isdigit((*cit))
@@ -144,9 +144,9 @@ double strToDbl(string const & str)
 {
        if (isStrDbl(str)) {
                // Remove leading and trailing white space chars.
-               string tmpstr = frontStrip(strip(str, ' '), ' ');
+               string const tmpstr = frontStrip(strip(str, ' '), ' ');
                // Do the conversion proper.
-               return atof(tmpstr.c_str());
+               return ::atof(tmpstr.c_str());
        } else {
                return 0.0;
        }
@@ -155,29 +155,30 @@ double strToDbl(string const & str)
 
 char lowercase(char c) 
 { 
-       return tolower(c); 
+       return char( tolower(c) ); 
 }
 
 
 char uppercase(char c) 
 { 
-       return toupper(c); 
+       return char( toupper(c) ); 
 }
 
 
 string const lowercase(string const & a)
 {
        string tmp(a);
-//#ifdef __GLIBCPP__
+#if 1
        string::iterator result = tmp.begin();
        string::iterator end = tmp.end();
        for (string::iterator first = tmp.begin();
             first != end; ++first, ++result) {
                *result = lowercase(*first);
        }
-//#else
-//     transform(tmp.begin(), tmp.end(), tmp.begin(), tolower);
-//#endif
+#else
+       // We want to use this one. (Lgb)
+       transform(tmp.begin(), tmp.end(), tmp.begin(), tolower);
+#endif
        return tmp;
 }
 
@@ -185,16 +186,17 @@ string const lowercase(string const & a)
 string const uppercase(string const & a)
 {
        string tmp(a);
-//#ifdef __GLIBCPP__
+#if 1
        string::iterator result = tmp.begin();
        string::iterator end = tmp.end();
        for (string::iterator first = tmp.begin();
             first != end; ++first, ++result) {
                *result = uppercase(*first);
        }
-//#else
-//     transform(tmp.begin(), tmp.end(), tmp.begin(), toupper);
-//#endif
+#else
+       // We want to use this one. (Lgb)
+       transform(tmp.begin(), tmp.end(), tmp.begin(), toupper);
+#endif
        return tmp;
 }
 
@@ -203,8 +205,10 @@ bool prefixIs(string const & a, char const * pre)
 {
        Assert(pre);
        
-       unsigned int l = strlen(pre);
-       if (l > a.length() || a.empty())
+       size_t const l = strlen(pre);
+       string::size_type const alen = a.length();
+       
+       if (l > alen || a.empty())
                return false;
        else {
 #if !defined(USE_INCLUDED_STRING) && !defined(STD_STRING_IS_GOOD)
@@ -221,6 +225,23 @@ bool prefixIs(string const & a, char const * pre)
 }
 
 
+bool prefixIs(string const & a, string const & pre)
+{
+       string::size_type const prelen = pre.length();
+       string::size_type const alen = a.length();
+       
+       if (prelen < alen || a.empty())
+               return false;
+       else {
+#if !defined(USE_INCLUDED_STRING) && !defined(STD_STRING_IS_GOOD)
+               return ::strncmp(a.c_str(), pre.c_str(), prelen) == 0;
+#else
+               return a.compare(0, prelen, pre) == 0;
+#endif
+       }
+}
+
+
 bool suffixIs(string const & a, char c)
 {
        if (a.empty()) return false;
@@ -232,7 +253,7 @@ bool suffixIs(string const & a, char const * suf)
 {
        Assert(suf);
        
-       unsigned int const suflen = strlen(suf);
+       size_t const suflen = strlen(suf);
        if (suflen > a.length())
                return false;
        else {
@@ -251,22 +272,37 @@ bool suffixIs(string const & a, char const * suf)
 }
 
 
+bool suffixIs(string const & a, string const & suf)
+{
+       string::size_type const suflen = suf.length();
+       string::size_type const alen = a.length();
+       
+       if (suflen > alen) {
+               return false;
+       } else {
+#if !defined(USE_INCLUDED_STRING) && !defined(STD_STRING_IS_GOOD)
+               string tmp(a, alen - suflen);
+               return ::strncmp(tmp.c_str(), suf.c_str(), suflen) == 0;
+#else
+               return a.compare(alen - suflen, suflen, suf) == 0;
+#endif
+       }
+}
+
+
 bool contains(char const * a, string const & b)
 {
        Assert(a);
-       
-       if (!*a || b.empty()) return false;
-       return strstr(a, b.c_str()) != 0;
+       string const at(a);
+       return contains(at, b);
 }
 
 
 bool contains(string const & a, char const * b)
 {
        Assert(b);
-       
-       if (a.empty())
-               return false;
-       return a.find(b) != string::npos;
+       string const bt(b);
+       return contains(a, bt);
 }
 
 
@@ -281,9 +317,9 @@ bool contains(string const & a, string const & b)
 bool contains(char const * a, char const * b)
 {
        Assert(a && b);
-       
-       if (!*a || !*b) return false;
-       return strstr(a, b) != 0;
+       string const at(a);
+       string const bt(b);
+       return contains(at, bt);
 }
 
 
@@ -317,7 +353,7 @@ bool containsOnly(char const * s, string const & cset)
 }
 
 
-unsigned int countChar(string const & a, char c)
+string::size_type countChar(string const & a, char c)
 {
 #ifdef HAVE_STD_COUNT
        return count(a.begin(), a.end(), c);
@@ -391,7 +427,7 @@ string const subst(string const & a, char oldchar, char newchar)
        string tmp(a);
        string::iterator lit = tmp.begin();
        string::iterator end = tmp.end();
-       for(; lit != end; ++lit)
+       for (; lit != end; ++lit)
                if ((*lit) == oldchar)
                        (*lit) = newchar;
        return tmp;
@@ -405,7 +441,22 @@ string const subst(string const & a,
        
        string lstr(a);
        string::size_type i = 0;
-       int olen = strlen(oldstr);
+       string::size_type olen = strlen(oldstr);
+       while((i = lstr.find(oldstr, i)) != string::npos) {
+               lstr.replace(i, olen, newstr);
+               i += newstr.length(); // We need to be sure that we dont
+               // use the same i over and over again.
+       }
+       return lstr;
+}
+
+
+string const subst(string const & a,
+                  string const & oldstr, string const & newstr)
+{
+       string lstr(a);
+       string::size_type i = 0;
+       string::size_type const olen = oldstr.length();
        while((i = lstr.find(oldstr, i)) != string::npos) {
                lstr.replace(i, olen, newstr);
                i += newstr.length(); // We need to be sure that we dont