Fix build on macOS.

This commit is contained in:
John Preston 2020-10-14 11:28:17 +03:00
parent 64ac6b18bf
commit 3feea400af
3 changed files with 6 additions and 3 deletions

View file

@ -27,7 +27,7 @@ namespace {
const auto poll = media ? media->poll() : nullptr; const auto poll = media ? media->poll() : nullptr;
return Ui::MessageBarContent{ return Ui::MessageBarContent{
.id = item->id, .id = item->id,
.text = item->inReplyText(), .text = { item->inReplyText() },
}; };
} }
@ -102,7 +102,7 @@ namespace {
} }
auto load = rpl::make_producer<Ui::MessageBarContent>([=](auto consumer) { auto load = rpl::make_producer<Ui::MessageBarContent>([=](auto consumer) {
consumer.put_next(Ui::MessageBarContent{ consumer.put_next(Ui::MessageBarContent{
.text = tr::lng_contacts_loading(tr::now), .text = { tr::lng_contacts_loading(tr::now) },
}); });
const auto channel = id.channel const auto channel = id.channel
? session->data().channel(id.channel).get() ? session->data().channel(id.channel).get()

View file

@ -38,6 +38,9 @@ struct PinnedBarId {
bool operator==(const PinnedBarId &other) const { bool operator==(const PinnedBarId &other) const {
return std::tie(message, type) == std::tie(other.message, other.type); return std::tie(message, type) == std::tie(other.message, other.type);
} }
bool operator!=(const PinnedBarId &other) const {
return !(*this == other);
}
}; };
[[nodiscard]] rpl::producer<Ui::MessageBarContent> PinnedBarContent( [[nodiscard]] rpl::producer<Ui::MessageBarContent> PinnedBarContent(
not_null<Main::Session*> session, not_null<Main::Session*> session,

View file

@ -16,7 +16,7 @@ public:
[[nodiscard]] bool check() const; [[nodiscard]] bool check() const;
bool enable() const; bool enable() const;
void disable(); void disable() const;
[[nodiscard]] const QString &name(const QString &original) const; [[nodiscard]] const QString &name(const QString &original) const;
[[nodiscard]] QByteArray bookmark() const; [[nodiscard]] QByteArray bookmark() const;