diff options
| author | Sergio Martins <sergio.martins@kdab.com> | 2015-03-19 20:42:25 +0000 |
|---|---|---|
| committer | Sérgio Martins <sergio.martins@kdab.com> | 2015-03-22 19:56:54 +0000 |
| commit | 3ac0be60ce9ed9985e40066ba1c8612125582d35 (patch) | |
| tree | a8ee33d29175f4c26724c760870c97850aede15d /src/layouts | |
| parent | ce835b743d8b9f899af30e0b77edb30e62d1475f (diff) | |
Fix inconsistent overrides. [-Winconsistent-missing-override]
Change-Id: Ib258b56ba7b081c9298b23c814d3b2e4e71258cc
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/layouts')
| -rw-r--r-- | src/layouts/qquicklayout_p.h | 2 | ||||
| -rw-r--r-- | src/layouts/qquicklinearlayout_p.h | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/layouts/qquicklayout_p.h b/src/layouts/qquicklayout_p.h index 3c2d5159d..37f6ca009 100644 --- a/src/layouts/qquicklayout_p.h +++ b/src/layouts/qquicklayout_p.h @@ -69,7 +69,7 @@ public: static QQuickLayoutAttached *qmlAttachedProperties(QObject *object); - void componentComplete(); + void componentComplete() Q_DECL_OVERRIDE; virtual QSizeF sizeHint(Qt::SizeHint whichSizeHint) const = 0; virtual void setAlignment(QQuickItem *item, Qt::Alignment align) = 0; virtual void invalidate(QQuickItem * childItem = 0); diff --git a/src/layouts/qquicklinearlayout_p.h b/src/layouts/qquicklinearlayout_p.h index 0f43badd7..b6483c4ed 100644 --- a/src/layouts/qquicklinearlayout_p.h +++ b/src/layouts/qquicklinearlayout_p.h @@ -65,8 +65,8 @@ public: QQuickItem *parent = 0); ~QQuickGridLayoutBase(); - void componentComplete(); - void invalidate(QQuickItem *childItem = 0); + void componentComplete() Q_DECL_OVERRIDE; + void invalidate(QQuickItem *childItem = 0) Q_DECL_OVERRIDE; Qt::Orientation orientation() const; void setOrientation(Qt::Orientation orientation); QSizeF sizeHint(Qt::SizeHint whichSizeHint) const Q_DECL_OVERRIDE; @@ -80,10 +80,10 @@ protected: QQuickItem *itemAt(int index) const Q_DECL_OVERRIDE; int itemCount() const Q_DECL_OVERRIDE; - void rearrange(const QSizeF &size); + void rearrange(const QSizeF &size) Q_DECL_OVERRIDE; virtual void insertLayoutItems() {} - void itemChange(ItemChange change, const ItemChangeData &data); - void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry); + void itemChange(ItemChange change, const ItemChangeData &data) Q_DECL_OVERRIDE; + void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE; bool shouldIgnoreItem(QQuickItem *child, QQuickLayoutAttached *&info, QSizeF *sizeHints); signals: |