From 6d3a6d20b5a0aa46150e184155bf7a370c20021c Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 4 Jul 2017 19:17:44 +0300 Subject: [PATCH] Version 1.1.10: Fix build for Xcode and GCC. --- Telegram/SourceFiles/history/history_admin_log_filter.cpp | 6 ------ .../SourceFiles/profile/profile_block_group_members.cpp | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/Telegram/SourceFiles/history/history_admin_log_filter.cpp b/Telegram/SourceFiles/history/history_admin_log_filter.cpp index 12678afe2..26137b886 100644 --- a/Telegram/SourceFiles/history/history_admin_log_filter.cpp +++ b/Telegram/SourceFiles/history/history_admin_log_filter.cpp @@ -399,12 +399,6 @@ void FilterBox::refreshButtons() { addButton(langFactory(lng_cancel), [this] { closeBox(); }); } -template -QPointer FilterBox::addControl(object_ptr row) { - Expects(_inner != nullptr); - return _inner->addControl(std::move(row)); -} - void FilterBox::resizeToContent() { _inner->resizeToWidth(st::boxWideWidth); setDimensions(_inner->width(), _inner->height()); diff --git a/Telegram/SourceFiles/profile/profile_block_group_members.cpp b/Telegram/SourceFiles/profile/profile_block_group_members.cpp index 705e8dc27..144e8d2d0 100644 --- a/Telegram/SourceFiles/profile/profile_block_group_members.cpp +++ b/Telegram/SourceFiles/profile/profile_block_group_members.cpp @@ -484,7 +484,7 @@ void GroupMembersWidget::setItemFlags(Item *item, ChannelData *megagroup) { } if (item->peer->isSelf()) { item->hasRemoveLink = false; - } else if (megagroup->amCreator() || megagroup->canBanMembers() && ((adminState == AdminState::None) || adminCanEdit)) { + } else if (megagroup->amCreator() || (megagroup->canBanMembers() && ((adminState == AdminState::None) || adminCanEdit))) { item->hasRemoveLink = true; } else { item->hasRemoveLink = false;