RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp
View File

@ -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<Ui::MessageBarContent>([=](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()

3
Telegram/SourceFiles/history/view/history_view_pinned_bar.h
View File

@ -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<Ui::MessageBarContent> PinnedBarContent(
not_null<Main::Session*> session,

2
Telegram/SourceFiles/platform/mac/file_bookmark_mac.h
View File

@ -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;