diff --git a/Telegram/SourceFiles/lang/lang_instance.cpp b/Telegram/SourceFiles/lang/lang_instance.cpp index 4af44b4ff..1853b845f 100644 --- a/Telegram/SourceFiles/lang/lang_instance.cpp +++ b/Telegram/SourceFiles/lang/lang_instance.cpp @@ -643,7 +643,7 @@ void Instance::loadFromJson(const QString &filename) { } else if ((*value).isObject()) { - const auto keyPlurals = (*value).isObject() + const auto keyPlurals = (*value).toObject(); const auto pluralList = keyPlurals.keys(); for (auto pli = keyList.constBegin(), ple = keyList.constEnd(); pli != ple; ++pli) { @@ -656,8 +656,8 @@ void Instance::loadFromJson(const QString &filename) { continue; } - const auto name = QByteArray(key + "#" + plural); - const auto translation = QByteArray((*pluralValue).toString()); + const auto name = QByteArray().append(key + "#" + plural); + const auto translation = QByteArray().append((*pluralValue).toString()); applyValue(name, translation); if (--limit <= 0) { diff --git a/Telegram/SourceFiles/settings.h b/Telegram/SourceFiles/settings.h index 63c18bc86..3728ea1e2 100644 --- a/Telegram/SourceFiles/settings.h +++ b/Telegram/SourceFiles/settings.h @@ -211,7 +211,7 @@ inline void SetNetworkBoost(int boost) { DeclareSetting(bool, ShowPhoneInDrawer); -using ScaleVector = std::std::vector; +using ScaleVector = std::vector; DeclareRefSetting(ScaleVector, InterfaceScales); bool HasCustomScales(); bool AddCustomScale(int scale);