From 3feea400afc6c770fefbdcb077ec0b5515e0038a Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 14 Oct 2020 11:28:17 +0300 Subject: [PATCH] Fix build on macOS. --- Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp | 4 ++-- Telegram/SourceFiles/history/view/history_view_pinned_bar.h | 3 +++ Telegram/SourceFiles/platform/mac/file_bookmark_mac.h | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp index a31713bbc4..267a9513f8 100644 --- a/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp +++ b/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp @@ -27,7 +27,7 @@ namespace { const auto poll = media ? media->poll() : nullptr; return Ui::MessageBarContent{ .id = item->id, - .text = item->inReplyText(), + .text = { item->inReplyText() }, }; } @@ -102,7 +102,7 @@ namespace { } auto load = rpl::make_producer([=](auto consumer) { consumer.put_next(Ui::MessageBarContent{ - .text = tr::lng_contacts_loading(tr::now), + .text = { tr::lng_contacts_loading(tr::now) }, }); const auto channel = id.channel ? session->data().channel(id.channel).get() diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_bar.h b/Telegram/SourceFiles/history/view/history_view_pinned_bar.h index 0995d1cb52..d09394e7ea 100644 --- a/Telegram/SourceFiles/history/view/history_view_pinned_bar.h +++ b/Telegram/SourceFiles/history/view/history_view_pinned_bar.h @@ -38,6 +38,9 @@ struct PinnedBarId { bool operator==(const PinnedBarId &other) const { return std::tie(message, type) == std::tie(other.message, other.type); } + bool operator!=(const PinnedBarId &other) const { + return !(*this == other); + } }; [[nodiscard]] rpl::producer PinnedBarContent( not_null session, diff --git a/Telegram/SourceFiles/platform/mac/file_bookmark_mac.h b/Telegram/SourceFiles/platform/mac/file_bookmark_mac.h index a60971184c..e72a8b2c54 100644 --- a/Telegram/SourceFiles/platform/mac/file_bookmark_mac.h +++ b/Telegram/SourceFiles/platform/mac/file_bookmark_mac.h @@ -16,7 +16,7 @@ public: [[nodiscard]] bool check() const; bool enable() const; - void disable(); + void disable() const; [[nodiscard]] const QString &name(const QString &original) const; [[nodiscard]] QByteArray bookmark() const;