From 6dd8f32f669703d8449036f522b1c56db3609160 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 23 Apr 2019 19:23:13 +0400
Subject: [PATCH] Fix build on Xcode.

---
 Telegram/SourceFiles/apiwrap.cpp               |  7 ++-----
 .../dialogs/dialogs_pinned_list.cpp            |  2 +-
 Telegram/SourceFiles/mainwidget.cpp            |  2 +-
 .../SourceFiles/window/window_peer_menu.cpp    | 18 +++++++++---------
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index 483c1a958..0de22d61a 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -921,7 +921,7 @@ void ApiWrap::requestMoreBlockedByDateDialogs() {
 	_dialogsLoadTill = _dialogsLoadState->offsetDate
 		? (_dialogsLoadState->offsetDate - max)
 		: (unixtime() - max);
-	requestDialogs(FolderId(0));
+	requestDialogs();
 }
 
 rpl::producer<bool> ApiWrap::dialogsLoadMayBlockByDate() const {
@@ -1038,10 +1038,7 @@ void ApiWrap::applyPeerDialogs(const MTPmessages_PeerDialogs &dialogs) {
 	for (const auto &dialog : data.vdialogs.v) {
 		dialog.match([&](const MTPDdialog &data) {
 			if (const auto peerId = peerFromMTP(data.vpeer)) {
-				const auto requestFolderId = FolderId(0);
-				_session->data().history(peerId)->applyDialog(
-					requestFolderId,
-					data);
+				_session->data().history(peerId)->applyDialog(nullptr, data);
 			}
 		}, [&](const MTPDdialogFolder &data) {
 			const auto folder = _session->data().processFolder(data.vfolder);
diff --git a/Telegram/SourceFiles/dialogs/dialogs_pinned_list.cpp b/Telegram/SourceFiles/dialogs/dialogs_pinned_list.cpp
index d98ebf861..5338bab76 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_pinned_list.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_pinned_list.cpp
@@ -58,7 +58,7 @@ void PinnedList::setPinned(const Key &key, bool pinned) {
 			}
 		}
 	} else if (const auto it = ranges::find(_data, key); it != end(_data)) {
-		const auto index = (it - begin(_data));
+		const auto index = int(it - begin(_data));
 		_data.erase(it);
 		key.entry()->cachePinnedIndex(0);
 		for (auto i = index, count = int(size(_data)); i != count; ++i) {
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index e55260b89..3a37e72db 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -2931,7 +2931,7 @@ void MainWidget::gotState(const MTPupdates_State &state) {
 	_noUpdatesTimer.callOnce(kNoUpdatesTimeout);
 	_ptsWaiter.setRequesting(false);
 
-	session().api().requestDialogs(FolderId(0));
+	session().api().requestDialogs();
 	updateOnline();
 }
 
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index ac9e25a82..6c6ae75a7 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -87,10 +87,10 @@ private:
 	//void addNotifications();
 	//void addUngroup();
 
-	not_null<Controller*> _controller;
-	not_null<Data::Folder*> _folder;
-	const PeerMenuCallback &_addAction;
-	PeerMenuSource _source;
+	//not_null<Controller*> _controller;
+	//not_null<Data::Folder*> _folder;
+	//const PeerMenuCallback &_addAction;
+	//PeerMenuSource _source;
 
 };
 
@@ -509,11 +509,11 @@ FolderFiller::FolderFiller(
 	not_null<Controller*> controller,
 	not_null<Data::Folder*> folder,
 	const PeerMenuCallback &addAction,
-	PeerMenuSource source)
-: _controller(controller)
-, _folder(folder)
-, _addAction(addAction)
-, _source(source) {
+	PeerMenuSource source) {
+//: _controller(controller)
+//, _folder(folder)
+//, _addAction(addAction)
+//, _source(source) {
 }
 
 void FolderFiller::fill() { // #TODO archive