chatterino2
Code Issues

Simplify optional member reading in HighlightPhrase setting deserialization

Browse Source
This commit is contained in:
Rasmus Karlsson
2018-05-13 19:24:50 +02:00
parent 15b432a4cf
commit 732d0374be
1 changed files with 6 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/controllers/highlights/highlightphrase.hpp
+6 -27
View File
@@ -1,5 +1,6 @@
#pragma once #pragma once
#include "util/rapidjson-helpers.hpp"
#include "util/serialize-custom.hpp" #include "util/serialize-custom.hpp"
#include <QRegularExpression> #include <QRegularExpression>
@@ -101,36 +102,14 @@ struct Deserialize<chatterino::controllers::highlights::HighlightPhrase> {
} }
QString _pattern; QString _pattern;
if (value.HasMember("pattern")) {
const rapidjson::Value &key = value["pattern"];
if (key.IsString()) {
_pattern = key.GetString();
}
}
bool _alert = true; bool _alert = true;
if (value.HasMember("alert")) {
const rapidjson::Value &alert = value["alert"];
if (alert.IsBool()) {
_alert = alert.GetBool();
}
}
bool _sound = false; bool _sound = false;
if (value.HasMember("sound")) {
const rapidjson::Value &sound = value["sound"];
if (sound.IsBool()) {
_sound = sound.GetBool();
}
}
bool _isRegex = false; bool _isRegex = false;
if (value.HasMember("regex")) {
const rapidjson::Value &regex = value["regex"]; chatterino::rj::getSafe(value, "pattern", _pattern);
if (regex.IsBool()) { chatterino::rj::getSafe(value, "alert", _alert);
_isRegex = regex.GetBool(); chatterino::rj::getSafe(value, "sound", _sound);
} chatterino::rj::getSafe(value, "regex", _isRegex);
}
return chatterino::controllers::highlights::HighlightPhrase(_pattern, _alert, _sound, return chatterino::controllers::highlights::HighlightPhrase(_pattern, _alert, _sound,
_isRegex); _isRegex);