From b57c60111f244028d30fe2a46281f06517f38fd2 Mon Sep 17 00:00:00 2001 From: WrinklyNinja Date: Thu, 20 Mar 2014 00:29:45 +0000 Subject: [PATCH] Removed some dead code. --- src/backend/game.cpp | 16 ++++++---------- src/backend/helpers.cpp | 13 ------------- src/backend/helpers.h | 6 ------ src/backend/metadata.h | 8 -------- 4 files changed, 6 insertions(+), 37 deletions(-) diff --git a/src/backend/game.cpp b/src/backend/game.cpp index 115ae054..e89a2bae 100644 --- a/src/backend/game.cpp +++ b/src/backend/game.cpp @@ -146,11 +146,9 @@ namespace loot { string path; string key_parent = fs::path(registryKey).parent_path().string(); string key_name = fs::path(registryKey).filename().string(); - if (RegKeyExists("HKEY_LOCAL_MACHINE", key_parent, key_name)) { - path = RegKeyStringValue("HKEY_LOCAL_MACHINE", key_parent, key_name); - if (fs::exists(fs::path(path) / "Data" / _masterFile)) - gamePath = fs::path(path); - } + path = RegKeyStringValue("HKEY_LOCAL_MACHINE", key_parent, key_name); + if (!path.empty() && fs::exists(fs::path(path) / "Data" / _masterFile)) + gamePath = fs::path(path); } } @@ -176,11 +174,9 @@ namespace loot { string path; string key_parent = fs::path(registryKey).parent_path().string(); string key_name = fs::path(registryKey).filename().string(); - if (RegKeyExists("HKEY_LOCAL_MACHINE", key_parent, key_name)) { - path = RegKeyStringValue("HKEY_LOCAL_MACHINE", key_parent, key_name); - if (fs::exists(fs::path(path) / "Data" / _masterFile)) - return true; - } + path = RegKeyStringValue("HKEY_LOCAL_MACHINE", key_parent, key_name); + if (!path.empty() && fs::exists(fs::path(path) / "Data" / _masterFile)) + return true; return false; } diff --git a/src/backend/helpers.cpp b/src/backend/helpers.cpp index 8d55fc2a..37e19096 100644 --- a/src/backend/helpers.cpp +++ b/src/backend/helpers.cpp @@ -160,19 +160,6 @@ namespace loot { return out; } - //Converts a boolean to a string representation (true/false) - std::string BoolToString(const bool b) { - if (b) - return "true"; - else - return "false"; - } - - //Check if registry subkey exists. - bool RegKeyExists(const std::string& keyStr, const std::string& subkey, const std::string& value) { - return !RegKeyStringValue(keyStr, subkey, value).empty(); - } - //Get registry subkey value string. string RegKeyStringValue(const std::string& keyStr, const std::string& subkey, const std::string& value) { #if _WIN32 || _WIN64 diff --git a/src/backend/helpers.h b/src/backend/helpers.h index 72305a3a..dc388b8e 100644 --- a/src/backend/helpers.h +++ b/src/backend/helpers.h @@ -51,12 +51,6 @@ namespace loot { //Converts an integer to a hex string using BOOST's Spirit.Karma. Faster than a stringstream conversion. std::string IntToHexString(const int n); - //Converts a boolean to a string representation (true/false) - std::string BoolToString(const bool b); - - //Check if registry subkey exists. - bool RegKeyExists(const std::string& keyStr, const std::string& subkey, const std::string& value); - //Get registry subkey value string. std::string RegKeyStringValue(const std::string& keyStr, const std::string& subkey, const std::string& value); diff --git a/src/backend/metadata.h b/src/backend/metadata.h index c694f67e..c89d4ac8 100644 --- a/src/backend/metadata.h +++ b/src/backend/metadata.h @@ -242,14 +242,6 @@ namespace loot { size_t numOverrideRecords; }; - struct plugin_hash : std::unary_function { - inline size_t operator () (const Plugin& p) const { - size_t seed = 0; - boost::hash_combine(seed, p.Name()); - return seed; - } - }; - bool operator == (const File& lhs, const Plugin& rhs); bool operator == (const Plugin& lhs, const File& rhs);