* lyxfunctional.h: delete compare_memfun and helper classes

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

diff --git a/src/support/lstrings.C b/src/support/lstrings.C
index 17b55e00dcaf7c94daf22d2e7aa24aad6be53c1b..9910d5400773e6108c693221e5ec77f769d03105 100644 (file)
--- a/src/support/lstrings.C
+++ b/src/support/lstrings.C
@@ -11,35 +11,34 @@
 
 #include <config.h>
 
-#include "support/std_string.h"
 #include "lstrings.h"
-#include "LAssert.h"
-#include "support/std_sstream.h"
 #include "debug.h"
-#include "BoostFormat.h"
 #include "lyxlib.h"
 #include "tostr.h"
 
-#include <boost/regex.hpp>
 #include <boost/tokenizer.hpp>
+#include <boost/assert.hpp>
+#include <boost/format.hpp>
 
 #include <algorithm>
 
 #include <cctype>
 #include <cstdlib>
 
-using std::count;
+#include <sstream>
+
 using std::transform;
+using std::string;
 using std::vector;
 
 #ifndef CXX_GLOBAL_CSTD
 using std::atof;
 using std::isdigit;
-using std::strlen;
 using std::tolower;
 using std::toupper;
 #endif
 
+
 namespace lyx {
 namespace support {
 
@@ -292,10 +291,10 @@ bool prefixIs(string const & a, string const & pre)
        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
+#if defined(STD_STRING_IS_GOOD)
                return a.compare(0, prelen, pre) == 0;
+#else
+               return ::strncmp(a.c_str(), pre.c_str(), prelen) == 0;
 #endif
        }
 }
@@ -326,22 +325,6 @@ bool suffixIs(string const & a, string const & suf)
 }
 
 
-bool contains(string const & a, string const & b)
-{
-       if (a.empty())
-               return false;
-       return a.find(b) != string::npos;
-}
-
-
-bool contains(string const & a, char b)
-{
-       if (a.empty())
-               return false;
-       return a.find(b) != string::npos;
-}
-
-
 bool containsOnly(string const & s, string const & cset)
 {
        return s.find_first_not_of(cset) == string::npos;
@@ -390,21 +373,6 @@ int tokenPos(string const & a, char delim, string const & tok)
 }
 
 
