diff options
Diffstat (limited to 'src/widgets/graphicsview/qgraphicsgridlayoutengine_p.h')
| -rw-r--r-- | src/widgets/graphicsview/qgraphicsgridlayoutengine_p.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/widgets/graphicsview/qgraphicsgridlayoutengine_p.h b/src/widgets/graphicsview/qgraphicsgridlayoutengine_p.h index d797f784b8..370df9eed7 100644 --- a/src/widgets/graphicsview/qgraphicsgridlayoutengine_p.h +++ b/src/widgets/graphicsview/qgraphicsgridlayoutengine_p.h @@ -71,35 +71,35 @@ public: Qt::Alignment alignment = 0) : QGridLayoutItem(row, columns, rowSpan, columnSpan, alignment), q_layoutItem(item) {} - virtual QLayoutPolicy::Policy sizePolicy(Qt::Orientation orientation) const Q_DECL_OVERRIDE + virtual QLayoutPolicy::Policy sizePolicy(Qt::Orientation orientation) const override { QSizePolicy sizePolicy(q_layoutItem->sizePolicy()); return (QLayoutPolicy::Policy)((orientation == Qt::Horizontal) ? sizePolicy.horizontalPolicy() : sizePolicy.verticalPolicy()); } - virtual QLayoutPolicy::ControlTypes controlTypes(LayoutSide) const Q_DECL_OVERRIDE + virtual QLayoutPolicy::ControlTypes controlTypes(LayoutSide) const override { const QSizePolicy::ControlType ct = q_layoutItem->sizePolicy().controlType(); return (QLayoutPolicy::ControlTypes)ct; } - virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const Q_DECL_OVERRIDE + virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const override { return q_layoutItem->effectiveSizeHint(which, constraint); } bool isHidden() const; - virtual bool isIgnored() const Q_DECL_OVERRIDE; + virtual bool isIgnored() const override; - virtual void setGeometry(const QRectF &rect) Q_DECL_OVERRIDE + virtual void setGeometry(const QRectF &rect) override { q_layoutItem->setGeometry(rect); } - virtual bool hasDynamicConstraint() const Q_DECL_OVERRIDE; - virtual Qt::Orientation dynamicConstraintOrientation() const Q_DECL_OVERRIDE; + virtual bool hasDynamicConstraint() const override; + virtual Qt::Orientation dynamicConstraintOrientation() const override; QGraphicsLayoutItem *layoutItem() const { return q_layoutItem; } |