summaryrefslogtreecommitdiffstats
path: root/src/animations
diff options
context:
space:
mode:
authorJani Honkonen <jani.honkonen@digia.com>2012-11-07 14:13:36 +0200
committerJani Honkonen <jani.honkonen@digia.com>2012-11-07 14:16:07 +0200
commit9223452f638cc6841fcfaf5d83ed05031596aa1e (patch)
treee9243a8b709bf0ed7c2968aa6b1b62af2cd1de59 /src/animations
parent4be689abe33870794f3de2e166f33f202704ae06 (diff)
Fix deprecation errors from Qt5
Diffstat (limited to 'src/animations')
-rw-r--r--src/animations/abstractbaranimation.cpp2
-rw-r--r--src/animations/axisanimation.cpp6
-rw-r--r--src/animations/baranimation.cpp4
-rw-r--r--src/animations/horizontalbaranimation.cpp4
-rw-r--r--src/animations/horizontalpercentbaranimation.cpp4
-rw-r--r--src/animations/horizontalstackedbaranimation.cpp4
-rw-r--r--src/animations/percentbaranimation.cpp4
-rw-r--r--src/animations/piesliceanimation.cpp6
-rw-r--r--src/animations/splineanimation.cpp6
-rw-r--r--src/animations/stackedbaranimation.cpp4
-rw-r--r--src/animations/xyanimation.cpp6
11 files changed, 25 insertions, 25 deletions
diff --git a/src/animations/abstractbaranimation.cpp b/src/animations/abstractbaranimation.cpp
index 2058941e..6635e3d9 100644
--- a/src/animations/abstractbaranimation.cpp
+++ b/src/animations/abstractbaranimation.cpp
@@ -50,7 +50,7 @@ QVariant AbstractBarAnimation::interpolated(const QVariant &from, const QVariant
void AbstractBarAnimation::updateCurrentValue(const QVariant &value)
{
- QVector<QRectF> layout = qVariantValue<QVector<QRectF> >(value);
+ QVector<QRectF> layout = qvariant_cast<QVector<QRectF> >(value);
m_item->setLayout(layout);
}
diff --git a/src/animations/axisanimation.cpp b/src/animations/axisanimation.cpp
index b36a4f6e..9ac5fc21 100644
--- a/src/animations/axisanimation.cpp
+++ b/src/animations/axisanimation.cpp
@@ -113,8 +113,8 @@ void AxisAnimation::setValues(QVector<qreal> &oldLayout, QVector<qreal> &newLayo
QVariant AxisAnimation::interpolated(const QVariant &start, const QVariant &end, qreal progress) const
{
- QVector<qreal> startVector = qVariantValue<QVector<qreal> >(start);
- QVector<qreal> endVecotr = qVariantValue<QVector<qreal> >(end);
+ QVector<qreal> startVector = qvariant_cast<QVector<qreal> >(start);
+ QVector<qreal> endVecotr = qvariant_cast<QVector<qreal> >(end);
QVector<qreal> result;
Q_ASSERT(startVector.count() == endVecotr.count()) ;
@@ -130,7 +130,7 @@ QVariant AxisAnimation::interpolated(const QVariant &start, const QVariant &end,
void AxisAnimation::updateCurrentValue(const QVariant &value)
{
if (state() != QAbstractAnimation::Stopped) { //workaround
- QVector<qreal> vector = qVariantValue<QVector<qreal> >(value);
+ QVector<qreal> vector = qvariant_cast<QVector<qreal> >(value);
Q_ASSERT(vector.count() != 0);
m_axis->setLayout(vector);
m_axis->updateGeometry();
diff --git a/src/animations/baranimation.cpp b/src/animations/baranimation.cpp
index 0e334dae..48b3b064 100644
--- a/src/animations/baranimation.cpp
+++ b/src/animations/baranimation.cpp
@@ -38,8 +38,8 @@ BarAnimation::~BarAnimation()
QVariant BarAnimation::interpolated(const QVariant &from, const QVariant &to, qreal progress) const
{
- QVector<QRectF> startVector = qVariantValue<QVector<QRectF> >(from);
- QVector<QRectF> endVector = qVariantValue<QVector<QRectF> >(to);
+ QVector<QRectF> startVector = qvariant_cast<QVector<QRectF> >(from);
+ QVector<QRectF> endVector = qvariant_cast<QVector<QRectF> >(to);
QVector<QRectF> result;
Q_ASSERT(startVector.count() == endVector.count());
diff --git a/src/animations/horizontalbaranimation.cpp b/src/animations/horizontalbaranimation.cpp
index 375dc2c1..39dd9c38 100644
--- a/src/animations/horizontalbaranimation.cpp
+++ b/src/animations/horizontalbaranimation.cpp
@@ -39,8 +39,8 @@ HorizontalBarAnimation::~HorizontalBarAnimation()
QVariant HorizontalBarAnimation::interpolated(const QVariant &from, const QVariant &to, qreal progress) const
{
- QVector<QRectF> startVector = qVariantValue<QVector<QRectF> >(from);
- QVector<QRectF> endVector = qVariantValue<QVector<QRectF> >(to);
+ QVector<QRectF> startVector = qvariant_cast<QVector<QRectF> >(from);
+ QVector<QRectF> endVector = qvariant_cast<QVector<QRectF> >(to);
QVector<QRectF> result;
Q_ASSERT(startVector.count() == endVector.count());
diff --git a/src/animations/horizontalpercentbaranimation.cpp b/src/animations/horizontalpercentbaranimation.cpp
index 34e39423..13dfa097 100644
--- a/src/animations/horizontalpercentbaranimation.cpp
+++ b/src/animations/horizontalpercentbaranimation.cpp
@@ -39,8 +39,8 @@ HorizontalPercentBarAnimation::~HorizontalPercentBarAnimation()
QVariant HorizontalPercentBarAnimation::interpolated(const QVariant &from, const QVariant &to, qreal progress) const
{
- QVector<QRectF> startVector = qVariantValue<QVector<QRectF> >(from);
- QVector<QRectF> endVector = qVariantValue<QVector<QRectF> >(to);
+ QVector<QRectF> startVector = qvariant_cast<QVector<QRectF> >(from);
+ QVector<QRectF> endVector = qvariant_cast<QVector<QRectF> >(to);
QVector<QRectF> result;
Q_ASSERT(startVector.count() == endVector.count());
diff --git a/src/animations/horizontalstackedbaranimation.cpp b/src/animations/horizontalstackedbaranimation.cpp
index 83593939..5279c0fe 100644
--- a/src/animations/horizontalstackedbaranimation.cpp
+++ b/src/animations/horizontalstackedbaranimation.cpp
@@ -39,8 +39,8 @@ HorizontalStackedBarAnimation::~HorizontalStackedBarAnimation()
QVariant HorizontalStackedBarAnimation::interpolated(const QVariant &from, const QVariant &to, qreal progress) const
{
- QVector<QRectF> startVector = qVariantValue<QVector<QRectF> >(from);
- QVector<QRectF> endVector = qVariantValue<QVector<QRectF> >(to);
+ QVector<QRectF> startVector = qvariant_cast<QVector<QRectF> >(from);
+ QVector<QRectF> endVector = qvariant_cast<QVector<QRectF> >(to);
QVector<QRectF> result;
Q_ASSERT(startVector.count() == endVector.count());
diff --git a/src/animations/percentbaranimation.cpp b/src/animations/percentbaranimation.cpp
index e0ef87c6..ea09d907 100644
--- a/src/animations/percentbaranimation.cpp
+++ b/src/animations/percentbaranimation.cpp
@@ -39,8 +39,8 @@ PercentBarAnimation::~PercentBarAnimation()
QVariant PercentBarAnimation::interpolated(const QVariant &from, const QVariant &to, qreal progress) const
{
- QVector<QRectF> startVector = qVariantValue<QVector<QRectF> >(from);
- QVector<QRectF> endVector = qVariantValue<QVector<QRectF> >(to);
+ QVector<QRectF> startVector = qvariant_cast<QVector<QRectF> >(from);
+ QVector<QRectF> endVector = qvariant_cast<QVector<QRectF> >(to);
QVector<QRectF> result;
Q_ASSERT(startVector.count() == endVector.count());
diff --git a/src/animations/piesliceanimation.cpp b/src/animations/piesliceanimation.cpp
index 03ef6dc9..62713227 100644
--- a/src/animations/piesliceanimation.cpp
+++ b/src/animations/piesliceanimation.cpp
@@ -99,8 +99,8 @@ PieSliceData PieSliceAnimation::currentSliceValue()
QVariant PieSliceAnimation::interpolated(const QVariant &start, const QVariant &end, qreal progress) const
{
- PieSliceData startValue = qVariantValue<PieSliceData>(start);
- PieSliceData endValue = qVariantValue<PieSliceData>(end);
+ PieSliceData startValue = qvariant_cast<PieSliceData>(start);
+ PieSliceData endValue = qvariant_cast<PieSliceData>(end);
PieSliceData result;
result = endValue;
@@ -118,7 +118,7 @@ QVariant PieSliceAnimation::interpolated(const QVariant &start, const QVariant &
void PieSliceAnimation::updateCurrentValue(const QVariant &value)
{
if (state() != QAbstractAnimation::Stopped) { //workaround
- m_currentValue = qVariantValue<PieSliceData>(value);
+ m_currentValue = qvariant_cast<PieSliceData>(value);
m_sliceItem->setLayout(m_currentValue);
}
}
diff --git a/src/animations/splineanimation.cpp b/src/animations/splineanimation.cpp
index 9ef0d988..1a6936c6 100644
--- a/src/animations/splineanimation.cpp
+++ b/src/animations/splineanimation.cpp
@@ -120,8 +120,8 @@ void SplineAnimation::setup(QVector<QPointF> &oldPoints, QVector<QPointF> &newPo
QVariant SplineAnimation::interpolated(const QVariant &start, const QVariant &end, qreal progress) const
{
- SplineVector startPair = qVariantValue< SplineVector >(start);
- SplineVector endPair = qVariantValue< SplineVector >(end);
+ SplineVector startPair = qvariant_cast< SplineVector >(start);
+ SplineVector endPair = qvariant_cast< SplineVector >(end);
SplineVector result;
switch (animationType()) {
@@ -170,7 +170,7 @@ QVariant SplineAnimation::interpolated(const QVariant &start, const QVariant &en
void SplineAnimation::updateCurrentValue(const QVariant &value)
{
if (state() != QAbstractAnimation::Stopped && m_valid) { //workaround
- QPair<QVector<QPointF >, QVector<QPointF > > pair = qVariantValue< QPair< QVector<QPointF>, QVector<QPointF> > >(value);
+ QPair<QVector<QPointF >, QVector<QPointF > > pair = qvariant_cast< QPair< QVector<QPointF>, QVector<QPointF> > >(value);
m_item->setGeometryPoints(pair.first);
m_item->setControlGeometryPoints(pair.second);
m_item->updateGeometry();
diff --git a/src/animations/stackedbaranimation.cpp b/src/animations/stackedbaranimation.cpp
index 45603328..1d9b9e65 100644
--- a/src/animations/stackedbaranimation.cpp
+++ b/src/animations/stackedbaranimation.cpp
@@ -38,8 +38,8 @@ StackedBarAnimation::~StackedBarAnimation()
QVariant StackedBarAnimation::interpolated(const QVariant &from, const QVariant &to, qreal progress) const
{
- QVector<QRectF> startVector = qVariantValue<QVector<QRectF> >(from);
- QVector<QRectF> endVector = qVariantValue<QVector<QRectF> >(to);
+ QVector<QRectF> startVector = qvariant_cast<QVector<QRectF> >(from);
+ QVector<QRectF> endVector = qvariant_cast<QVector<QRectF> >(to);
QVector<QRectF> result;
Q_ASSERT(startVector.count() == endVector.count());
diff --git a/src/animations/xyanimation.cpp b/src/animations/xyanimation.cpp
index 8541cfff..43307479 100644
--- a/src/animations/xyanimation.cpp
+++ b/src/animations/xyanimation.cpp
@@ -88,8 +88,8 @@ void XYAnimation::setup(const QVector<QPointF> &oldPoints, const QVector<QPointF
QVariant XYAnimation::interpolated(const QVariant &start, const QVariant &end, qreal progress) const
{
- QVector<QPointF> startVector = qVariantValue<QVector<QPointF> >(start);
- QVector<QPointF> endVector = qVariantValue<QVector<QPointF> >(end);
+ QVector<QPointF> startVector = qvariant_cast<QVector<QPointF> >(start);
+ QVector<QPointF> endVector = qvariant_cast<QVector<QPointF> >(end);
QVector<QPointF> result;
switch (m_type) {
@@ -125,7 +125,7 @@ void XYAnimation::updateCurrentValue(const QVariant &value)
{
if (state() != QAbstractAnimation::Stopped) { //workaround
- QVector<QPointF> vector = qVariantValue<QVector<QPointF> >(value);
+ QVector<QPointF> vector = qvariant_cast<QVector<QPointF> >(value);
m_item->setGeometryPoints(vector);
m_item->updateGeometry();
m_item->setDirty(true);