aboutsummaryrefslogtreecommitdiffstats
path: root/src/templates/qquickstackview_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/templates/qquickstackview_p.h')
-rw-r--r--src/templates/qquickstackview_p.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/templates/qquickstackview_p.h b/src/templates/qquickstackview_p.h
index 6b78b50a..34a430e7 100644
--- a/src/templates/qquickstackview_p.h
+++ b/src/templates/qquickstackview_p.h
@@ -73,7 +73,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickStackView : public QQuickControl
Q_PROPERTY(QQuickTransition *replaceExit READ replaceExit WRITE setReplaceExit NOTIFY replaceExitChanged FINAL)
public:
- explicit QQuickStackView(QQuickItem *parent = Q_NULLPTR);
+ explicit QQuickStackView(QQuickItem *parent = nullptr);
~QQuickStackView();
static QQuickStackAttached *qmlAttachedProperties(QObject *object);
@@ -145,9 +145,9 @@ Q_SIGNALS:
void replaceExitChanged();
protected:
- void componentComplete() Q_DECL_OVERRIDE;
- void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE;
- bool childMouseEventFilter(QQuickItem *, QEvent *) Q_DECL_OVERRIDE;
+ void componentComplete() override;
+ void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
+ bool childMouseEventFilter(QQuickItem *, QEvent *) override;
private:
Q_DISABLE_COPY(QQuickStackView)
@@ -164,7 +164,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickStackAttached : public QObject
Q_PROPERTY(QQuickStackView::Status status READ status NOTIFY statusChanged FINAL)
public:
- explicit QQuickStackAttached(QQuickItem *parent = Q_NULLPTR);
+ explicit QQuickStackAttached(QQuickItem *parent = nullptr);
~QQuickStackAttached();
int index() const;