mirror of
https://github.com/yuzu-mirror/yuzu.git
synced 2024-09-07 12:59:12 +01:00
Merge pull request #745 from lioncash/package
param_package: Minor changes
This commit is contained in:
commit
d4104c72aa
2 changed files with 12 additions and 9 deletions
|
@ -3,7 +3,9 @@
|
||||||
// Refer to the license.txt file included.
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
#include <array>
|
#include <array>
|
||||||
|
#include <utility>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include "common/logging/log.h"
|
#include "common/logging/log.h"
|
||||||
#include "common/param_package.h"
|
#include "common/param_package.h"
|
||||||
#include "common/string_util.h"
|
#include "common/string_util.h"
|
||||||
|
@ -12,10 +14,11 @@ namespace Common {
|
||||||
|
|
||||||
constexpr char KEY_VALUE_SEPARATOR = ':';
|
constexpr char KEY_VALUE_SEPARATOR = ':';
|
||||||
constexpr char PARAM_SEPARATOR = ',';
|
constexpr char PARAM_SEPARATOR = ',';
|
||||||
|
|
||||||
constexpr char ESCAPE_CHARACTER = '$';
|
constexpr char ESCAPE_CHARACTER = '$';
|
||||||
const std::string KEY_VALUE_SEPARATOR_ESCAPE{ESCAPE_CHARACTER, '0'};
|
constexpr char KEY_VALUE_SEPARATOR_ESCAPE[] = "$0";
|
||||||
const std::string PARAM_SEPARATOR_ESCAPE{ESCAPE_CHARACTER, '1'};
|
constexpr char PARAM_SEPARATOR_ESCAPE[] = "$1";
|
||||||
const std::string ESCAPE_CHARACTER_ESCAPE{ESCAPE_CHARACTER, '2'};
|
constexpr char ESCAPE_CHARACTER_ESCAPE[] = "$2";
|
||||||
|
|
||||||
ParamPackage::ParamPackage(const std::string& serialized) {
|
ParamPackage::ParamPackage(const std::string& serialized) {
|
||||||
std::vector<std::string> pairs;
|
std::vector<std::string> pairs;
|
||||||
|
@ -35,7 +38,7 @@ ParamPackage::ParamPackage(const std::string& serialized) {
|
||||||
part = Common::ReplaceAll(part, ESCAPE_CHARACTER_ESCAPE, {ESCAPE_CHARACTER});
|
part = Common::ReplaceAll(part, ESCAPE_CHARACTER_ESCAPE, {ESCAPE_CHARACTER});
|
||||||
}
|
}
|
||||||
|
|
||||||
Set(key_value[0], key_value[1]);
|
Set(key_value[0], std::move(key_value[1]));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -101,16 +104,16 @@ float ParamPackage::Get(const std::string& key, float default_value) const {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void ParamPackage::Set(const std::string& key, const std::string& value) {
|
void ParamPackage::Set(const std::string& key, std::string value) {
|
||||||
data[key] = value;
|
data.insert_or_assign(key, std::move(value));
|
||||||
}
|
}
|
||||||
|
|
||||||
void ParamPackage::Set(const std::string& key, int value) {
|
void ParamPackage::Set(const std::string& key, int value) {
|
||||||
data[key] = std::to_string(value);
|
data.insert_or_assign(key, std::to_string(value));
|
||||||
}
|
}
|
||||||
|
|
||||||
void ParamPackage::Set(const std::string& key, float value) {
|
void ParamPackage::Set(const std::string& key, float value) {
|
||||||
data[key] = std::to_string(value);
|
data.insert_or_assign(key, std::to_string(value));
|
||||||
}
|
}
|
||||||
|
|
||||||
bool ParamPackage::Has(const std::string& key) const {
|
bool ParamPackage::Has(const std::string& key) const {
|
||||||
|
|
|
@ -28,7 +28,7 @@ public:
|
||||||
std::string Get(const std::string& key, const std::string& default_value) const;
|
std::string Get(const std::string& key, const std::string& default_value) const;
|
||||||
int Get(const std::string& key, int default_value) const;
|
int Get(const std::string& key, int default_value) const;
|
||||||
float Get(const std::string& key, float default_value) const;
|
float Get(const std::string& key, float default_value) const;
|
||||||
void Set(const std::string& key, const std::string& value);
|
void Set(const std::string& key, std::string value);
|
||||||
void Set(const std::string& key, int value);
|
void Set(const std::string& key, int value);
|
||||||
void Set(const std::string& key, float value);
|
void Set(const std::string& key, float value);
|
||||||
bool Has(const std::string& key) const;
|
bool Has(const std::string& key) const;
|
||||||
|
|
Loading…
Reference in a new issue