diff options
| author | Keith Kyzivat <keith.kyzivat@qt.io> | 2021-05-28 16:07:33 -0400 |
|---|---|---|
| committer | Keith Kyzivat <keith.kyzivat@qt.io> | 2021-06-01 13:10:10 -0400 |
| commit | ddbb7743982d47a830283f039b6e85aa8d02e02d (patch) | |
| tree | 2ad80d18b8aae042cc20070b17f287e14030199d /src/charts/axis/chartaxiselement.cpp | |
| parent | 7f3ad23dc6e3703cc1c2cdfa926cefb412b027bb (diff) | |
Rename ChartAxisElement::isEmpty to not collide with QGraphicsLayoutItem
Rename ChartAxisElement::isEmpty so it no longer collides with
QGraphicsLayoutItem::isEmpty, which was introduced in Qt 6.0.
Task-number: QTBUG-92586
Change-Id: I14f062e7a0cb090d7da435edfa22d1c447cc1a13
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/charts/axis/chartaxiselement.cpp')
| -rw-r--r-- | src/charts/axis/chartaxiselement.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/charts/axis/chartaxiselement.cpp b/src/charts/axis/chartaxiselement.cpp index 59bfd734..06d919f4 100644 --- a/src/charts/axis/chartaxiselement.cpp +++ b/src/charts/axis/chartaxiselement.cpp @@ -311,7 +311,7 @@ void ChartAxisElement::handleRangeChanged(qreal min, qreal max) Q_UNUSED(min); Q_UNUSED(max); - if (!isEmpty()) { + if (!emptyAxis()) { const QList<qreal> layout = calculateLayout(); updateLayout(layout); QSizeF before = effectiveSizeHint(Qt::PreferredSize); @@ -335,7 +335,7 @@ void ChartAxisElement::handleReverseChanged(bool reverse) presenter()->layout()->invalidate(); } -bool ChartAxisElement::isEmpty() +bool ChartAxisElement::emptyAxis() const { return axisGeometry().isEmpty() || gridGeometry().isEmpty() |