From b8d67e082072e177ea095cead00cac365dbaf7c3 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 27 May 2019 10:30:47 +0200 Subject: Fix deprecation warnings Fix warnings: animations/axisanimation.cpp:117:51: warning: 'QVariant qVariantFromValue(const T&) [with T = QVector]' is deprecated: Use QVariant::fromValue() instead. [-Wdeprecated-declarations] ... axis/chartaxiselement.cpp:385:64: warning: 'QString& QString::sprintf(const char*, ...)' is deprecated: Use asprintf(), arg() or QTextStream instead [-Wdeprecated-declarations] ... Change-Id: Ib36d7e09b737110323b816442b36ca2b2e79d6a5 Reviewed-by: Miikka Heikkinen --- src/charts/animations/axisanimation.cpp | 6 +++--- src/charts/animations/baranimation.cpp | 6 +++--- src/charts/animations/boxwhiskersanimation.cpp | 10 +++++----- src/charts/animations/candlestickbodywicksanimation.cpp | 10 +++++----- src/charts/animations/piesliceanimation.cpp | 10 +++++----- src/charts/animations/splineanimation.cpp | 6 +++--- src/charts/animations/xyanimation.cpp | 6 +++--- src/charts/axis/chartaxiselement.cpp | 6 +++--- 8 files changed, 30 insertions(+), 30 deletions(-) (limited to 'src') diff --git a/src/charts/animations/axisanimation.cpp b/src/charts/animations/axisanimation.cpp index b2f2c496..a5db92e0 100644 --- a/src/charts/animations/axisanimation.cpp +++ b/src/charts/animations/axisanimation.cpp @@ -113,8 +113,8 @@ void AxisAnimation::setValues(QVector &oldLayout, QVector &newLayo QVariantAnimation::KeyValues value; setKeyValues(value); //workaround for wrong interpolation call - setKeyValueAt(0.0, qVariantFromValue(oldLayout)); - setKeyValueAt(1.0, qVariantFromValue(newLayout)); + setKeyValueAt(0.0, QVariant::fromValue(oldLayout)); + setKeyValueAt(1.0, QVariant::fromValue(newLayout)); } QVariant AxisAnimation::interpolated(const QVariant &start, const QVariant &end, qreal progress) const @@ -129,7 +129,7 @@ QVariant AxisAnimation::interpolated(const QVariant &start, const QVariant &end, qreal value = startVector[i] + ((endVecotr[i] - startVector[i]) * progress); result << value; } - return qVariantFromValue(result); + return QVariant::fromValue(result); } diff --git a/src/charts/animations/baranimation.cpp b/src/charts/animations/baranimation.cpp index a7752272..9ab942fb 100644 --- a/src/charts/animations/baranimation.cpp +++ b/src/charts/animations/baranimation.cpp @@ -65,7 +65,7 @@ QVariant BarAnimation::interpolated(const QVariant &from, const QVariant &to, qr QRectF value(QPointF(x1, y1), QPointF(x2, y2)); result << value.normalized(); } - return qVariantFromValue(result); + return QVariant::fromValue(result); } void BarAnimation::updateCurrentValue(const QVariant &value) @@ -81,8 +81,8 @@ void BarAnimation::setup(const QVector &oldLayout, const QVector { QVariantAnimation::KeyValues value; setKeyValues(value); //workaround for wrong interpolation call - setKeyValueAt(0.0, qVariantFromValue(oldLayout)); - setKeyValueAt(1.0, qVariantFromValue(newLayout)); + setKeyValueAt(0.0, QVariant::fromValue(oldLayout)); + setKeyValueAt(1.0, QVariant::fromValue(newLayout)); } QT_CHARTS_END_NAMESPACE diff --git a/src/charts/animations/boxwhiskersanimation.cpp b/src/charts/animations/boxwhiskersanimation.cpp index 141fadd8..8bb5c25e 100644 --- a/src/charts/animations/boxwhiskersanimation.cpp +++ b/src/charts/animations/boxwhiskersanimation.cpp @@ -84,7 +84,7 @@ QVariant BoxWhiskersAnimation::interpolated(const QVariant &from, const QVariant result.m_seriesIndex = endData.m_seriesIndex; result.m_seriesCount = endData.m_seriesCount; - return qVariantFromValue(result); + return QVariant::fromValue(result); } void BoxWhiskersAnimation::updateCurrentValue(const QVariant &value) @@ -95,8 +95,8 @@ void BoxWhiskersAnimation::updateCurrentValue(const QVariant &value) void BoxWhiskersAnimation::setup(const BoxWhiskersData &startData, const BoxWhiskersData &endData) { - setKeyValueAt(0.0, qVariantFromValue(startData)); - setKeyValueAt(1.0, qVariantFromValue(endData)); + setKeyValueAt(0.0, QVariant::fromValue(startData)); + setKeyValueAt(1.0, QVariant::fromValue(endData)); } void BoxWhiskersAnimation::setEndData(const BoxWhiskersData &endData) @@ -104,7 +104,7 @@ void BoxWhiskersAnimation::setEndData(const BoxWhiskersData &endData) if (state() != QAbstractAnimation::Stopped) stop(); - setEndValue(qVariantFromValue(endData)); + setEndValue(QVariant::fromValue(endData)); } void BoxWhiskersAnimation::setStartData(const BoxWhiskersData &endData) @@ -112,7 +112,7 @@ void BoxWhiskersAnimation::setStartData(const BoxWhiskersData &endData) if (state() != QAbstractAnimation::Stopped) stop(); - setStartValue(qVariantFromValue(endData)); + setStartValue(QVariant::fromValue(endData)); } QT_CHARTS_END_NAMESPACE diff --git a/src/charts/animations/candlestickbodywicksanimation.cpp b/src/charts/animations/candlestickbodywicksanimation.cpp index 7e9be617..aae5c0ff 100644 --- a/src/charts/animations/candlestickbodywicksanimation.cpp +++ b/src/charts/animations/candlestickbodywicksanimation.cpp @@ -58,8 +58,8 @@ CandlestickBodyWicksAnimation::~CandlestickBodyWicksAnimation() void CandlestickBodyWicksAnimation::setup(const CandlestickData &startData, const CandlestickData &endData) { - setKeyValueAt(0.0, qVariantFromValue(startData)); - setKeyValueAt(1.0, qVariantFromValue(endData)); + setKeyValueAt(0.0, QVariant::fromValue(startData)); + setKeyValueAt(1.0, QVariant::fromValue(endData)); } void CandlestickBodyWicksAnimation::setStartData(const CandlestickData &startData) @@ -67,7 +67,7 @@ void CandlestickBodyWicksAnimation::setStartData(const CandlestickData &startDat if (state() != QAbstractAnimation::Stopped) stop(); - setStartValue(qVariantFromValue(startData)); + setStartValue(QVariant::fromValue(startData)); } void CandlestickBodyWicksAnimation::setEndData(const CandlestickData &endData) @@ -75,7 +75,7 @@ void CandlestickBodyWicksAnimation::setEndData(const CandlestickData &endData) if (state() != QAbstractAnimation::Stopped) stop(); - setEndValue(qVariantFromValue(endData)); + setEndValue(QVariant::fromValue(endData)); } void CandlestickBodyWicksAnimation::updateCurrentValue(const QVariant &value) @@ -104,7 +104,7 @@ QVariant CandlestickBodyWicksAnimation::interpolated(const QVariant &from, const result.m_high = median + progress * (endData.m_high - median); } - return qVariantFromValue(result); + return QVariant::fromValue(result); } QT_CHARTS_END_NAMESPACE diff --git a/src/charts/animations/piesliceanimation.cpp b/src/charts/animations/piesliceanimation.cpp index c2c17bc1..2efc0882 100644 --- a/src/charts/animations/piesliceanimation.cpp +++ b/src/charts/animations/piesliceanimation.cpp @@ -85,8 +85,8 @@ void PieSliceAnimation::setValue(const PieSliceData &startValue, const PieSliceD m_currentValue = startValue; - setKeyValueAt(0.0, qVariantFromValue(startValue)); - setKeyValueAt(1.0, qVariantFromValue(endValue)); + setKeyValueAt(0.0, QVariant::fromValue(startValue)); + setKeyValueAt(1.0, QVariant::fromValue(endValue)); } void PieSliceAnimation::updateValue(const PieSliceData &endValue) @@ -94,8 +94,8 @@ void PieSliceAnimation::updateValue(const PieSliceData &endValue) if (state() != QAbstractAnimation::Stopped) stop(); - setKeyValueAt(0.0, qVariantFromValue(m_currentValue)); - setKeyValueAt(1.0, qVariantFromValue(endValue)); + setKeyValueAt(0.0, QVariant::fromValue(m_currentValue)); + setKeyValueAt(1.0, QVariant::fromValue(endValue)); } PieSliceData PieSliceAnimation::currentSliceValue() @@ -123,7 +123,7 @@ QVariant PieSliceAnimation::interpolated(const QVariant &start, const QVariant & result.m_sliceBrush = linearPos(startValue.m_sliceBrush, endValue.m_sliceBrush, progress); result.m_holeRadius = linearPos(startValue.m_holeRadius, endValue.m_holeRadius, progress); - return qVariantFromValue(result); + return QVariant::fromValue(result); } void PieSliceAnimation::updateCurrentValue(const QVariant &value) diff --git a/src/charts/animations/splineanimation.cpp b/src/charts/animations/splineanimation.cpp index 555c76dd..bc625532 100644 --- a/src/charts/animations/splineanimation.cpp +++ b/src/charts/animations/splineanimation.cpp @@ -119,8 +119,8 @@ void SplineAnimation::setup(QVector &oldPoints, QVector &newPo } - setKeyValueAt(0.0, qVariantFromValue(m_oldSpline)); - setKeyValueAt(1.0, qVariantFromValue(m_newSpline)); + setKeyValueAt(0.0, QVariant::fromValue(m_oldSpline)); + setKeyValueAt(1.0, QVariant::fromValue(m_newSpline)); m_valid = true; @@ -173,7 +173,7 @@ QVariant SplineAnimation::interpolated(const QVariant &start, const QVariant &en break; } - return qVariantFromValue(result); + return QVariant::fromValue(result); } void SplineAnimation::updateCurrentValue(const QVariant &value) diff --git a/src/charts/animations/xyanimation.cpp b/src/charts/animations/xyanimation.cpp index b96bf7f6..4cfa5972 100644 --- a/src/charts/animations/xyanimation.cpp +++ b/src/charts/animations/xyanimation.cpp @@ -97,8 +97,8 @@ void XYAnimation::setup(const QVector &oldPoints, const QVectorlocalizeNumbers()) retVal = preStr + presenter()->locale().toString(qint64(value)) + postStr; else - retVal = QString().sprintf(array, qint64(value)); + retVal = QString::asprintf(array.constData(), qint64(value)); } else if (formatSpec.at(0) == QLatin1Char('u') || formatSpec.at(0) == QLatin1Char('o') || formatSpec.at(0) == QLatin1Char('x') || formatSpec.at(0) == QLatin1Char('X')) { // These formats are not supported by localized numbers - retVal = QString().sprintf(array, quint64(value)); + retVal = QString::asprintf(array.constData(), quint64(value)); } else if (formatSpec.at(0) == QLatin1Char('f') || formatSpec.at(0) == QLatin1Char('F') || formatSpec.at(0) == QLatin1Char('e') @@ -401,7 +401,7 @@ QString ChartAxisElement::formatLabel(const QString &formatSpec, const QByteArra precision) + postStr; } else { - retVal = QString().sprintf(array, value); + retVal = QString::asprintf(array.constData(), value); } } } -- cgit v1.2.3