* 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 f865c2cab7f0457e7d7f82d7c1f3a411bebca3a8..9910d5400773e6108c693221e5ec77f769d03105 100644 (file)
--- a/src/support/lstrings.C
+++ b/src/support/lstrings.C
@@ -11,24 +11,24 @@
 
 #include <config.h>
 
-#include "support/std_string.h"
 #include "lstrings.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::transform;
+#include <sstream>
 
+using std::transform;
+using std::string;
 using std::vector;
 
 #ifndef CXX_GLOBAL_CSTD
@@ -291,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
        }
 }
@@ -325,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;
@@ -389,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);
@@ -616,45 +585,40 @@ 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