diff --git a/Telegram/SourceFiles/data/stickers/data_stickers.cpp b/Telegram/SourceFiles/data/stickers/data_stickers.cpp index ca0fbb2604..dc94eb0267 100644 --- a/Telegram/SourceFiles/data/stickers/data_stickers.cpp +++ b/Telegram/SourceFiles/data/stickers/data_stickers.cpp @@ -1841,7 +1841,7 @@ RecentStickerPack &Stickers::getRecentPack() const { const auto document = owner().document(preloaded.first); if (!document || !document->sticker()) continue; - recent.push_back(std::make_pair(document, preloaded.second)); + recent.push_back({ document, preloaded.second }); } } return cRefRecentStickers(); diff --git a/Telegram/SourceFiles/logs.cpp b/Telegram/SourceFiles/logs.cpp index a721d55b8f..6637709df7 100644 --- a/Telegram/SourceFiles/logs.cpp +++ b/Telegram/SourceFiles/logs.cpp @@ -278,7 +278,7 @@ void _logsWrite(LogDataType type, const QString &msg) { if (!LogsInMemory) { LogsInMemory = new LogsInMemoryList; } - LogsInMemory->push_back(std::make_pair(type, msg)); + LogsInMemory->push_back({ type, msg }); } else if (!LogsBeforeSingleInstanceChecked.isEmpty() && type == LogDataMain) { LogsBeforeSingleInstanceChecked += msg; } diff --git a/Telegram/SourceFiles/storage/details/storage_settings_scheme.cpp b/Telegram/SourceFiles/storage/details/storage_settings_scheme.cpp index 00bdb2285b..c0b221cbcf 100644 --- a/Telegram/SourceFiles/storage/details/storage_settings_scheme.cpp +++ b/Telegram/SourceFiles/storage/details/storage_settings_scheme.cpp @@ -1005,7 +1005,7 @@ bool ReadSetting( } auto id = Ui::Emoji::IdFromOldKey(oldKey); if (!id.isEmpty()) { - p.push_back(std::make_pair(id, item.second)); + p.push_back({ id, item.second }); } } Core::App().settings().setLegacyRecentEmojiPreload(std::move(p)); @@ -1024,7 +1024,7 @@ bool ReadSetting( for (auto &item : v) { auto id = Ui::Emoji::IdFromOldKey(item.first); if (!id.isEmpty()) { - p.push_back(std::make_pair(id, item.second)); + p.push_back({ id, item.second }); } } Core::App().settings().setLegacyRecentEmojiPreload(std::move(p)); diff --git a/Telegram/SourceFiles/storage/localstorage.cpp b/Telegram/SourceFiles/storage/localstorage.cpp index 66e7792e0c..03c4568b30 100644 --- a/Telegram/SourceFiles/storage/localstorage.cpp +++ b/Telegram/SourceFiles/storage/localstorage.cpp @@ -1417,7 +1417,7 @@ void incrementRecentHashtag(RecentHashtagPack &recent, const QString &tag) { } if (i == e) { while (recent.size() >= 64) recent.pop_back(); - recent.push_back(std::make_pair(tag, 1)); + recent.push_back({ tag, 1 }); for (i = recent.end() - 1; i != recent.begin(); --i) { if ((i - 1)->second > i->second) { break; diff --git a/Telegram/SourceFiles/storage/storage_account.cpp b/Telegram/SourceFiles/storage/storage_account.cpp index 7d6f887ad3..4a6b4ac0fd 100644 --- a/Telegram/SourceFiles/storage/storage_account.cpp +++ b/Telegram/SourceFiles/storage/storage_account.cpp @@ -1038,8 +1038,7 @@ void Account::writeSessionSettings(Main::SessionSettings *stored) { const auto &stickers = _owner->session().data().stickers(); recentStickers.reserve(stickers.getRecentPack().size()); for (const auto &pair : std::as_const(stickers.getRecentPack())) { - recentStickers.push_back( - std::make_pair(pair.first->id, pair.second)); + recentStickers.push_back({ pair.first->id, pair.second }); } } @@ -2570,7 +2569,7 @@ void Account::importOldRecentStickers() { if (std::abs(value) > 1 && (recent.size() < _owner->session().serverConfig().stickersRecentLimit)) { - recent.push_back(std::make_pair(doc, std::abs(value))); + recent.push_back({ doc, ushort(std::abs(value)) }); } } if (def->stickers.isEmpty()) { @@ -2848,14 +2847,14 @@ void Account::readRecentHashtagsAndBots() { write.reserve(writeCount); for (uint32 i = 0; i < writeCount; ++i) { hashtags.stream >> tag >> count; - write.push_back(std::make_pair(tag.trimmed(), count)); + write.push_back({ tag.trimmed(), count }); } } if (searchCount) { search.reserve(searchCount); for (uint32 i = 0; i < searchCount; ++i) { hashtags.stream >> tag >> count; - search.push_back(std::make_pair(tag.trimmed(), count)); + search.push_back({ tag.trimmed(), count }); } } cSetRecentWriteHashtags(write); diff --git a/Telegram/lib_ui b/Telegram/lib_ui index 73840118e2..ae492d4015 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit 73840118e27ad3fef702f027ca2d2089e48ae2be +Subproject commit ae492d4015ce35daf697053776c79786ea7d9282