mirror of
https://github.com/telegramdesktop/tdesktop
synced 2025-03-20 02:10:24 +00:00
Version 1.1.16: Fix build for Qt 5.3.2 and GCC.
This commit is contained in:
parent
fdcb28f1a0
commit
dfa7cb1826
@ -308,21 +308,21 @@ Replaces PrepareReplaces(const QString &filename) {
|
||||
}
|
||||
auto list = document.object();
|
||||
for (auto i = list.constBegin(), e = list.constEnd(); i != e; ++i) {
|
||||
if (!i->isObject()) {
|
||||
if (!(*i).isObject()) {
|
||||
logReplacesError(filename) << "Child object not found.";
|
||||
return Replaces(filename);
|
||||
}
|
||||
auto childKey = i.key();
|
||||
auto child = i->toObject();
|
||||
auto child = (*i).toObject();
|
||||
auto failed = false;
|
||||
auto getString = [filename, childKey, &child, &failed](const QString &key) {
|
||||
auto it = child.constFind(key);
|
||||
if (it == child.constEnd() || !it->isString()) {
|
||||
if (it == child.constEnd() || !(*it).isString()) {
|
||||
logReplacesError(filename) << "Child '" << childKey.toStdString() << "' field not found: " << key.toStdString();
|
||||
failed = true;
|
||||
return QString();
|
||||
}
|
||||
return it->toString();
|
||||
return (*it).toString();
|
||||
};
|
||||
auto idParts = getString("output").split('-');
|
||||
auto name = getString("name");
|
||||
|
@ -170,7 +170,7 @@ private:
|
||||
private:
|
||||
std::vector<small> &_map;
|
||||
int _index = 0;
|
||||
bool _guarded = false;
|
||||
small _guarded = 0;
|
||||
|
||||
};
|
||||
std::vector<small> _currentItemWordsUsedMap;
|
||||
|
Loading…
Reference in New Issue
Block a user