procyberian/tdesktop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

Version 1.1.16: Fix build for Qt 5.3.2 and GCC.

Browse source
This commit is contained in:
John Preston 2017-07-26 19:10:04 +03:00
parent fdcb28f1a0
commit dfa7cb1826
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Telegram/SourceFiles/codegen/emoji/replaces.cpp
View file

@ -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");

2
Telegram/ThirdParty/emoji_suggestions/emoji_suggestions.cpp vendored
View file

@ -170,7 +170,7 @@ private:
private:
std::vector<small> &_map;
int _index = 0;
bool _guarded = false;
small _guarded = 0;
};
std::vector<small> _currentItemWordsUsedMap;