diff options
Diffstat (limited to 'src/widgets/widgets/qtoolbar.h')
| -rw-r--r-- | src/widgets/widgets/qtoolbar.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/widgets/widgets/qtoolbar.h b/src/widgets/widgets/qtoolbar.h index e0f2d9b073..0253541a2e 100644 --- a/src/widgets/widgets/qtoolbar.h +++ b/src/widgets/widgets/qtoolbar.h @@ -76,8 +76,8 @@ class Q_WIDGETS_EXPORT QToolBar : public QWidget Q_PROPERTY(bool floatable READ isFloatable WRITE setFloatable) public: - explicit QToolBar(const QString &title, QWidget *parent = Q_NULLPTR); - explicit QToolBar(QWidget *parent = Q_NULLPTR); + explicit QToolBar(const QString &title, QWidget *parent = nullptr); + explicit QToolBar(QWidget *parent = nullptr); ~QToolBar(); void setMovable(bool movable); @@ -121,7 +121,7 @@ public: addAction(const QString &text, const Obj *object, Func1 slot) { QAction *result = addAction(text); - connect(result, &QAction::triggered, object, slot); + connect(result, &QAction::triggered, object, std::move(slot)); return result; } // addAction(QString): Connect to a functor or function pointer (without context) @@ -139,7 +139,7 @@ public: addAction(const QIcon &actionIcon, const QString &text, const Obj *object, Func1 slot) { QAction *result = addAction(actionIcon, text); - connect(result, &QAction::triggered, object, slot); + connect(result, &QAction::triggered, object, std::move(slot)); return result; } // addAction(QIcon, QString): Connect to a functor or function pointer (without context) @@ -188,10 +188,10 @@ Q_SIGNALS: void visibilityChanged(bool visible); protected: - void actionEvent(QActionEvent *event) Q_DECL_OVERRIDE; - void changeEvent(QEvent *event) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; - bool event(QEvent *event) Q_DECL_OVERRIDE; + void actionEvent(QActionEvent *event) override; + void changeEvent(QEvent *event) override; + void paintEvent(QPaintEvent *event) override; + bool event(QEvent *event) override; void initStyleOption(QStyleOptionToolBar *option) const; |