From c5867e229385af5e904ea49ce535957fe2e84a2c Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Tue, 20 Jul 2021 10:57:49 +0400 Subject: [PATCH] Fix build with clang --- Telegram/SourceFiles/mtproto/mtp_instance.cpp | 2 +- .../ui/chat/attach/attach_abstract_single_file_preview.cpp | 4 ---- Telegram/SourceFiles/window/window_outdated_bar.cpp | 2 +- Telegram/lib_webrtc | 2 +- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Telegram/SourceFiles/mtproto/mtp_instance.cpp b/Telegram/SourceFiles/mtproto/mtp_instance.cpp index e01f9947c..ec7df112e 100644 --- a/Telegram/SourceFiles/mtproto/mtp_instance.cpp +++ b/Telegram/SourceFiles/mtproto/mtp_instance.cpp @@ -1027,7 +1027,7 @@ void Instance::Private::unregisterRequest(mtpRequestId requestId) { auto handling = 0; do { handling = toResend.size(); - for (const auto [resendingId, afterId] : _dependentRequests) { + for (const auto &[resendingId, afterId] : _dependentRequests) { if (toRemove.contains(afterId)) { toRemove.emplace(resendingId); toResend.emplace(resendingId); diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_file_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_file_preview.cpp index 22735bf5e..9913d9299 100644 --- a/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_file_preview.cpp +++ b/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_file_preview.cpp @@ -90,7 +90,6 @@ void AbstractSingleFilePreview::paintEvent(QPaintEvent *e) { const auto w = width() - st::boxPhotoPadding.left() - st::boxPhotoPadding.right(); - const auto h = height(); const auto &st = !isThumbedLayout(_data) ? st::attachPreviewLayout : st::attachPreviewThumbLayout; @@ -165,9 +164,6 @@ void AbstractSingleFilePreview::updateTextWidthFor(Data &data) { const auto &st = !isThumbedLayout(data) ? st::attachPreviewLayout : st::attachPreviewThumbLayout; - const auto nameleft = st.thumbSize + st.padding.right(); - const auto nametop = st.nameTop; - const auto statustop = st.statusTop; const auto buttonsCount = (_type == AttachControls::Type::EditOnly) ? 1 : (_type == AttachControls::Type::Full) diff --git a/Telegram/SourceFiles/window/window_outdated_bar.cpp b/Telegram/SourceFiles/window/window_outdated_bar.cpp index df1b10b2d..e68703e70 100644 --- a/Telegram/SourceFiles/window/window_outdated_bar.cpp +++ b/Telegram/SourceFiles/window/window_outdated_bar.cpp @@ -18,11 +18,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL namespace Window { namespace { +#ifdef DESKTOP_APP_SPECIAL_TARGET constexpr auto kMinimalSkip = 7; constexpr auto kSoonSkip = 30; constexpr auto kNowSkip = 90; -#ifdef DESKTOP_APP_SPECIAL_TARGET class Bar : public Ui::RpWidget { public: Bar(not_null parent, QDate date); diff --git a/Telegram/lib_webrtc b/Telegram/lib_webrtc index 4a722c1f2..6541e37e2 160000 --- a/Telegram/lib_webrtc +++ b/Telegram/lib_webrtc @@ -1 +1 @@ -Subproject commit 4a722c1f267b2491f8e9ef6200ae4ec61b46f397 +Subproject commit 6541e37e2de0431df22c220d80ffbb1b498f335b