diff options
author | Albert Astals Cid <aacid@kde.org> | 2014-08-09 16:18:01 +0200 |
---|---|---|
committer | Albert Astals Cid <aacid@kde.org> | 2014-08-14 10:58:20 +0200 |
commit | 2f494803578475732dcffcd12fe5ba3b4b1c521b (patch) | |
tree | e0603d0661e45ba95554b99d901e2e08b3557c05 /src/quick/items/qquicktextinput_p.h | |
parent | da9c41a72975db20425a80741da4eb5c0d2dfd65 (diff) |
Add Q_DECL_OVERRIDE
Change-Id: I2e64950aef710f943c3bc50bc9bf8a1f7fb58d28
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Diffstat (limited to 'src/quick/items/qquicktextinput_p.h')
-rw-r--r-- | src/quick/items/qquicktextinput_p.h | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/quick/items/qquicktextinput_p.h b/src/quick/items/qquicktextinput_p.h index 032bfdb3d1..2d5ee11769 100644 --- a/src/quick/items/qquicktextinput_p.h +++ b/src/quick/items/qquicktextinput_p.h @@ -114,7 +114,7 @@ public: QQuickTextInput(QQuickItem * parent=0); ~QQuickTextInput(); - void componentComplete(); + void componentComplete() Q_DECL_OVERRIDE; enum EchoMode {//To match QLineEdit::EchoMode Normal, @@ -253,12 +253,12 @@ public: bool hasAcceptableInput() const; #ifndef QT_NO_IM - QVariant inputMethodQuery(Qt::InputMethodQuery property) const; + QVariant inputMethodQuery(Qt::InputMethodQuery property) const Q_DECL_OVERRIDE; Q_INVOKABLE QVariant inputMethodQuery(Qt::InputMethodQuery query, QVariant argument) const; #endif - QRectF boundingRect() const; - QRectF clipRect() const; + QRectF boundingRect() const Q_DECL_OVERRIDE; + QRectF clipRect() const Q_DECL_OVERRIDE; bool canPaste() const; @@ -323,23 +323,23 @@ Q_SIGNALS: void renderTypeChanged(); protected: - virtual void geometryChanged(const QRectF &newGeometry, - const QRectF &oldGeometry); - - void mousePressEvent(QMouseEvent *event); - void mouseMoveEvent(QMouseEvent *event); - void mouseReleaseEvent(QMouseEvent *event); - void mouseDoubleClickEvent(QMouseEvent *event); - void keyPressEvent(QKeyEvent* ev); + void geometryChanged(const QRectF &newGeometry, + const QRectF &oldGeometry) 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 keyPressEvent(QKeyEvent* ev) Q_DECL_OVERRIDE; #ifndef QT_NO_IM - void inputMethodEvent(QInputMethodEvent *); + void inputMethodEvent(QInputMethodEvent *) Q_DECL_OVERRIDE; #endif - void mouseUngrabEvent(); - bool event(QEvent *e); - void focusOutEvent(QFocusEvent *event); - void focusInEvent(QFocusEvent *event); - void timerEvent(QTimerEvent *event); - QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data); + void mouseUngrabEvent() Q_DECL_OVERRIDE; + bool event(QEvent *e) Q_DECL_OVERRIDE; + void focusOutEvent(QFocusEvent *event) Q_DECL_OVERRIDE; + void focusInEvent(QFocusEvent *event) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE; + QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data) Q_DECL_OVERRIDE; public Q_SLOTS: void selectAll(); |