From 45cacc94c0399a15a72b05e1d4c091c7befd29e7 Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 2 Nov 2022 00:47:25 +0400 Subject: [PATCH] Fix build with Xcode. --- Telegram/SourceFiles/data/data_types.h | 1 + .../SourceFiles/history/view/history_view_scheduled_section.h | 3 ++- Telegram/SourceFiles/window/window_peer_menu.cpp | 1 - Telegram/lib_base | 2 +- Telegram/lib_webview | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Telegram/SourceFiles/data/data_types.h b/Telegram/SourceFiles/data/data_types.h index 33fdd956d..c0cf7f29a 100644 --- a/Telegram/SourceFiles/data/data_types.h +++ b/Telegram/SourceFiles/data/data_types.h @@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/text/text.h" // For QFIXED_MAX #include "data/data_peer_id.h" #include "data/data_msg_id.h" +#include "base/qt/qt_compare.h" class HistoryItem; using HistoryItemsList = std::vector>; diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h index a439bfc8d..c45d1ee37 100644 --- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h +++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h @@ -84,6 +84,7 @@ public: Window::SectionActionResult sendBotCommand( Bot::SendCommandRequest request) override; + using SectionWidget::confirmSendingFiles; void setInternalState( const QRect &geometry, @@ -221,7 +222,7 @@ private: const QString &insertTextOnCancel = QString()); bool confirmSendingFiles( not_null data, - std::optional overrideSendImagesAsPhotos = std::nullopt, + std::optional overrideSendImagesAsPhotos, const QString &insertTextOnCancel = QString()); bool showSendingFilesError(const Ui::PreparedList &list) const; void sendingFilesConfirmed( diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp index ce1e017b7..1c99c93c2 100644 --- a/Telegram/SourceFiles/window/window_peer_menu.cpp +++ b/Telegram/SourceFiles/window/window_peer_menu.cpp @@ -1615,7 +1615,6 @@ QPointer ShowShareGameBox( const auto confirm = std::make_shared>(); auto send = crl::guard(thread, [=] { ShareBotGame(bot, thread, shortName); - using Way = Window::SectionShow::Way; if (const auto strong = *weak) { strong->closeBox(); } diff --git a/Telegram/lib_base b/Telegram/lib_base index eca70a7b2..7afbe96f0 160000 --- a/Telegram/lib_base +++ b/Telegram/lib_base @@ -1 +1 @@ -Subproject commit eca70a7b2df50c775224116fd3f6eebdf5cc4907 +Subproject commit 7afbe96f015c6facea90de1af5d61eac3389f308 diff --git a/Telegram/lib_webview b/Telegram/lib_webview index 6ee92c066..ef855c732 160000 --- a/Telegram/lib_webview +++ b/Telegram/lib_webview @@ -1 +1 @@ -Subproject commit 6ee92c066c6b75349980670edf795990f26b2f62 +Subproject commit ef855c7325e81c3075ec3213f3ef504cd93edcf6