* lyxfunctional.h: delete compare_memfun and helper classes

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

diff --git a/src/support/lstrings.h b/src/support/lstrings.h
index 7101f24a8802e2a0229e8b9671b0be8c91047b84..7d371266e327ac143cb1e26b10b4c78841c0b018 100644 (file)
--- a/src/support/lstrings.h
+++ b/src/support/lstrings.h
@@ -97,22 +97,11 @@ bool suffixIs(std::string const &, char);
 bool suffixIs(std::string const &, std::string const &);
 
 ///
-bool contains(std::string const & a, std::string const & b);
-
-///
-bool contains(std::string const & a, char b);
-
-/// This should probably we rewritten to be more general.
-struct contains_functor
-       : public std::binary_function<std::string, std::string, bool>
+template <typename B>
+bool contains(std::string const & a, B b)
 {
-       bool operator()(std::string const & haystack,
-                       std::string const & needle) const
-       {
-               return contains(haystack, needle);
-       }
-};
-
+       return a.find(b) != std::string::npos;
+}
 
 ///
 bool containsOnly(std::string const &, std::string const &);