From 264eb347595cc92a444e3908831d89acef1f05b3 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@trolltech.com>
Date: Thu, 20 Aug 2009 11:58:20 +0200
Subject: Fix QVariant::toFloat() and QVariant::toReal

Reviewed-by: Thierry
---
 src/corelib/kernel/qvariant.cpp      |  4 ++--
 src/corelib/kernel/qvariant.h        |  1 +
 tests/auto/qvariant/tst_qvariant.cpp | 38 +++++++++++++++++++++++++++++++++++-
 3 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp
index 54d6073..533ccd7 100644
--- a/src/corelib/kernel/qvariant.cpp
+++ b/src/corelib/kernel/qvariant.cpp
@@ -2467,7 +2467,7 @@ double QVariant::toDouble(bool *ok) const
 */
 float QVariant::toFloat(bool *ok) const
 {
-    return qNumVariantToHelper<float>(d, handler, ok, d.data.d);
+    return qNumVariantToHelper<float>(d, handler, ok, d.data.f);
 }
 
 /*!
@@ -2484,7 +2484,7 @@ float QVariant::toFloat(bool *ok) const
 */
 qreal QVariant::toReal(bool *ok) const
 {
-    return qNumVariantToHelper<qreal>(d, handler, ok, d.data.d);
+    return qNumVariantToHelper<qreal>(d, handler, ok, d.data.real);
 }
 
 /*!
diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h
index 79bd5b8..d6a704e 100644
--- a/src/corelib/kernel/qvariant.h
+++ b/src/corelib/kernel/qvariant.h
@@ -358,6 +358,7 @@ class Q_CORE_EXPORT QVariant
             bool b;
             double d;
             float f;
+            qreal real;
             qlonglong ll;
             qulonglong ull;
             QObject *o;
diff --git a/tests/auto/qvariant/tst_qvariant.cpp b/tests/auto/qvariant/tst_qvariant.cpp
index 9ad4482..709cba9 100644
--- a/tests/auto/qvariant/tst_qvariant.cpp
+++ b/tests/auto/qvariant/tst_qvariant.cpp
@@ -267,6 +267,8 @@ private slots:
     void convertByteArrayToBool_data() const;
     void toIntFromQString() const;
     void task256984_setValue();
+
+    void numericalConvert();
 };
 
 Q_DECLARE_METATYPE(QDate)
@@ -3060,11 +3062,45 @@ void tst_QVariant::task256984_setValue()
     QVERIFY( !v2.isDetached() );
 
     qVariantSetValue(v2, 3); //set an integer value
-    
+
     QVERIFY( v1.isDetached() );
     QVERIFY( v2.isDetached() );
 }
 
+void tst_QVariant::numericalConvert()
+{
+    QVariant vfloat(float(5.3));
+    QVariant vdouble(double(5.3));
+    QVariant vreal(qreal(5.3));
+    QVariant vint(int(5));
+    QVariant vuint(uint(5));
+    QVariant vshort(short(5));
+    QVariant vlonglong(quint64(5));
+    QVariant vstringint(QString::fromLatin1("5"));
+    QVariant vstring(QString::fromLatin1("5.3"));
+
+    QVector<QVariant *> vect;
+    vect << &vfloat << &vdouble << &vreal << &vint << &vuint << &vshort<< &vlonglong << &vstringint << &vstring;
+
+    for(int i = 0; i < vect.size(); i++) {
+        double num = 5.3;
+        if (i >= 3 && i <= 7)
+            num = 5;
+        QVariant *v = vect.at(i);
+        QCOMPARE(v->toFloat() , float(num));
+        QCOMPARE(float(v->toReal()) , float(num));
+        QCOMPARE(float(v->toDouble()) , float(num));
+        if(i != 8) {
+            QCOMPARE(v->toInt() , int(num));
+            QCOMPARE(v->toUInt() , uint(num));
+            QCOMPARE(v->toULongLong() , quint64(num));
+        }
+        QCOMPARE(v->toString() , QString::number(num));
+    }
+}
+
+
+
 
 QTEST_MAIN(tst_QVariant)
 #include "tst_qvariant.moc"
-- 
cgit v0.12