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>

6 files changed, 9 insertions, 9 deletions

diff --git a/src/charts/axis/cartesianchartaxis.cpp b/src/charts/axis/cartesianchartaxis.cpp
index 2bcd31ee..e154bfc1 100644
--- a/src/charts/axis/cartesianchartaxis.cpp
+++ b/src/charts/axis/cartesianchartaxis.cpp
@@ -270,7 +270,7 @@ void CartesianChartAxis::updateLayout(const QList<qreal> &layout)
     }
 }
 
-bool CartesianChartAxis::isEmpty()
+bool CartesianChartAxis::emptyAxis() const
 {
     return axisGeometry().isEmpty()
            || gridGeometry().isEmpty()
@@ -282,7 +282,7 @@ void CartesianChartAxis::setGeometry(const QRectF &axis, const QRectF &grid)
     m_gridRect = grid;
     setAxisGeometry(axis);
 
-    if (isEmpty()) {
+    if (emptyAxis()) {
         prepareGeometryChange();
         return;
     }
diff --git a/src/charts/axis/cartesianchartaxis_p.h b/src/charts/axis/cartesianchartaxis_p.h
index 7851a0a0..e19cb5ee 100644
--- a/src/charts/axis/cartesianchartaxis_p.h
+++ b/src/charts/axis/cartesianchartaxis_p.h
@@ -58,7 +58,7 @@ public:
 
     void setGeometry(const QRectF &axis, const QRectF &grid) override;
     QRectF gridGeometry() const override { return m_gridRect; }
-    bool isEmpty() override;
+    bool emptyAxis() const override;
 
     QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const override;
 
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()
diff --git a/src/charts/axis/chartaxiselement_p.h b/src/charts/axis/chartaxiselement_p.h
index 2a9afe8b..712cfc51 100644
--- a/src/charts/axis/chartaxiselement_p.h
+++ b/src/charts/axis/chartaxiselement_p.h
@@ -67,7 +67,7 @@ public:
 
     virtual QRectF gridGeometry() const = 0;
     virtual void setGeometry(const QRectF &axis, const QRectF &grid) = 0;
-    virtual bool isEmpty() = 0;
+    virtual bool emptyAxis() const = 0;
 
     void setAnimation(AxisAnimation *animation) { m_animation = animation; }
     AxisAnimation *animation() const override { return m_animation; }
diff --git a/src/charts/axis/polarchartaxis.cpp b/src/charts/axis/polarchartaxis.cpp
index 70fd7e73..1e4148f9 100644
--- a/src/charts/axis/polarchartaxis.cpp
+++ b/src/charts/axis/polarchartaxis.cpp
@@ -49,7 +49,7 @@ void PolarChartAxis::setGeometry(const QRectF &axis, const QRectF &grid)
     Q_UNUSED(grid);
     setAxisGeometry(axis);
 
-    if (isEmpty()) {
+    if (emptyAxis()) {
         prepareGeometryChange();
         return;
     }
@@ -103,7 +103,7 @@ void PolarChartAxis::updateLayout(const QList<qreal> &layout)
     }
 }
 
-bool PolarChartAxis::isEmpty()
+bool PolarChartAxis::emptyAxis() const
 {
     return !axisGeometry().isValid() || qFuzzyIsNull(min() - max());
 }
diff --git a/src/charts/axis/polarchartaxis_p.h b/src/charts/axis/polarchartaxis_p.h
index 8220ace3..f7853cf8 100644
--- a/src/charts/axis/polarchartaxis_p.h
+++ b/src/charts/axis/polarchartaxis_p.h
@@ -58,7 +58,7 @@ public:
 
 public: // from ChartAxisElement
     QRectF gridGeometry() const override;
-    bool isEmpty() override;
+    bool emptyAxis() const override;
 
 protected:
     void updateLayout(const QList<qreal> &layout) override;