Version 1.4.9: try using bare ReadOption instead of ReadBoolOption
This commit is contained in:
parent
30c2d45591
commit
c528bf86cd
1 changed files with 2 additions and 13 deletions
|
|
@ -80,17 +80,6 @@ bool ReadIntOption(QJsonObject obj, QString key, std::function<void(int)> callba
|
|||
return (readValueResult && readResult);
|
||||
}
|
||||
|
||||
bool ReadBoolOption(QJsonObject obj, QString key, std::function<void(bool)> callback) {
|
||||
auto readResult = false;
|
||||
auto readValueResult = ReadOption(obj, key, [&](QJsonValue v) {
|
||||
if (v.isBool()) {
|
||||
callback(v.toBool());
|
||||
readResult = true;
|
||||
}
|
||||
});
|
||||
return (readValueResult && readResult);
|
||||
}
|
||||
|
||||
bool ReadArrayOption(QJsonObject obj, QString key, std::function<void(QJsonArray)> callback) {
|
||||
auto readResult = false;
|
||||
auto readValueResult = ReadOption(obj, key, [&](QJsonValue v) {
|
||||
|
|
@ -175,8 +164,8 @@ LocalFolder MakeLocalFolder(const QJsonObject &obj) {
|
|||
});
|
||||
|
||||
for (const auto &[flag, option] : LocalFolderSettingsFlags) {
|
||||
ReadBoolOption(obj, option, [&](auto v) {
|
||||
if (v) {
|
||||
ReadOption(obj, option, [&](auto v) {
|
||||
if (v.isBool() && v.toBool()) {
|
||||
result.flags |= flag;
|
||||
}
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue