Browse Source

Convert Settings::load() to use a reference

master
Riyyi 4 years ago
parent
commit
28ea13c762
  1. 9
      inferno/src/inferno/settings.cpp
  2. 2
      inferno/src/inferno/settings.h

9
inferno/src/inferno/settings.cpp

@ -18,7 +18,8 @@ namespace Inferno {
void Settings::update() void Settings::update()
{ {
nlohmann::json json = Settings::load(); nlohmann::json json;
Settings::load(json);
try { try {
m_properties.window.title = json["window"]["title"].get<std::string>(); m_properties.window.title = json["window"]["title"].get<std::string>();
@ -36,13 +37,11 @@ namespace Inferno {
{ {
} }
nlohmann::json Settings::load() bool Settings::load(nlohmann::json& json)
{ {
nlohmann::json json;
File::ioRead(json, m_path); File::ioRead(json, m_path);
return json; return true;
} }
bool Settings::save() bool Settings::save()

2
inferno/src/inferno/settings.h

@ -17,7 +17,7 @@ namespace Inferno {
static void update(); static void update();
static void destroy(); static void destroy();
static nlohmann::json load(); static bool load(nlohmann::json& json);
static bool save(); static bool save();
static inline SettingsProperties& get() { return m_properties; } static inline SettingsProperties& get() { return m_properties; }

Loading…
Cancel
Save