summaryrefslogtreecommitdiffstats
path: root/src/charts/animations/axisanimation.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2019-05-27 10:30:47 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2019-05-27 10:31:24 +0200
commitb8d67e082072e177ea095cead00cac365dbaf7c3 (patch)
treecc3c3ce9166230403c6a146113bf835bed9325c5 /src/charts/animations/axisanimation.cpp
parent9e28f427009ee3cd25b4d1a8cd446049d51152a4 (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/axisanimation.cpp')
-rw-r--r--src/charts/animations/axisanimation.cpp6
1 files changed, 3 insertions, 3 deletions
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<qreal> &oldLayout, QVector<qreal> &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);
}