summaryrefslogtreecommitdiffstats
path: root/src/charts/axis/logvalueaxis/chartlogvalueaxisx.cpp
diff options
context:
space:
mode:
authorDimitrios Apostolou <jimis@qt.io>2021-05-21 01:56:34 +0200
committerDimitrios Apostolou <jimis@qt.io>2021-05-21 15:26:21 +0200
commit255ee83e9e7be131b31ec4efa7256444f9189bdb (patch)
tree6077ed138a1692efcc4f561ec991d2871e5363ba /src/charts/axis/logvalueaxis/chartlogvalueaxisx.cpp
parentf832cf3dc3851503e3e12a65a58f01a29e7b5efa (diff)
Replace qCeil/qFloor with std::ceil/floor
when a qreal result is expected. This avoids unnecessary type conversions and protects against int overflow. Change-Id: I420661e9948100ffbad661411df65906396689f9 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/charts/axis/logvalueaxis/chartlogvalueaxisx.cpp')
-rw-r--r--src/charts/axis/logvalueaxis/chartlogvalueaxisx.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/charts/axis/logvalueaxis/chartlogvalueaxisx.cpp b/src/charts/axis/logvalueaxis/chartlogvalueaxisx.cpp
index ef56a68b..f20c9942 100644
--- a/src/charts/axis/logvalueaxis/chartlogvalueaxisx.cpp
+++ b/src/charts/axis/logvalueaxis/chartlogvalueaxisx.cpp
@@ -56,7 +56,7 @@ QList<qreal> ChartLogValueAxisX::calculateLayout() const
const qreal logMax = std::log10(m_axis->max()) / std::log10(m_axis->base());
const qreal logMin = std::log10(m_axis->min()) / std::log10(m_axis->base());
const qreal leftEdge = qMin(logMin, logMax);
- const qreal ceilEdge = qCeil(leftEdge);
+ const qreal ceilEdge = std::ceil(leftEdge);
const QRectF &gridRect = gridGeometry();
const qreal deltaX = gridRect.width() / qAbs(logMax - logMin);
@@ -101,7 +101,7 @@ QSizeF ChartLogValueAxisX::sizeHint(Qt::SizeHint which, const QSizeF &constraint
// If the high edge sits exactly on the tick value, add a tick
qreal highValue = logMin < logMax ? logMax : logMin;
- if (qFuzzyCompare(highValue, qreal(qCeil(highValue))))
+ if (qFuzzyCompare(highValue, std::ceil(highValue)))
tickCount++;
if (m_axis->max() > m_axis->min() && tickCount > 0)