diff options
Diffstat (limited to 'src/widgets/widgets/qmenubar.cpp')
-rw-r--r-- | src/widgets/widgets/qmenubar.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/widgets/widgets/qmenubar.cpp b/src/widgets/widgets/qmenubar.cpp index ece2a0a9c9..80c6d28e85 100644 --- a/src/widgets/widgets/qmenubar.cpp +++ b/src/widgets/widgets/qmenubar.cpp @@ -75,8 +75,8 @@ class QMenuBarExtension : public QToolButton public: explicit QMenuBarExtension(QWidget *parent); - QSize sizeHint() const Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; + QSize sizeHint() const override; + void paintEvent(QPaintEvent *) override; }; QMenuBarExtension::QMenuBarExtension(QWidget *parent) @@ -1331,7 +1331,7 @@ void QMenuBarPrivate::handleReparent() //Note: if parent is reparented, then window may change even if parent doesn't. // We need to install an avent filter on each parent up to the parent that is // also a window (for shortcuts) - QWidget *newWindow = newParent ? newParent->window() : Q_NULLPTR; + QWidget *newWindow = newParent ? newParent->window() : nullptr; QVector<QPointer<QWidget> > newParents; // Remove event filters on ex-parents, keep them on still-parents @@ -1710,7 +1710,7 @@ void QMenuBarPrivate::_q_internalShortcutActivated(int id) QAction *act = actions.at(id); if (act && act->menu()) { if (QPlatformMenu *platformMenu = act->menu()->platformMenu()) { - platformMenu->showPopup(q->windowHandle(), actionRects.at(id), Q_NULLPTR); + platformMenu->showPopup(q->windowHandle(), actionRects.at(id), nullptr); return; } } |