Create a grfx::Loader class and so move large chunks of code out of

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

diff --git a/src/support/lstrings.C b/src/support/lstrings.C
index 39594d53f1cc3957d35c42796525da811e36ddf6..bcbfb48917cd80440924ab892170e4ef24fce506 100644 (file)
--- a/src/support/lstrings.C
+++ b/src/support/lstrings.C
@@ -14,25 +14,28 @@
 #pragma implementation
 #endif
 
-#include <algorithm>
-
-#include <cctype>
-#include <cstdlib>
-
 #include "LString.h"
 #include "lstrings.h"
-#include "LRegex.h"
 #include "LAssert.h"
 #include "debug.h"
 
+#include <boost/regex.hpp>
+
+#include <algorithm>
+
+#include <cctype>
+#include <cstdlib>
+
 using std::count;
 using std::transform;
 using std::vector;
 
 #ifndef CXX_GLOBAL_CSTD
+using std::atof;
+using std::isdigit;
+using std::strlen;
 using std::tolower;
 using std::toupper;
-using std::strlen;
 #endif
 
 
@@ -476,8 +479,8 @@ bool regexMatch(string const & a, string const & pattern)
        string regex(pattern);
        regex = subst(regex, ".", "\\.");
        regex = subst(regex, "*", ".*");
-       LRegex reg(regex);
-       return reg.exact_match(a);
+       boost::regex reg(regex);
+       return boost::regex_match(a, reg);
 }
 
 
@@ -674,4 +677,3 @@ string const getStringFromVector(vector<string> const & vec,
        }
        return str;
 }
-