diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-05-27 10:30:47 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-05-27 10:31:24 +0200 |
| commit | b8d67e082072e177ea095cead00cac365dbaf7c3 (patch) | |
| tree | cc3c3ce9166230403c6a146113bf835bed9325c5 /src/charts/animations/piesliceanimation.cpp | |
| parent | 9e28f427009ee3cd25b4d1a8cd446049d51152a4 (diff) | |
Fix deprecation warnings
Fix warnings:
animations/axisanimation.cpp:117:51: warning: 'QVariant qVariantFromValue(const T&) [with T = QVector<double>]' 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 <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/charts/animations/piesliceanimation.cpp')
| -rw-r--r-- | src/charts/animations/piesliceanimation.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
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) |