diff options
Diffstat (limited to 'src/templates/qquicktextfield_p.h')
| -rw-r--r-- | src/templates/qquicktextfield_p.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/templates/qquicktextfield_p.h b/src/templates/qquicktextfield_p.h index 23658cc6..ee5f3470 100644 --- a/src/templates/qquicktextfield_p.h +++ b/src/templates/qquicktextfield_p.h @@ -68,7 +68,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickTextField : public QQuickTextInput Q_PROPERTY(Qt::FocusReason focusReason READ focusReason WRITE setFocusReason NOTIFY focusReasonChanged FINAL) public: - explicit QQuickTextField(QQuickItem *parent = Q_NULLPTR); + explicit QQuickTextField(QQuickItem *parent = nullptr); ~QQuickTextField(); QFont font() const; @@ -93,18 +93,18 @@ Q_SIGNALS: void pressAndHold(QQuickMouseEvent *mouse); protected: - void classBegin() Q_DECL_OVERRIDE; - - void itemChange(ItemChange change, const ItemChangeData &value) Q_DECL_OVERRIDE; - void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE; - QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data) Q_DECL_OVERRIDE; - - void focusInEvent(QFocusEvent *event) Q_DECL_OVERRIDE; - void focusOutEvent(QFocusEvent *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 timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE; + void classBegin() override; + + void itemChange(ItemChange change, const ItemChangeData &value) override; + void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; + QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data) override; + + void focusInEvent(QFocusEvent *event) override; + void focusOutEvent(QFocusEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; + void timerEvent(QTimerEvent *event) override; private: Q_DISABLE_COPY(QQuickTextField) |