From 8c7217ad5637fa0113e7cd64b7cd9a7796bfd5ed Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 6 Apr 2021 18:53:03 +0400
Subject: [PATCH] Fix build on macOS.

---
 Telegram/SourceFiles/core/ui_integration.cpp              | 4 ----
 Telegram/SourceFiles/core/ui_integration.h                | 2 --
 Telegram/SourceFiles/payments/payments_checkout_process.h | 2 +-
 Telegram/SourceFiles/payments/ui/payments_panel.cpp       | 2 +-
 Telegram/SourceFiles/ui/boxes/country_select_box.cpp      | 3 +--
 Telegram/SourceFiles/ui/boxes/country_select_box.h        | 1 -
 Telegram/lib_ui                                           | 2 +-
 7 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/Telegram/SourceFiles/core/ui_integration.cpp b/Telegram/SourceFiles/core/ui_integration.cpp
index d2cf492b1..fab5b1070 100644
--- a/Telegram/SourceFiles/core/ui_integration.cpp
+++ b/Telegram/SourceFiles/core/ui_integration.cpp
@@ -126,10 +126,6 @@ QString UiIntegration::timeFormat() {
 	return cTimeFormat();
 }
 
-QWidget *UiIntegration::modalWindowParent() {
-	return Core::App().getModalParent();
-}
-
 std::shared_ptr<ClickHandler> UiIntegration::createLinkHandler(
 		const EntityLinkData &data,
 		const std::any &context) {
diff --git a/Telegram/SourceFiles/core/ui_integration.h b/Telegram/SourceFiles/core/ui_integration.h
index 5bdc337a4..2aac9a0aa 100644
--- a/Telegram/SourceFiles/core/ui_integration.h
+++ b/Telegram/SourceFiles/core/ui_integration.h
@@ -46,8 +46,6 @@ public:
 	void startFontsEnd() override;
 	QString timeFormat() override;
 
-	QWidget *modalWindowParent() override;
-
 	std::shared_ptr<ClickHandler> createLinkHandler(
 		const EntityLinkData &data,
 		const std::any &context) override;
diff --git a/Telegram/SourceFiles/payments/payments_checkout_process.h b/Telegram/SourceFiles/payments/payments_checkout_process.h
index b856069d3..46ec38d8f 100644
--- a/Telegram/SourceFiles/payments/payments_checkout_process.h
+++ b/Telegram/SourceFiles/payments/payments_checkout_process.h
@@ -14,7 +14,7 @@ class HistoryItem;
 class PasscodeBox;
 
 namespace Core {
-class CloudPasswordState;
+struct CloudPasswordState;
 } // namespace Core
 
 namespace Main {
diff --git a/Telegram/SourceFiles/payments/ui/payments_panel.cpp b/Telegram/SourceFiles/payments/ui/payments_panel.cpp
index 7b4fdfff0..d3b05b042 100644
--- a/Telegram/SourceFiles/payments/ui/payments_panel.cpp
+++ b/Telegram/SourceFiles/payments/ui/payments_panel.cpp
@@ -130,7 +130,7 @@ void Panel::chooseShippingOption(const ShippingOptions &options) {
 			options.selectedId,
 			&ShippingOption::id);
 		const auto index = (i != end(options.list))
-			? (i - begin(options.list))
+			? int(i - begin(options.list))
 			: -1;
 		const auto group = std::make_shared<RadiobuttonGroup>(index);
 
diff --git a/Telegram/SourceFiles/ui/boxes/country_select_box.cpp b/Telegram/SourceFiles/ui/boxes/country_select_box.cpp
index a31a84fc2..06e81bd83 100644
--- a/Telegram/SourceFiles/ui/boxes/country_select_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/country_select_box.cpp
@@ -91,8 +91,7 @@ CountrySelectBox::CountrySelectBox(QWidget*)
 }
 
 CountrySelectBox::CountrySelectBox(QWidget*, const QString &iso, Type type)
-: _type(type)
-, _select(this, st::defaultMultiSelect, tr::lng_country_ph())
+: _select(this, st::defaultMultiSelect, tr::lng_country_ph())
 , _ownedInner(this, iso, type) {
 }
 
diff --git a/Telegram/SourceFiles/ui/boxes/country_select_box.h b/Telegram/SourceFiles/ui/boxes/country_select_box.h
index 6d90b75e5..810d871fe 100644
--- a/Telegram/SourceFiles/ui/boxes/country_select_box.h
+++ b/Telegram/SourceFiles/ui/boxes/country_select_box.h
@@ -42,7 +42,6 @@ private:
 	void submit();
 	void applyFilterUpdate(const QString &query);
 
-	Type _type = Type::Phones;
 	object_ptr<MultiSelect> _select;
 
 	class Inner;
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 8686905ee..876f0f06d 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 8686905ee40eb8dbe171024e04e41a32069c8add
+Subproject commit 876f0f06dc8eac766aecd695944455eaf577a4b9