kotatogram/kotatogram-desktop
kotatogram/kotatogram-desktop
1
0
Fork 0
Code Issues Releases 45 Packages Wiki Activity

Version 1.4.9: try using bare ReadOption instead of ReadBoolOption

Browse source
This commit is contained in:
Eric Kotato 2022-03-08 14:15:41 +03:00
parent 30c2d45591
commit c528bf86cd
1 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Telegram/SourceFiles/data/data_chat_filters.cpp
View file

@ -80,17 +80,6 @@ bool ReadIntOption(QJsonObject obj, QString key, std::function<void(int)> callba
return (readValueResult && readResult); 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) { bool ReadArrayOption(QJsonObject obj, QString key, std::function<void(QJsonArray)> callback) {
auto readResult = false; auto readResult = false;
auto readValueResult = ReadOption(obj, key, [&](QJsonValue v) { auto readValueResult = ReadOption(obj, key, [&](QJsonValue v) {
@ -175,8 +164,8 @@ LocalFolder MakeLocalFolder(const QJsonObject &obj) {
}); });
for (const auto &[flag, option] : LocalFolderSettingsFlags) { for (const auto &[flag, option] : LocalFolderSettingsFlags) {
ReadBoolOption(obj, option, [&](auto v) { ReadOption(obj, option, [&](auto v) {
if (v) { if (v.isBool() && v.toBool()) {
result.flags |= flag; result.flags |= flag;
} }
}); });