diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-20 17:31:18 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-21 12:26:21 +0000 |
| commit | f4f5e857447d42738b1b60b5c4184f39df2f1593 (patch) | |
| tree | cae2e6a223cb48350b9634c0a04b39847ebc4299 /src/templates/qquickabstractbutton_p.h | |
| parent | 7cad85c2f0930e4f8531a0508c28abdae0f3e0de (diff) | |
C++11 keywords
- Q_NULLPTR -> nullptr
- Q_DECL_OVERRIDE -> override
Change-Id: I8ee65caafd43ab41b6de43835200cac6c8ffa278
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/templates/qquickabstractbutton_p.h')
| -rw-r--r-- | src/templates/qquickabstractbutton_p.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/templates/qquickabstractbutton_p.h b/src/templates/qquickabstractbutton_p.h index e0296dc0..9c0ba134 100644 --- a/src/templates/qquickabstractbutton_p.h +++ b/src/templates/qquickabstractbutton_p.h @@ -69,7 +69,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickAbstractButton : public QQuickControl Q_PROPERTY(QQuickItem *label READ label WRITE setLabel NOTIFY labelChanged FINAL) public: - explicit QQuickAbstractButton(QQuickItem *parent = Q_NULLPTR); + explicit QQuickAbstractButton(QQuickItem *parent = nullptr); ~QQuickAbstractButton(); QString text() const; @@ -121,22 +121,22 @@ Q_SIGNALS: protected: QQuickAbstractButton(QQuickAbstractButtonPrivate &dd, QQuickItem *parent); - void focusOutEvent(QFocusEvent *event) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - void keyReleaseEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseDoubleClickEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseUngrabEvent() Q_DECL_OVERRIDE; - void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE; + void focusOutEvent(QFocusEvent *event) override; + void keyPressEvent(QKeyEvent *event) override; + void keyReleaseEvent(QKeyEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; + void mouseDoubleClickEvent(QMouseEvent *event) override; + void mouseUngrabEvent() override; + void timerEvent(QTimerEvent *event) override; virtual void checkStateSet(); virtual void nextCheckState(); #ifndef QT_NO_ACCESSIBILITY - void accessibilityActiveChanged(bool active) Q_DECL_OVERRIDE; - QAccessible::Role accessibleRole() const Q_DECL_OVERRIDE; + void accessibilityActiveChanged(bool active) override; + QAccessible::Role accessibleRole() const override; #endif private: |