-bool regexMatch(string const & a, string const & pattern)
-{
-       // We massage the pattern a bit so that the usual
-       // shell pattern we all are used to will work.
-       // One nice thing about using a real regex is that
-       // things like "*.*[^~]" will work also.
-       // build the regex string.
-       string regex(pattern);
-       regex = subst(regex, ".", "\\.");
-       regex = subst(regex, "*", ".*");
-       boost::regex reg(STRCONV(regex));
-       return boost::regex_match(STRCONV(a), reg);
-}
-
-
 string const subst(string const & a, char oldchar, char newchar)
 {
        string tmp(a);
@@ -434,7 +402,7 @@ string const subst(string const & a,
 
 string const trim(string const & a, char const * p)
 {
-       Assert(p);
+       BOOST_ASSERT(p);
 
        if (a.empty() || !*p)
                return a;
@@ -452,7 +420,7 @@ string const trim(string const & a, char const * p)
 
 string const rtrim(string const & a, char const * p)
 {
-       Assert(p);
+       BOOST_ASSERT(p);
 
        if (a.empty() || !*p)
                return a;
@@ -469,7 +437,7 @@ string const rtrim(string const & a, char const * p)
 
 string const ltrim(string const & a, char const * p)
 {
-       Assert(p);
+       BOOST_ASSERT(p);
 
        if (a.empty() || !*p)
                return a;
@@ -617,52 +585,47 @@ string const getStringFromVector(vector<string> const & vec,
 
 string bformat(string const & fmt, string const & arg1)
 {
-       return STRCONV((boost::format(STRCONV(fmt)) % STRCONV(arg1)).str());
+       return (boost::format(fmt) % arg1).str();
 }
 
 
 string bformat(string const & fmt, string const & arg1, string const & arg2)
 {
-       return STRCONV((boost::format(STRCONV(fmt)) % STRCONV(arg1)
-               % STRCONV(arg2)).str());
+       return (boost::format(fmt) % arg1 % arg2).str();
 }
 
 
 string bformat(string const & fmt, int arg1, int arg2)
 {
-       return STRCONV((boost::format(STRCONV(fmt)) % arg1 % arg2).str());
+       return (boost::format(fmt) % arg1 % arg2).str();
 }
 
 
 string bformat(string const & fmt, string const & arg1, string const & arg2,
        string const & arg3)
 {
-       return STRCONV((boost::format(STRCONV(fmt)) % STRCONV(arg1)
-               % STRCONV(arg2) % STRCONV(arg3)).str());
+       return (boost::format(fmt) % arg1 % arg2 % arg3).str();
 }
 
 
 string bformat(string const & fmt, string const & arg1, string const & arg2,
        string const & arg3, string const & arg4)
 {
-       return STRCONV((boost::format(STRCONV(fmt)) % STRCONV(arg1)
-               % STRCONV(arg2) % STRCONV(arg3) % STRCONV(arg4)).str());
+       return (boost::format(fmt) % arg1 % arg2 % arg3 % arg4).str();
 }
 
 
 string bformat(string const & fmt, string const & arg1, string const & arg2,
        string const & arg3, string const & arg4, string const & arg5)
 {
-       return STRCONV((boost::format(STRCONV(fmt)) % STRCONV(arg1)
-               % STRCONV(arg2) % STRCONV(arg3) % STRCONV(arg4)
-               % STRCONV(arg5)).str());
+       return (boost::format(fmt) % arg1 % arg2 % arg3 % arg4 % arg5).str();
 }
 
 #else
 
 string bformat(string const & fmt, string const & arg1)
 {
-       Assert(contains(fmt, "%1$s"));
+       BOOST_ASSERT(contains(fmt, "%1$s"));
        string const str = subst(fmt, "%1$s", arg1);
        return subst(str, "%%", "%");
 }
@@ -670,8 +633,8 @@ string bformat(string const & fmt, string const & arg1)
 
 string bformat(string const & fmt, string const & arg1, string const & arg2)
 {
-       Assert(contains(fmt, "%1$s"));
-       Assert(contains(fmt, "%2$s"));
+       BOOST_ASSERT(contains(fmt, "%1$s"));
+       BOOST_ASSERT(contains(fmt, "%2$s"));
        string str = subst(fmt, "%1$s", arg1);
        str = subst(str, "%2$s", arg2);
        return subst(str, "%%", "%");
@@ -680,8 +643,8 @@ string bformat(string const & fmt, string const & arg1, string const & arg2)
 
 string bformat(string const & fmt, int arg1, int arg2)
 {
-       Assert(contains(fmt, "%1$d"));
-       Assert(contains(fmt, "%2$d"));
+       BOOST_ASSERT(contains(fmt, "%1$d"));
+       BOOST_ASSERT(contains(fmt, "%2$d"));
        string str = subst(fmt, "%1$d", tostr(arg1));
        str = subst(str, "%2$d", tostr(arg2));
        return subst(str, "%%", "%");
@@ -691,9 +654,9 @@ string bformat(string const & fmt, int arg1, int arg2)
 string bformat(string const & fmt, string const & arg1, string const & arg2,
        string const & arg3)
 {
-       Assert(contains(fmt, "%1$s"));
-       Assert(contains(fmt, "%2$s"));
-       Assert(contains(fmt, "%3$s"));
+       BOOST_ASSERT(contains(fmt, "%1$s"));
+       BOOST_ASSERT(contains(fmt, "%2$s"));
+       BOOST_ASSERT(contains(fmt, "%3$s"));
        string str = subst(fmt, "%1$s", arg1);
        str = subst(str, "%2$s", arg2);
        str = subst(str, "%3$s", arg3);
@@ -704,10 +667,10 @@ string bformat(string const & fmt, string const & arg1, string const & arg2,
 string bformat(string const & fmt, string const & arg1, string const & arg2,
        string const & arg3, string const & arg4)
 {
-       Assert(contains(fmt, "%1$s"));
-       Assert(contains(fmt, "%2$s"));
-       Assert(contains(fmt, "%3$s"));
-       Assert(contains(fmt, "%4$s"));
+       BOOST_ASSERT(contains(fmt, "%1$s"));
+       BOOST_ASSERT(contains(fmt, "%2$s"));
+       BOOST_ASSERT(contains(fmt, "%3$s"));
+       BOOST_ASSERT(contains(fmt, "%4$s"));
        string str = subst(fmt, "%1$s", arg1);
        str = subst(str, "%2$s", arg2);
        str = subst(str, "%3$s", arg3);
@@ -719,11 +682,11 @@ string bformat(string const & fmt, string const & arg1, string const & arg2,
 string bformat(string const & fmt, string const & arg1, string const & arg2,
        string const & arg3, string const & arg4, string const & arg5)
 {
-       Assert(contains(fmt, "%1$s"));
-       Assert(contains(fmt, "%2$s"));
-       Assert(contains(fmt, "%3$s"));
-       Assert(contains(fmt, "%4$s"));
-       Assert(contains(fmt, "%5$s"));
+       BOOST_ASSERT(contains(fmt, "%1$s"));
+       BOOST_ASSERT(contains(fmt, "%2$s"));
+       BOOST_ASSERT(contains(fmt, "%3$s"));
+       BOOST_ASSERT(contains(fmt, "%4$s"));
+       BOOST_ASSERT(contains(fmt, "%5$s"));
        string str = subst(fmt, "%1$s", arg1);
        str = subst(str, "%2$s", arg2);
        str = subst(str, "%3$s", arg3);