From d4255bbfe4b8b2a0be2a55492f96f56bdc8f7c2c Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 14 Oct 2022 23:24:46 +0400 Subject: [PATCH] Fix build with Xcode. --- Telegram/SourceFiles/info/info_wrap_widget.h | 2 +- .../SourceFiles/platform/mac/notifications_manager_mac.mm | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Telegram/SourceFiles/info/info_wrap_widget.h b/Telegram/SourceFiles/info/info_wrap_widget.h index edf303b1b5..22580107c9 100644 --- a/Telegram/SourceFiles/info/info_wrap_widget.h +++ b/Telegram/SourceFiles/info/info_wrap_widget.h @@ -132,7 +132,7 @@ public: [[nodiscard]] rpl::producer grabbingForExpanding() const; [[nodiscard]] const Ui::RoundRect *bottomSkipRounding() const; - [[nodiscard]] rpl::producer<> removeRequests() const { + [[nodiscard]] rpl::producer<> removeRequests() const override { return _removeRequests.events(); } diff --git a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm index ebff047e3b..1cb6a975c9 100644 --- a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm +++ b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm @@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "platform/platform_specific.h" #include "base/platform/mac/base_utilities_mac.h" #include "base/random.h" +#include "data/data_forum_topic.h" #include "history/history.h" #include "history/history_item.h" #include "ui/empty_userpic.h" @@ -111,7 +112,7 @@ using Manager = Platform::Notifications::Manager; LOG(("App Error: A notification with unknown topic was received")); return; } - const auto notificationTopicRootId = [topicObject longlongValue]; + const auto notificationTopicRootId = [topicObject longLongValue]; NSNumber *msgObject = [notificationUserInfo objectForKey:@"msgid"]; const auto notificationMsgId = msgObject ? [msgObject longLongValue] : 0LL; @@ -223,7 +224,7 @@ private: }; struct ClearFromTopic { ContextId contextId; - } + }; struct ClearFromHistory { ContextId partialContextId; }; @@ -344,7 +345,7 @@ void Manager::Private::clearingThreadLoop() { clearAll = true; }, [&](const ClearFromItem &value) { clearFromItems.emplace(value.id); - }, [&](Const ClearFromTopic &value) { + }, [&](const ClearFromTopic &value) { clearFromTopics.emplace(value.contextId); }, [&](const ClearFromHistory &value) { clearFromHistories.emplace(value.partialContextId);