diff options
| author | Anton Kudryavtsev <a.kudryavtsev@netris.ru> | 2016-10-03 12:44:31 +0300 |
|---|---|---|
| committer | Anton Kudryavtsev <a.kudryavtsev@netris.ru> | 2016-10-06 13:18:29 +0000 |
| commit | d38e849e2fa3f31a5a979157646f3367488866b7 (patch) | |
| tree | 14790a98014109131837fdfc3e2d4233853ad8b6 /src/imports/layouts | |
| parent | 142a56ecb94be24dad7a9bb753b1abd7f2ada3d9 (diff) | |
Imports: add missing 'override'
... and drop redundant 'virtual'
Change-Id: I13246ff07a219d41c9e0fd11fbc6a0b00109912a
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/imports/layouts')
| -rw-r--r-- | src/imports/layouts/qquickgridlayoutengine_p.h | 6 | ||||
| -rw-r--r-- | src/imports/layouts/qquicklinearlayout_p.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/imports/layouts/qquickgridlayoutengine_p.h b/src/imports/layouts/qquickgridlayoutengine_p.h index 86f56a5af4..2810e2e5d0 100644 --- a/src/imports/layouts/qquickgridlayoutengine_p.h +++ b/src/imports/layouts/qquickgridlayoutengine_p.h @@ -67,7 +67,7 @@ public: : QGridLayoutItem(row, column, rowSpan, columnSpan, alignment), m_item(item), sizeHintCacheDirty(true), useFallbackToWidthOrHeight(true) {} - QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const override { Q_UNUSED(constraint); // Quick Layouts does not support constraint atm return effectiveSizeHints()[which]; @@ -99,12 +99,12 @@ public: sizeHintCacheDirty = true; } - QLayoutPolicy::Policy sizePolicy(Qt::Orientation orientation) const + QLayoutPolicy::Policy sizePolicy(Qt::Orientation orientation) const override { return QQuickLayout::effectiveSizePolicy_helper(m_item, orientation, attachedLayoutObject(m_item, false)); } - void setGeometry(const QRectF &rect) + void setGeometry(const QRectF &rect) override { QQuickLayoutAttached *info = attachedLayoutObject(m_item, false); const QRectF r = info ? rect.marginsRemoved(info->qMargins()) : rect; diff --git a/src/imports/layouts/qquicklinearlayout_p.h b/src/imports/layouts/qquicklinearlayout_p.h index 86404f8d79..ca8b867824 100644 --- a/src/imports/layouts/qquicklinearlayout_p.h +++ b/src/imports/layouts/qquicklinearlayout_p.h @@ -158,7 +158,7 @@ public: Flow flow() const; void setFlow(Flow flow); - void insertLayoutItems(); + void insertLayoutItems() override; signals: void columnSpacingChanged(); @@ -200,7 +200,7 @@ public: qreal spacing() const; void setSpacing(qreal spacing); - void insertLayoutItems(); + void insertLayoutItems() override; signals: void spacingChanged(); |