From 4325eb2f1bcae2475036e4f23af599f966e143d4 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Thu, 14 Jan 2021 00:07:39 +0300 Subject: [PATCH] Wrapped raw QAction pointers with not_null in menu items. --- ui/widgets/menu/menu_action.cpp | 2 +- ui/widgets/menu/menu_action.h | 2 +- ui/widgets/menu/menu_item_base.h | 2 +- ui/widgets/menu/menu_separator.cpp | 2 +- ui/widgets/menu/menu_separator.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ui/widgets/menu/menu_action.cpp b/ui/widgets/menu/menu_action.cpp index 2a9241a..8035deb 100644 --- a/ui/widgets/menu/menu_action.cpp +++ b/ui/widgets/menu/menu_action.cpp @@ -173,7 +173,7 @@ bool Action::isEnabled() const { return _action->isEnabled(); } -QAction *Action::action() const { +not_null Action::action() const { return _action; } diff --git a/ui/widgets/menu/menu_action.h b/ui/widgets/menu/menu_action.h index 2b05922..c274c03 100644 --- a/ui/widgets/menu/menu_action.h +++ b/ui/widgets/menu/menu_action.h @@ -24,7 +24,7 @@ public: const style::icon *iconOver); bool isEnabled() const override; - QAction *action() const override; + not_null action() const override; protected: QPoint prepareRippleStartPosition() const override; diff --git a/ui/widgets/menu/menu_item_base.h b/ui/widgets/menu/menu_item_base.h index 53d7fb8..d74219c 100644 --- a/ui/widgets/menu/menu_item_base.h +++ b/ui/widgets/menu/menu_item_base.h @@ -39,7 +39,7 @@ public: bool hasSubmenu() const; void setHasSubmenu(bool value); - virtual QAction *action() const = 0; + virtual not_null action() const = 0; virtual bool isEnabled() const = 0; virtual void finishAnimating(); diff --git a/ui/widgets/menu/menu_separator.cpp b/ui/widgets/menu/menu_separator.cpp index cce5e45..a2460b7 100644 --- a/ui/widgets/menu/menu_separator.cpp +++ b/ui/widgets/menu/menu_separator.cpp @@ -37,7 +37,7 @@ Separator::Separator( }, lifetime()); } -QAction *Separator::action() const { +not_null Separator::action() const { return _action; } diff --git a/ui/widgets/menu/menu_separator.h b/ui/widgets/menu/menu_separator.h index c6a3a76..1ff5f6f 100644 --- a/ui/widgets/menu/menu_separator.h +++ b/ui/widgets/menu/menu_separator.h @@ -20,7 +20,7 @@ public: const style::Menu &st, not_null action); - QAction *action() const override; + not_null action() const override; bool isEnabled() const override; protected: