summaryrefslogtreecommitdiffstats
path: root/src/charts/animations/baranimation.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/baranimation.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/baranimation.cpp')
-rw-r--r--src/charts/animations/baranimation.cpp6
1 files changed, 3 insertions, 3 deletions
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<QRectF> &oldLayout, const QVector<QRectF>
{
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