From c94da177d79848766c1c47e13898c37761c48065 Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 1 Mar 2024 22:18:01 +0400 Subject: [PATCH] Fix build with Xcode. --- Telegram/SourceFiles/data/business/data_business_common.cpp | 2 +- .../SourceFiles/settings/business/settings_away_message.cpp | 4 ++-- Telegram/SourceFiles/settings/business/settings_chatbots.cpp | 4 ++-- Telegram/SourceFiles/settings/business/settings_greeting.cpp | 4 ++-- Telegram/SourceFiles/settings/business/settings_location.cpp | 2 +- .../SourceFiles/settings/business/settings_working_hours.cpp | 2 +- .../cloud_password/settings_cloud_password_email_confirm.cpp | 2 +- Telegram/SourceFiles/settings/settings_chat.h | 2 +- Telegram/SourceFiles/settings/settings_common.h | 2 +- Telegram/SourceFiles/settings/settings_common_session.h | 2 +- Telegram/SourceFiles/settings/settings_main.h | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Telegram/SourceFiles/data/business/data_business_common.cpp b/Telegram/SourceFiles/data/business/data_business_common.cpp index 956807f5d1..34a46f3cc0 100644 --- a/Telegram/SourceFiles/data/business/data_business_common.cpp +++ b/Telegram/SourceFiles/data/business/data_business_common.cpp @@ -149,7 +149,7 @@ WorkingIntervals ReplaceDayIntervals( end(result.list), begin(replacement.list), end(replacement.list)); - for (auto &interval : ranges::subrange(first, end(result.list))) { + for (auto &interval : ranges::make_subrange(first, end(result.list))) { interval = interval.shifted(dayIndex * kDay); } return result.normalized(); diff --git a/Telegram/SourceFiles/settings/business/settings_away_message.cpp b/Telegram/SourceFiles/settings/business/settings_away_message.cpp index 4953bbdbd6..04dfe993a2 100644 --- a/Telegram/SourceFiles/settings/business/settings_away_message.cpp +++ b/Telegram/SourceFiles/settings/business/settings_away_message.cpp @@ -55,7 +55,7 @@ private: [[nodiscard]] TimeId StartTimeMin() { // Telegram was launched in August 2013 :) - return base::unixtime::serialize(QDateTime(QDate(2013, 8, 1))); + return base::unixtime::serialize(QDateTime(QDate(2013, 8, 1), QTime(0, 0))); } [[nodiscard]] TimeId EndTimeMin() { @@ -260,7 +260,7 @@ void AwayMessage::setupContent( _enabled.value() | rpl::filter(_1) | rpl::start_with_next([=] { if (!_canHave.current()) { controller->showToast({ - .text = tr::lng_away_limit_reached(tr::now), + .text = { tr::lng_away_limit_reached(tr::now) }, .adaptive = true, }); _deactivateOnAttempt.fire({}); diff --git a/Telegram/SourceFiles/settings/business/settings_chatbots.cpp b/Telegram/SourceFiles/settings/business/settings_chatbots.cpp index d9879f470e..d3f1124838 100644 --- a/Telegram/SourceFiles/settings/business/settings_chatbots.cpp +++ b/Telegram/SourceFiles/settings/business/settings_chatbots.cpp @@ -47,7 +47,7 @@ public: [[nodiscard]] rpl::producer title() override; - const Ui::RoundRect *bottomSkipRounding() const { + const Ui::RoundRect *bottomSkipRounding() const override { return &_bottomSkipRounding; } @@ -59,7 +59,7 @@ private: rpl::variable _recipients; rpl::variable _usernameValue; - rpl::variable _botValue = nullptr; + rpl::variable _botValue; rpl::variable _repliesAllowed = true; }; diff --git a/Telegram/SourceFiles/settings/business/settings_greeting.cpp b/Telegram/SourceFiles/settings/business/settings_greeting.cpp index 6db47a7a01..3c73f391f2 100644 --- a/Telegram/SourceFiles/settings/business/settings_greeting.cpp +++ b/Telegram/SourceFiles/settings/business/settings_greeting.cpp @@ -44,7 +44,7 @@ public: [[nodiscard]] rpl::producer title() override; - const Ui::RoundRect *bottomSkipRounding() const { + const Ui::RoundRect *bottomSkipRounding() const override { return &_bottomSkipRounding; } @@ -157,7 +157,7 @@ void Greeting::setupContent( _enabled.value() | rpl::filter(_1) | rpl::start_with_next([=] { if (!_canHave.current()) { controller->showToast({ - .text = tr::lng_greeting_limit_reached(tr::now), + .text = { tr::lng_greeting_limit_reached(tr::now) }, .adaptive = true, }); _deactivateOnAttempt.fire({}); diff --git a/Telegram/SourceFiles/settings/business/settings_location.cpp b/Telegram/SourceFiles/settings/business/settings_location.cpp index 2d9895ed98..4a2f14e73a 100644 --- a/Telegram/SourceFiles/settings/business/settings_location.cpp +++ b/Telegram/SourceFiles/settings/business/settings_location.cpp @@ -32,7 +32,7 @@ public: [[nodiscard]] rpl::producer title() override; - const Ui::RoundRect *bottomSkipRounding() const { + const Ui::RoundRect *bottomSkipRounding() const override { return mapSupported() ? nullptr : &_bottomSkipRounding; } diff --git a/Telegram/SourceFiles/settings/business/settings_working_hours.cpp b/Telegram/SourceFiles/settings/business/settings_working_hours.cpp index 39ef6e793c..dd6c54b662 100644 --- a/Telegram/SourceFiles/settings/business/settings_working_hours.cpp +++ b/Telegram/SourceFiles/settings/business/settings_working_hours.cpp @@ -462,7 +462,7 @@ void AddWeekButton( [=] { toggleButton->update(); }); auto status = data->value( - ) | rpl::map([=](const Data::WorkingHours &data) { + ) | rpl::map([=](const Data::WorkingHours &data) -> rpl::producer { using namespace Data; const auto intervals = ExtractDayIntervals(data.intervals, index); diff --git a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_email_confirm.cpp b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_email_confirm.cpp index 19bb969698..b1879387e8 100644 --- a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_email_confirm.cpp +++ b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_email_confirm.cpp @@ -60,7 +60,7 @@ public: [[nodiscard]] rpl::producer title() override; - [[nodiscard]] void fillTopBarMenu( + void fillTopBarMenu( const Ui::Menu::MenuCallback &addAction) override; void setupContent(); diff --git a/Telegram/SourceFiles/settings/settings_chat.h b/Telegram/SourceFiles/settings/settings_chat.h index d1256de961..70724ea2ba 100644 --- a/Telegram/SourceFiles/settings/settings_chat.h +++ b/Telegram/SourceFiles/settings/settings_chat.h @@ -44,7 +44,7 @@ public: [[nodiscard]] rpl::producer title() override; - [[nodiscard]] void fillTopBarMenu( + void fillTopBarMenu( const Ui::Menu::MenuCallback &addAction) override; private: diff --git a/Telegram/SourceFiles/settings/settings_common.h b/Telegram/SourceFiles/settings/settings_common.h index 47bf527747..c279640a55 100644 --- a/Telegram/SourceFiles/settings/settings_common.h +++ b/Telegram/SourceFiles/settings/settings_common.h @@ -102,7 +102,7 @@ public: } virtual void selectionAction(Info::SelectionAction action) { } - [[nodiscard]] virtual void fillTopBarMenu( + virtual void fillTopBarMenu( const Ui::Menu::MenuCallback &addAction) { } diff --git a/Telegram/SourceFiles/settings/settings_common_session.h b/Telegram/SourceFiles/settings/settings_common_session.h index 2b439bacf3..8bea347a02 100644 --- a/Telegram/SourceFiles/settings/settings_common_session.h +++ b/Telegram/SourceFiles/settings/settings_common_session.h @@ -79,7 +79,7 @@ public: [[nodiscard]] rpl::producer sectionShowOther() final override { return _showOtherRequests.events(); } - [[nodiscard]] void showOther(Type type) { + void showOther(Type type) { _showOtherRequests.fire_copy(type); } [[nodiscard]] Fn showOtherMethod() { diff --git a/Telegram/SourceFiles/settings/settings_main.h b/Telegram/SourceFiles/settings/settings_main.h index 4356a49b39..7040fb9fa7 100644 --- a/Telegram/SourceFiles/settings/settings_main.h +++ b/Telegram/SourceFiles/settings/settings_main.h @@ -38,7 +38,7 @@ public: [[nodiscard]] rpl::producer title() override; - [[nodiscard]] void fillTopBarMenu( + void fillTopBarMenu( const Ui::Menu::MenuCallback &addAction) override; protected: