Relintai/rcpp_framework
1
0
Fork 0
mirror of https://github.com/Relintai/rcpp_framework.git synced 2024-11-10 00:52:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Now the settings class uses Variants.

Browse Source
This commit is contained in:
Relintai 2022-01-06 18:36:31 +01:00
parent 4a3fca736d
commit 3d81df493c
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/settings/settings.cpp
View File

@ -4,7 +4,7 @@
#include <stdlib.h>
String Settings::get_value(const String &key, const String &def) {
std::map<String, String>::iterator e = _data.find(key);
std::map<String, Variant>::iterator e = _data.find(key);
if (e != _data.end()) {
return e->second;
@ -13,7 +13,7 @@ String Settings::get_value(const String &key, const String &def) {
}
}
int Settings::get_value_int(const String &key, const int def) {
std::map<String, String>::iterator e = _data.find(key);
std::map<String, Variant>::iterator e = _data.find(key);
if (e != _data.end()) {
return e->second.to_int();
@ -22,7 +22,7 @@ int Settings::get_value_int(const String &key, const int def) {
}
}
float Settings::get_value_float(const String &key, const float def) {
std::map<String, String>::iterator e = _data.find(key);
std::map<String, Variant>::iterator e = _data.find(key);
if (e != _data.end()) {
return e->second.to_float();
@ -31,16 +31,16 @@ float Settings::get_value_float(const String &key, const float def) {
}
}
double Settings::get_value_double(const String &key, const double def) {
std::map<String, String>::iterator e = _data.find(key);
std::map<String, Variant>::iterator e = _data.find(key);
if (e != _data.end()) {
return e->second.to_double();
return e->second.to_float();
} else {
return def;
}
}
bool Settings::get_value_bool(const String &key, const bool def) {
std::map<String, String>::iterator e = _data.find(key);
std::map<String, Variant>::iterator e = _data.find(key);
if (e != _data.end()) {
return e->second.to_bool();

3
core/settings/settings.h
View File

@ -3,6 +3,7 @@
#include <map>
#include "core/variant.h"
#include "core/string.h"
class Settings {
@ -23,7 +24,7 @@ public:
protected:
static Settings *_singleton;
std::map<String, String> _data;
std::map<String, Variant> _data;
};
#endif