From b337d5462339906426c69b3c608f4d7320e13a7b Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 21 Nov 2017 15:59:18 +0400 Subject: [PATCH] Use custom base::overload() helper. --- Telegram/SourceFiles/apiwrap.cpp | 3 +- Telegram/SourceFiles/base/overload.h | 102 ++++++++++++++++++ .../history/history_admin_log_inner.cpp | 3 +- .../history/history_admin_log_item.cpp | 5 +- .../profile/profile_channel_controllers.cpp | 5 +- Telegram/SourceFiles/rpl/lifetime.h | 4 +- .../SourceFiles/window/window_peer_menu.cpp | 2 +- Telegram/gyp/telegram_sources.txt | 1 + 8 files changed, 116 insertions(+), 9 deletions(-) create mode 100644 Telegram/SourceFiles/base/overload.h diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp index 35fb935ab..2d67839a0 100644 --- a/Telegram/SourceFiles/apiwrap.cpp +++ b/Telegram/SourceFiles/apiwrap.cpp @@ -24,6 +24,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "data/data_photo.h" #include "data/data_web_page.h" #include "core/tl_help.h" +#include "base/overload.h" #include "observer_peer.h" #include "lang/lang_keys.h" #include "application.h" @@ -1716,7 +1717,7 @@ void ApiWrap::parseChannelParticipants( const MTPchannels_ChannelParticipants &result, base::lambda &list)> callbackList, base::lambda callbackNotModified) { - TLHelp::VisitChannelParticipants(result, ranges::overload([&]( + TLHelp::VisitChannelParticipants(result, base::overload([&]( const MTPDchannels_channelParticipants &data) { App::feedUsers(data.vusers); if (callbackList) { diff --git a/Telegram/SourceFiles/base/overload.h b/Telegram/SourceFiles/base/overload.h new file mode 100644 index 000000000..f837f255b --- /dev/null +++ b/Telegram/SourceFiles/base/overload.h @@ -0,0 +1,102 @@ +/* +This file is part of Telegram Desktop, +the official desktop version of Telegram messaging app, see https://telegram.org + +Telegram Desktop is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +It is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +In addition, as a special exception, the copyright holders give permission +to link the code of portions of this program with the OpenSSL library. + +Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE +Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org +*/ +#pragma once + +namespace base { +namespace details { + +// This implementation was taken from range-v3 library. +// It was modified so that more than one of passed function objects +// could be called with an argument list and the first one that +// matches gets used instead of a compile-time ambiguity error. +// +// This allows to write "default" visitor handlers with [](auto&&) syntax. + +template +constexpr bool is_callable_v = rpl::details::is_callable_plain_v; + +template +struct overloaded; + +template <> +struct overloaded<> { +}; + +template +struct overloaded + : private First + , private overloaded { + +private: + using Others = overloaded; + +public: + overloaded() = default; + + constexpr overloaded(First first, Rest... rest) + : First(std::move(first)) + , Others(std::move(rest)...) { + } + + template + auto operator()(Args&&... args) + -> decltype(std::declval()(std::forward(args)...)) { + return static_cast(*this)(std::forward(args)...); + } + + template + auto operator()(Args&&... args) const + -> decltype(std::declval()(std::forward(args)...)) { + return static_cast(*this)(std::forward(args)...); + } + + template < + typename... Args, + typename = std::enable_if_t>> + auto operator()(Args&&... args) + -> decltype(std::declval()(std::forward(args)...)) { + return static_cast(*this)(std::forward(args)...); + } + + template < + typename... Args, + typename = std::enable_if_t>> + auto operator()(Args&&... args) const + -> decltype(std::declval()(std::forward(args)...)) { + return static_cast(*this)(std::forward(args)...); + } + +}; + +} // namespace details + +template +Function overload(Function &&function) { + return std::forward(function); +} + +template 1)>> +auto overload(Functions ...functions) { + return details::overloaded(std::move(functions)...); +} + +} // namespace base + diff --git a/Telegram/SourceFiles/history/history_admin_log_inner.cpp b/Telegram/SourceFiles/history/history_admin_log_inner.cpp index 532014cf1..4429dce08 100644 --- a/Telegram/SourceFiles/history/history_admin_log_inner.cpp +++ b/Telegram/SourceFiles/history/history_admin_log_inner.cpp @@ -36,6 +36,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/widgets/popup_menu.h" #include "core/file_utilities.h" #include "core/tl_help.h" +#include "base/overload.h" #include "lang/lang_keys.h" #include "boxes/edit_participant_box.h" @@ -351,7 +352,7 @@ void InnerWidget::requestAdmins() { MTP_int(kMaxChannelAdmins), MTP_int(participantsHash) )).done([this](const MTPchannels_ChannelParticipants &result) { - auto readCanEdit = ranges::overload([](const MTPDchannelParticipantAdmin &v) { + auto readCanEdit = base::overload([](const MTPDchannelParticipantAdmin &v) { return v.is_can_edit(); }, [](auto &&) { return false; diff --git a/Telegram/SourceFiles/history/history_admin_log_item.cpp b/Telegram/SourceFiles/history/history_admin_log_item.cpp index 138ccaa99..b852139c7 100644 --- a/Telegram/SourceFiles/history/history_admin_log_item.cpp +++ b/Telegram/SourceFiles/history/history_admin_log_item.cpp @@ -26,6 +26,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "lang/lang_keys.h" #include "boxes/sticker_set_box.h" #include "core/tl_help.h" +#include "base/overload.h" #include "messenger.h" namespace AdminLog { @@ -212,7 +213,7 @@ auto GenerateParticipantChangeTextInner( const MTPChannelParticipant *oldParticipant) { auto oldType = oldParticipant ? oldParticipant->type() : 0; - auto readResult = ranges::overload([](const MTPDchannelParticipantCreator &data) { + auto readResult = base::overload([&](const MTPDchannelParticipantCreator &data) { // No valid string here :( return lng_admin_log_invited__generic( lt_user, @@ -234,7 +235,7 @@ auto GenerateParticipantChangeTextInner( (oldType == mtpc_channelParticipantBanned) ? &oldParticipant->c_channelParticipantBanned().vbanned_rights : nullptr); - }, [&](auto &&data) { + }, [&](const auto &data) { auto user = GenerateUserString(data.vuser_id); if (oldType == mtpc_channelParticipantAdmin) { return GenerateAdminChangeText( diff --git a/Telegram/SourceFiles/profile/profile_channel_controllers.cpp b/Telegram/SourceFiles/profile/profile_channel_controllers.cpp index 5b2b21a18..a1ec08297 100644 --- a/Telegram/SourceFiles/profile/profile_channel_controllers.cpp +++ b/Telegram/SourceFiles/profile/profile_channel_controllers.cpp @@ -25,6 +25,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "boxes/confirm_box.h" #include "boxes/add_contact_box.h" #include "core/tl_help.h" +#include "base/overload.h" #include "auth_session.h" #include "apiwrap.h" #include "lang/lang_keys.h" @@ -1080,7 +1081,7 @@ void ParticipantsBoxSearchController::searchDone( } _requestId = 0; - TLHelp::VisitChannelParticipants(result, ranges::overload([&]( + TLHelp::VisitChannelParticipants(result, base::overload([&]( const MTPDchannels_channelParticipants &data) { auto &list = data.vparticipants.v; if (list.size() < requestedCount) { @@ -1716,7 +1717,7 @@ void AddParticipantBoxSearchController::searchParticipantsDone(mtpRequestId requ return; } _requestId = 0; - TLHelp::VisitChannelParticipants(result, ranges::overload([&]( + TLHelp::VisitChannelParticipants(result, base::overload([&]( const MTPDchannels_channelParticipants &data) { auto &list = data.vparticipants.v; if (list.size() < requestedCount) { diff --git a/Telegram/SourceFiles/rpl/lifetime.h b/Telegram/SourceFiles/rpl/lifetime.h index 41a1b6505..6e2cd7cda 100644 --- a/Telegram/SourceFiles/rpl/lifetime.h +++ b/Telegram/SourceFiles/rpl/lifetime.h @@ -52,9 +52,9 @@ public: template Type *make_state(Args&& ...args) { auto result = new Type(std::forward(args)...); - add([result]() mutable { + add([result] { static_assert(sizeof(Type) > 0, "Can't delete unknown type."); - delete details::take(result); + delete result; }); return result; } diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp index 62de9863e..c716b0e14 100644 --- a/Telegram/SourceFiles/window/window_peer_menu.cpp +++ b/Telegram/SourceFiles/window/window_peer_menu.cpp @@ -510,7 +510,7 @@ void PeerMenuAddChannelMembers(not_null channel) { return App::userLoaded(userId); }) | ranges::view::filter([](UserData *user) { return (user != nullptr); - }); + }) | ranges::to_vector; AddParticipantsBoxController::Start( channel, diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt index b67c5c5e4..d67e2fc18 100644 --- a/Telegram/gyp/telegram_sources.txt +++ b/Telegram/gyp/telegram_sources.txt @@ -14,6 +14,7 @@ <(src_loc)/base/ordered_set.h <(src_loc)/base/openssl_help.h <(src_loc)/base/optional.h +<(src_loc)/base/overload.h <(src_loc)/base/parse_helper.cpp <(src_loc)/base/parse_helper.h <(src_loc)/base/qthelp_regex.h