From 3640f693694b216346722fcb2e8d134ec3b72eb5 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Wed, 13 Jan 2021 18:20:08 +0300 Subject: [PATCH] Removed redundant argument from action menu item constructor. --- ui/widgets/menu/menu.cpp | 3 +-- ui/widgets/menu/menu_action.cpp | 5 ++--- ui/widgets/menu/menu_action.h | 3 +-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/ui/widgets/menu/menu.cpp b/ui/widgets/menu/menu.cpp index bebd046..246f565 100644 --- a/ui/widgets/menu/menu.cpp +++ b/ui/widgets/menu/menu.cpp @@ -88,8 +88,7 @@ not_null Menu::addAction( _st, std::move(action), icon, - iconOver ? iconOver : icon, - (action->menu() != nullptr)); + iconOver ? iconOver : icon); return addAction(std::move(item)); } diff --git a/ui/widgets/menu/menu_action.cpp b/ui/widgets/menu/menu_action.cpp index 8ca196e..ba37e58 100644 --- a/ui/widgets/menu/menu_action.cpp +++ b/ui/widgets/menu/menu_action.cpp @@ -51,8 +51,7 @@ Action::Action( const style::Menu &st, not_null action, const style::icon *icon, - const style::icon *iconOver, - bool hasSubmenu) + const style::icon *iconOver) : ItemBase(parent, st) , _action(action) , _st(st) @@ -64,7 +63,7 @@ Action::Action( initResizeHook(parent->sizeValue()); processAction(); - setHasSubmenu(hasSubmenu); + setHasSubmenu(action->menu() != nullptr); paintRequest( ) | rpl::start_with_next([=] { diff --git a/ui/widgets/menu/menu_action.h b/ui/widgets/menu/menu_action.h index 37d3d41..2b05922 100644 --- a/ui/widgets/menu/menu_action.h +++ b/ui/widgets/menu/menu_action.h @@ -21,8 +21,7 @@ public: const style::Menu &st, not_null action, const style::icon *icon, - const style::icon *iconOver, - bool hasSubmenu); + const style::icon *iconOver); bool isEnabled() const override; QAction *action() const override;