From d4f2c963223ae3713a80855eadade8cadcfe4ca6 Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 30 Sep 2020 19:58:30 +0300 Subject: [PATCH] Version 2.4: Fix build on macOS. --- .../history/view/history_view_scheduled_section.cpp | 2 +- .../platform/mac/touchbar/mac_touchbar_controls.mm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp index 4e7e2a8681..227b2a1fa0 100644 --- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp +++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp @@ -152,7 +152,7 @@ ScheduledWidget::ScheduledWidget( ScheduledWidget::~ScheduledWidget() = default; void ScheduledWidget::setupComposeControls() { - _composeControls->setHistory({ .history = _history }); + _composeControls->setHistory({ .history = _history.get() }); _composeControls->height( ) | rpl::start_with_next([=] { diff --git a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_controls.mm b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_controls.mm index 8a34c996d1..32b4becd25 100644 --- a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_controls.mm +++ b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_controls.mm @@ -11,7 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/platform/mac/base_utilities_mac.h" // Q2NSString() #include "core/sandbox.h" // Sandbox::customEnterFromEventLoop() -#include "layout.h" // formatDurationText() +#include "ui/text/format_values.h" // Ui::FormatDurationText() #include "media/audio/media_audio.h" #include "platform/mac/touchbar/mac_touchbar_common.h" @@ -42,7 +42,7 @@ inline NSDictionary *Attributes() { } inline NSString *FormatTime(TimeId time) { - return Platform::Q2NSString(formatDurationText(time)); + return Platform::Q2NSString(Ui::FormatDurationText(time)); } } // namespace