small cleanup, doxygen, formatting changes

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

diff --git a/src/support/lstrings.C b/src/support/lstrings.C
index 6be5d94b1265038b22649bc1b421b44f840f82c1..b934e77e654eafdd88d24d38c685408010a2079b 100644 (file)
--- a/src/support/lstrings.C
+++ b/src/support/lstrings.C
@@ -344,6 +344,14 @@ bool contains(string const & a, string const & b)
 }
 
 
+bool contains(string const & a, char b)
+{
+       if (a.empty())
+               return false;
+       return a.find(b) != string::npos;
+}
+
+
 bool contains(char const * a, char const * b)
 {
        Assert(a && b);
@@ -504,6 +512,13 @@ string const strip(string const & a, char c)
        if (i == a.length() - 1) return tmp; // no c's at end of a
        if (i != string::npos) 
                tmp.erase(i + 1, string::npos);
+#if !defined(USE_INCLUDED_STRING) && !defined(STD_STRING_IS_GOOD)
+       /// Needed for broken string::find_last_not_of
+       else if (tmp[0] != c) {
+               if (a.length() == 1) return tmp;
+               tmp.erase(1, string::npos);
+       }
+#endif
        else
                tmp.erase(); // only c in the whole string
        return tmp;