diff --git a/src/backend/helpers/helpers.h b/src/backend/helpers/helpers.h index 145340bf..e2ec49f7 100644 --- a/src/backend/helpers/helpers.h +++ b/src/backend/helpers/helpers.h @@ -26,13 +26,13 @@ #define __LOOT_HELPERS__ #include -#include +#include #include namespace loot { /// Array used to try each of the expressions defined using /// an iteration for each of them. - extern const std::vector version_checks; + extern const std::vector version_checks; ////////////////////////////////////////////////////////////////////////// // Helper functions diff --git a/src/backend/helpers/json.h b/src/backend/helpers/json.h index dfb13131..1e30b965 100644 --- a/src/backend/helpers/json.h +++ b/src/backend/helpers/json.h @@ -27,7 +27,7 @@ along with LOOT. If not, see #include -#include +#include #include namespace loot { @@ -63,9 +63,9 @@ namespace loot { // Using the definition at . // Version numbers and revision IDs should be kept as strings though. - boost::regex numbers("\"(?!version|revision)([^\"]+)\": \"(-?(?:0|[1-9]\\d*)(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)\"", boost::regex::ECMAScript); + std::regex numbers("\"(?!version|revision)([^\"]+)\": \"(-?(?:0|[1-9]\\d*)(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)\"", std::regex::ECMAScript); - json = boost::regex_replace(json, numbers, "\"$1\": $2"); + json = std::regex_replace(json, numbers, "\"$1\": $2"); return json; } diff --git a/src/backend/helpers/version.cpp b/src/backend/helpers/version.cpp index 6438655c..bb022f4e 100644 --- a/src/backend/helpers/version.cpp +++ b/src/backend/helpers/version.cpp @@ -25,10 +25,9 @@ #include "helpers.h" #include "version.h" -#include - #include +#include #include #ifdef _WIN32 @@ -45,8 +44,6 @@ namespace loot { using namespace std; - using boost::regex; - using boost::regex_match; Version::Version() {} @@ -159,4 +156,4 @@ namespace loot { bool Version::operator != (const Version& ver) const { return !(*this == ver); } - } + } diff --git a/src/backend/metadata/condition_grammar.h b/src/backend/metadata/condition_grammar.h index 5936e476..ea1b2cef 100644 --- a/src/backend/metadata/condition_grammar.h +++ b/src/backend/metadata/condition_grammar.h @@ -40,7 +40,7 @@ #include "../error.h" #include -#include +#include #include #include #include @@ -188,11 +188,11 @@ namespace loot { BOOST_LOG_TRIVIAL(trace) << "Checking to see if any files matching the regex \"" << regexStr << "\" exist."; - boost::regex sepReg("/|(\\\\\\\\)", boost::regex::ECMAScript | boost::regex::icase); + std::regex sepReg("/|(\\\\\\\\)", std::regex::ECMAScript | std::regex::icase); std::vector components; - boost::sregex_token_iterator it(regexStr.begin(), regexStr.end(), sepReg, -1); - boost::sregex_token_iterator itend; + std::sregex_token_iterator it(regexStr.begin(), regexStr.end(), sepReg, -1); + std::sregex_token_iterator itend; for (; it != itend; ++it) { components.push_back(*it); } @@ -222,9 +222,9 @@ namespace loot { return; } - boost::regex reg; + std::regex reg; try { - reg = boost::regex(filename, boost::regex::ECMAScript | boost::regex::icase); + reg = std::regex(filename, std::regex::ECMAScript | std::regex::icase); } catch (std::exception& /*e*/) { BOOST_LOG_TRIVIAL(error) << "Invalid regex string:" << filename; @@ -232,7 +232,7 @@ namespace loot { } for (boost::filesystem::directory_iterator itr(parent_path); itr != boost::filesystem::directory_iterator(); ++itr) { - if (boost::regex_match(itr->path().filename().string(), reg)) { + if (std::regex_match(itr->path().filename().string(), reg)) { result = true; BOOST_LOG_TRIVIAL(trace) << "Matching file found: " << itr->path(); return; diff --git a/src/backend/metadata/plugin_metadata.cpp b/src/backend/metadata/plugin_metadata.cpp index 187ed89c..0f965dce 100644 --- a/src/backend/metadata/plugin_metadata.cpp +++ b/src/backend/metadata/plugin_metadata.cpp @@ -31,13 +31,9 @@ #include #include #include -#include +#include using namespace std; -using boost::regex; -using boost::regex_match; -using boost::regex_search; -using boost::smatch; namespace loot { PluginMetadata::PluginMetadata() : enabled(true), _isPriorityExplicit(false), priority(0) {} diff --git a/src/backend/plugin/plugin.cpp b/src/backend/plugin/plugin.cpp index f4651014..8a323b77 100644 --- a/src/backend/plugin/plugin.cpp +++ b/src/backend/plugin/plugin.cpp @@ -32,13 +32,9 @@ #include #include #include -#include +#include using namespace std; -using boost::regex; -using boost::regex_match; -using boost::regex_search; -using boost::smatch; namespace loot { /// REGEX expression definition @@ -84,7 +80,7 @@ namespace loot { /// Array used to try each of the expressions defined above using /// an iteration for each of them. - const std::vector version_checks({ + const vector version_checks({ regex(regex1, regex::ECMAScript | regex::icase), regex(regex2, regex::ECMAScript | regex::icase), regex(regex3, regex::ECMAScript | regex::icase),