Replaced Window::PeerMenuCallback with struct.

Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp

@@ -1771,6 +1771,10 @@ void InnerWidget::contextMenuEvent(QContextMenuEvent *e) {
 			fillArchiveSearchMenu(_menu.get());
 		}
 	} else {
+		const auto addAction = Window::PeerMenuCallback([&](
+				Window::PeerMenuCallback::Args &&a) {
+			return _menu->addAction(a.text, std::move(a.handler), a.icon);
+		});
 		Window::FillDialogsEntryMenu(
 			_controller,
 			Dialogs::EntryState{
@@ -1778,12 +1782,7 @@ void InnerWidget::contextMenuEvent(QContextMenuEvent *e) {
 				.section = Dialogs::EntryState::Section::ChatsList,
 				.filterId = _filterId,
 			},
-			[&](
+			addAction);
-					const QString &text,
-					Fn<void()> callback,
-					const style::icon *icon) {
-				return _menu->addAction(text, std::move(callback), icon);
-			});
 	}
 	QObject::connect(_menu.get(), &QObject::destroyed, [=] {
 		if (_menuRow.key) {

Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp

@@ -315,12 +315,10 @@ void TopBarWidget::showPeerMenu() {
 	if (!created) {
 		return;
 	}
-	const auto addAction = [&](
+	const auto addAction = Window::PeerMenuCallback([&](
-			const QString &text,
+			Window::PeerMenuCallback::Args a) {
-			Fn<void()> callback,
+		return _menu->addAction(a.text, std::move(a.handler), a.icon);
-			const style::icon *icon) {
+	});
-		return _menu->addAction(text, std::move(callback), icon);
-	};
 	Window::FillDialogsEntryMenu(_controller, _activeChat, addAction);
 	if (_menu->empty()) {
 		_menu.destroy();

Telegram/SourceFiles/info/info_wrap_widget.cpp

@@ -515,12 +515,10 @@ void WrapWidget::showTopBarMenu() {
 	});
 	_topBarMenuToggle->installEventFilter(_topBarMenu.get());
 
-	const auto addAction = [=](
+	const auto addAction = Window::PeerMenuCallback([=](
-			const QString &text,
+			Window::PeerMenuCallback::Args a) {
-			Fn<void()> callback,
+		return _topBarMenu->addAction(a.text, std::move(a.handler), a.icon);
-			const style::icon *icon) {
+	});
-		return _topBarMenu->addAction(text, std::move(callback), icon);
-	};
 	if (key().isDownloads()) {
 		addAction(
 			tr::lng_context_delete_all_files(tr::now),

Telegram/SourceFiles/settings/settings_information.cpp

@@ -546,15 +546,13 @@ void SetupAccountsWrap(
 		} else if (which != Qt::RightButton) {
 			return;
 		}
-		const auto addAction = [&](
+		const auto addAction = Window::PeerMenuCallback([&](
-				const QString &text,
+				Window::PeerMenuCallback::Args args) {
-				Fn<void()> callback,
-				const style::icon *icon) {
 			return state->menu->addAction(
-				text,
+				args.text,
-				crl::guard(raw, std::move(callback)),
+				crl::guard(raw, std::move(args.handler)),
-				icon);
+				args.icon);
-		};
+		});
 		if (!state->menu && IsAltShift(raw->clickModifiers())) {
 			state->menu = base::make_unique_q<Ui::PopupMenu>(
 				raw,

Telegram/SourceFiles/window/window_filters_menu.cpp

@@ -310,15 +310,13 @@ void FiltersMenu::showMenu(QPoint position, FilterId id) {
 	_popupMenu = base::make_unique_q<Ui::PopupMenu>(
 		i->second.get(),
 		st::popupMenuWithIcons);
-	const auto addAction = [&](
+	const auto addAction = Window::PeerMenuCallback([&](
-			const QString &text,
+			Window::PeerMenuCallback::Args args) {
-			Fn<void()> callback,
-			const style::icon *icon) {
 		return _popupMenu->addAction(
-			text,
+			args.text,
-			crl::guard(&_outer, std::move(callback)),
+			crl::guard(&_outer, std::move(args.handler)),
-			icon);
+			args.icon);
-	};
+	});
 
 	addAction(
 		tr::lng_filters_context_edit(tr::now),

Telegram/SourceFiles/window/window_main_menu.cpp

@@ -475,15 +475,13 @@ void MainMenu::setupArchive() {
 		_contextMenu = base::make_unique_q<Ui::PopupMenu>(
 			this,
 			st::popupMenuWithIcons);
-		const auto addAction = [&](
+		const auto addAction = PeerMenuCallback([&](
-				const QString &text,
+				PeerMenuCallback::Args a) {
-				Fn<void()> callback,
-				const style::icon *icon) {
 			return _contextMenu->addAction(
-				text,
+				a.text,
-				std::move(callback),
+				std::move(a.handler),
-				icon);
+				a.icon);
-		};
+		});
 
 		const auto hide = [=] {
 			controller->session().settings().setArchiveInMainMenu(false);

Telegram/SourceFiles/window/window_peer_menu.h

@@ -38,10 +38,31 @@ class SessionNavigation;
 
 extern const char kOptionViewProfileInChatsListContextMenu[];
 
-using PeerMenuCallback = Fn<QAction*(
+struct PeerMenuCallback {
+public:
+	struct Args {
+		const QString &text;
+		Fn<void()> handler;
+		const style::icon *icon;
+	};
+	using Callback = Fn<QAction*(Args&&)>;
+
+	explicit PeerMenuCallback(Callback callback)
+	: callback(std::move(callback)) {
+	}
+
+	QAction *operator()(Args &&args) const {
+		return callback(std::move(args));
+	}
+	QAction *operator()(
 			const QString &text,
 			Fn<void()> handler,
-	const style::icon *icon)>;
+			const style::icon *icon) const {
+		return callback({ text, std::move(handler), icon });
+	}
+private:
+	Callback callback;
+};
 
 void FillDialogsEntryMenu(
 	not_null<SessionController*> controller,