diff options
author | zhupengfei <zhupengfei321@sina.cn> | 2018-08-26 16:23:12 +0800 |
---|---|---|
committer | fearlessTobi <thm.frey@gmail.com> | 2018-10-06 15:43:49 +0200 |
commit | 690f326613998ea9cc0737c2bef99d1ba2cb911c (patch) | |
tree | d17f178e7924e4ffb0d5b96e148490aa758289b6 /src/common/param_package.cpp | |
parent | 6cc7656e814340ab0030b3b2e39342a501c56560 (diff) |
citra_qt/configuration: misc input tab improvements
* Added a context menu on the buttons including Clear & Restore Default
* Allow clearing (unsetting) inputs. Added a Clear All button
* Allow restoring a single input to default (instead of all)
Diffstat (limited to 'src/common/param_package.cpp')
-rw-r--r-- | src/common/param_package.cpp | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/src/common/param_package.cpp b/src/common/param_package.cpp index 9526ca0c6..b916b4866 100644 --- a/src/common/param_package.cpp +++ b/src/common/param_package.cpp @@ -20,7 +20,15 @@ constexpr char KEY_VALUE_SEPARATOR_ESCAPE[] = "$0"; constexpr char PARAM_SEPARATOR_ESCAPE[] = "$1"; constexpr char ESCAPE_CHARACTER_ESCAPE[] = "$2"; +/// A placeholder for empty param packages to avoid empty strings +/// (they may be recognized as "not set" by some frontend libraries like qt) +constexpr char EMPTY_PLACEHOLDER[] = "[empty]"; + ParamPackage::ParamPackage(const std::string& serialized) { + if (serialized == EMPTY_PLACEHOLDER) { + return; + } + std::vector<std::string> pairs; Common::SplitString(serialized, PARAM_SEPARATOR, pairs); @@ -46,7 +54,7 @@ ParamPackage::ParamPackage(std::initializer_list<DataType::value_type> list) : d std::string ParamPackage::Serialize() const { if (data.empty()) - return ""; + return EMPTY_PLACEHOLDER; std::string result; @@ -120,4 +128,12 @@ bool ParamPackage::Has(const std::string& key) const { return data.find(key) != data.end(); } +void ParamPackage::Erase(const std::string& key) { + data.erase(key); +} + +void ParamPackage::Clear() { + data.clear(); +} + } // namespace Common |