diff options
Diffstat (limited to 'src/widgets/widgets/qmenu_p.h')
-rw-r--r-- | src/widgets/widgets/qmenu_p.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/widgets/widgets/qmenu_p.h b/src/widgets/widgets/qmenu_p.h index 5869bc8420..fac58f59ab 100644 --- a/src/widgets/widgets/qmenu_p.h +++ b/src/widgets/widgets/qmenu_p.h @@ -91,7 +91,7 @@ class QMenuSloppyState Q_DISABLE_COPY(QMenuSloppyState) public: QMenuSloppyState() - : m_menu(Q_NULLPTR) + : m_menu(nullptr) , m_enabled(false) , m_uni_directional(false) , m_select_other_actions(false) @@ -101,9 +101,9 @@ public: , m_uni_dir_discarded_count(0) , m_uni_dir_fail_at_count(0) , m_timeout(0) - , m_reset_action(Q_NULLPTR) - , m_origin_action(Q_NULLPTR) - , m_parent(Q_NULLPTR) + , m_reset_action(nullptr) + , m_origin_action(nullptr) + , m_parent(nullptr) { } ~QMenuSloppyState() { reset(); } @@ -186,7 +186,7 @@ public: QSetValueOnDestroy<QPointF> setPreviousPoint(m_previous_point, mousePos); if (resetAction && resetAction->isSeparator()) { - m_reset_action = Q_NULLPTR; + m_reset_action = nullptr; m_use_reset_action = true; } else if (m_reset_action != resetAction) { if (m_use_reset_action && resetAction) { @@ -465,8 +465,8 @@ public: public: enum Type { ScrollUp, ScrollDown }; ScrollerTearOffItem(Type type, QMenuPrivate *mPrivate, - QWidget *parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags()); - void paintEvent(QPaintEvent *e) Q_DECL_OVERRIDE; + QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags()); + void paintEvent(QPaintEvent *e) override; void updateScrollerRects(const QRect &rect); private: |