Fix build on Xcode.

This commit is contained in:
John Preston 2019-04-23 19:23:13 +04:00
parent 5ab1cd405a
commit 6dd8f32f66
4 changed files with 13 additions and 16 deletions

View File

@ -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);

View File

@ -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) {

View File

@ -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();
}

View File

@ -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