Add support for comparing value-type properties

This commit allows value-types to be compared with each other and
with variants.  It also adds a toString() function for each value
type, to allow conversion to (and comparison with) string.

Task-number: QTBUG-14731
Change-Id: I5bde2820917b2fe19b581724977398680617de34
Reviewed-on: http://codereview.qt.nokia.com/1636
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>

1 files changed, 229 insertions, 0 deletions

diff --git a/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp b/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp
index aa4c014d99..5869310ef6 100644
--- a/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp
+++ b/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp
@@ -134,6 +134,26 @@ void tst_qdeclarativevaluetypes::point()
 
         delete object;
     }
+
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("point_compare.qml"));
+        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QString tostring = QLatin1String("QPoint(10, 4)");
+        QCOMPARE(object->property("tostring").toString(), tostring);
+        QCOMPARE(object->property("equalsString").toBool(), true);
+        QCOMPARE(object->property("equalsColor").toBool(), false);
+        QCOMPARE(object->property("equalsVector3d").toBool(), false);
+        QCOMPARE(object->property("equalsSize").toBool(), false);
+        QCOMPARE(object->property("equalsPoint").toBool(), true);
+        QCOMPARE(object->property("equalsRect").toBool(), false);
+        QCOMPARE(object->property("equalsSelf").toBool(), true);
+        QCOMPARE(object->property("equalsOther").toBool(), false);
+        QCOMPARE(object->property("pointEqualsPointf").toBool(), true);
+
+        delete object;
+    }
 }
 
 void tst_qdeclarativevaluetypes::pointf()
@@ -159,6 +179,26 @@ void tst_qdeclarativevaluetypes::pointf()
 
         delete object;
     }
+
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("pointf_compare.qml"));
+        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QString tostring = QLatin1String("QPointF(11.3, -10.9)");
+        QCOMPARE(object->property("tostring").toString(), tostring);
+        QCOMPARE(object->property("equalsString").toBool(), true);
+        QCOMPARE(object->property("equalsColor").toBool(), false);
+        QCOMPARE(object->property("equalsVector3d").toBool(), false);
+        QCOMPARE(object->property("equalsSize").toBool(), false);
+        QCOMPARE(object->property("equalsPoint").toBool(), true);
+        QCOMPARE(object->property("equalsRect").toBool(), false);
+        QCOMPARE(object->property("equalsSelf").toBool(), true);
+        QCOMPARE(object->property("equalsOther").toBool(), false);
+        QCOMPARE(object->property("pointfEqualsPoint").toBool(), true);
+
+        delete object;
+    }
 }
 
 void tst_qdeclarativevaluetypes::size()
@@ -184,6 +224,26 @@ void tst_qdeclarativevaluetypes::size()
 
         delete object;
     }
+
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("size_compare.qml"));
+        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QString tostring = QLatin1String("QSize(1912, 1913)");
+        QCOMPARE(object->property("tostring").toString(), tostring);
+        QCOMPARE(object->property("equalsString").toBool(), true);
+        QCOMPARE(object->property("equalsColor").toBool(), false);
+        QCOMPARE(object->property("equalsVector3d").toBool(), false);
+        QCOMPARE(object->property("equalsSize").toBool(), true);
+        QCOMPARE(object->property("equalsPoint").toBool(), false);
+        QCOMPARE(object->property("equalsRect").toBool(), false);
+        QCOMPARE(object->property("equalsSelf").toBool(), true);
+        QCOMPARE(object->property("equalsOther").toBool(), false);
+        QCOMPARE(object->property("sizeEqualsSizef").toBool(), true);
+
+        delete object;
+    }
 }
 
 void tst_qdeclarativevaluetypes::sizef()
@@ -209,6 +269,26 @@ void tst_qdeclarativevaluetypes::sizef()
 
         delete object;
     }
+
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("sizef_compare.qml"));
+        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QString tostring = QLatin1String("QSizeF(0.1, 100923)");
+        QCOMPARE(object->property("tostring").toString(), tostring);
+        QCOMPARE(object->property("equalsString").toBool(), true);
+        QCOMPARE(object->property("equalsColor").toBool(), false);
+        QCOMPARE(object->property("equalsVector3d").toBool(), false);
+        QCOMPARE(object->property("equalsSize").toBool(), true);
+        QCOMPARE(object->property("equalsPoint").toBool(), false);
+        QCOMPARE(object->property("equalsRect").toBool(), false);
+        QCOMPARE(object->property("equalsSelf").toBool(), true);
+        QCOMPARE(object->property("equalsOther").toBool(), false);
+        QCOMPARE(object->property("sizefEqualsSize").toBool(), true);
+
+        delete object;
+    }
 }
 
 void tst_qdeclarativevaluetypes::variant()
@@ -293,6 +373,26 @@ void tst_qdeclarativevaluetypes::rect()
 
         delete object;
     }
+
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("rect_compare.qml"));
+        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QString tostring = QLatin1String("QRect(2, 3, 109, 102)");
+        QCOMPARE(object->property("tostring").toString(), tostring);
+        QCOMPARE(object->property("equalsString").toBool(), true);
+        QCOMPARE(object->property("equalsColor").toBool(), false);
+        QCOMPARE(object->property("equalsVector3d").toBool(), false);
+        QCOMPARE(object->property("equalsSize").toBool(), false);
+        QCOMPARE(object->property("equalsPoint").toBool(), false);
+        QCOMPARE(object->property("equalsRect").toBool(), true);
+        QCOMPARE(object->property("equalsSelf").toBool(), true);
+        QCOMPARE(object->property("equalsOther").toBool(), false);
+        QCOMPARE(object->property("rectEqualsRectf").toBool(), true);
+
+        delete object;
+    }
 }
 
 void tst_qdeclarativevaluetypes::rectf()
@@ -320,6 +420,26 @@ void tst_qdeclarativevaluetypes::rectf()
 
         delete object;
     }
+
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("rectf_compare.qml"));
+        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QString tostring = QLatin1String("QRectF(103.8, 99.2, 88.1, 77.6)");
+        QCOMPARE(object->property("tostring").toString(), tostring);
+        QCOMPARE(object->property("equalsString").toBool(), true);
+        QCOMPARE(object->property("equalsColor").toBool(), false);
+        QCOMPARE(object->property("equalsVector3d").toBool(), false);
+        QCOMPARE(object->property("equalsSize").toBool(), false);
+        QCOMPARE(object->property("equalsPoint").toBool(), false);
+        QCOMPARE(object->property("equalsRect").toBool(), true);
+        QCOMPARE(object->property("equalsSelf").toBool(), true);
+        QCOMPARE(object->property("equalsOther").toBool(), false);
+        QCOMPARE(object->property("rectfEqualsRect").toBool(), true);
+
+        delete object;
+    }
 }
 
 void tst_qdeclarativevaluetypes::vector2d()
@@ -345,6 +465,24 @@ void tst_qdeclarativevaluetypes::vector2d()
 
         delete object;
     }
+
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("vector2d_compare.qml"));
+        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QString tostring = QLatin1String("QVector2D(32.88, 1.3)");
+        QCOMPARE(object->property("tostring").toString(), tostring);
+        QCOMPARE(object->property("equalsString").toBool(), true);
+        QCOMPARE(object->property("equalsColor").toBool(), false);
+        QCOMPARE(object->property("equalsVector3d").toBool(), false);
+        QCOMPARE(object->property("equalsSize").toBool(), false);
+        QCOMPARE(object->property("equalsPoint").toBool(), false);
+        QCOMPARE(object->property("equalsRect").toBool(), false);
+        QCOMPARE(object->property("equalsSelf").toBool(), true);
+
+        delete object;
+    }
 }
 
 void tst_qdeclarativevaluetypes::vector3d()
@@ -371,6 +509,25 @@ void tst_qdeclarativevaluetypes::vector3d()
 
         delete object;
     }
+
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("vector3d_compare.qml"));
+        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QString tostring = QLatin1String("QVector3D(23.88, 3.1, 4.3)");
+        QCOMPARE(object->property("tostring").toString(), tostring);
+        QCOMPARE(object->property("equalsString").toBool(), true);
+        QCOMPARE(object->property("equalsColor").toBool(), false);
+        QCOMPARE(object->property("equalsVector3d").toBool(), true);
+        QCOMPARE(object->property("equalsSize").toBool(), false);
+        QCOMPARE(object->property("equalsPoint").toBool(), false);
+        QCOMPARE(object->property("equalsRect").toBool(), false);
+        QCOMPARE(object->property("equalsSelf").toBool(), true);
+        QCOMPARE(object->property("equalsOther").toBool(), false);
+
+        delete object;
+    }
 }
 
 void tst_qdeclarativevaluetypes::vector4d()
@@ -398,6 +555,24 @@ void tst_qdeclarativevaluetypes::vector4d()
 
         delete object;
     }
+
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("vector4d_compare.qml"));
+        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QString tostring = QLatin1String("QVector4D(54.2, 23.88, 3.1, 4.3)");
+        QCOMPARE(object->property("tostring").toString(), tostring);
+        QCOMPARE(object->property("equalsString").toBool(), true);
+        QCOMPARE(object->property("equalsColor").toBool(), false);
+        QCOMPARE(object->property("equalsVector3d").toBool(), false);
+        QCOMPARE(object->property("equalsSize").toBool(), false);
+        QCOMPARE(object->property("equalsPoint").toBool(), false);
+        QCOMPARE(object->property("equalsRect").toBool(), false);
+        QCOMPARE(object->property("equalsSelf").toBool(), true);
+
+        delete object;
+    }
 }
 
 void tst_qdeclarativevaluetypes::quaternion()
@@ -425,6 +600,24 @@ void tst_qdeclarativevaluetypes::quaternion()
 
         delete object;
     }
+
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("quaternion_compare.qml"));
+        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QString tostring = QLatin1String("QQuaternion(4.3, 54.2, 23.88, 3.1)");
+        QCOMPARE(object->property("tostring").toString(), tostring);
+        QCOMPARE(object->property("equalsString").toBool(), true);
+        QCOMPARE(object->property("equalsColor").toBool(), false);
+        QCOMPARE(object->property("equalsVector3d").toBool(), false);
+        QCOMPARE(object->property("equalsSize").toBool(), false);
+        QCOMPARE(object->property("equalsPoint").toBool(), false);
+        QCOMPARE(object->property("equalsRect").toBool(), false);
+        QCOMPARE(object->property("equalsSelf").toBool(), true);
+
+        delete object;
+    }
 }
 
 void tst_qdeclarativevaluetypes::matrix4x4()
@@ -471,6 +664,24 @@ void tst_qdeclarativevaluetypes::matrix4x4()
 
         delete object;
     }
+
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("matrix4x4_compare.qml"));
+        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QString tostring = QLatin1String("QMatrix4x4(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16)");
+        QCOMPARE(object->property("tostring").toString(), tostring);
+        QCOMPARE(object->property("equalsString").toBool(), true);
+        QCOMPARE(object->property("equalsColor").toBool(), false);
+        QCOMPARE(object->property("equalsVector3d").toBool(), false);
+        QCOMPARE(object->property("equalsSize").toBool(), false);
+        QCOMPARE(object->property("equalsPoint").toBool(), false);
+        QCOMPARE(object->property("equalsRect").toBool(), false);
+        QCOMPARE(object->property("equalsSelf").toBool(), true);
+
+        delete object;
+    }
 }
 
 void tst_qdeclarativevaluetypes::font()
@@ -576,6 +787,24 @@ void tst_qdeclarativevaluetypes::font()
 
         delete object;
     }
+
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("font_compare.qml"));
+        MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QString tostring = QLatin1String("QFont(Arial,29,-1,0,63,1,1,1,0,0)");
+        QCOMPARE(object->property("tostring").toString(), tostring);
+        QCOMPARE(object->property("equalsString").toBool(), true);
+        QCOMPARE(object->property("equalsColor").toBool(), false);
+        QCOMPARE(object->property("equalsVector3d").toBool(), false);
+        QCOMPARE(object->property("equalsSize").toBool(), false);
+        QCOMPARE(object->property("equalsPoint").toBool(), false);
+        QCOMPARE(object->property("equalsRect").toBool(), false);
+        QCOMPARE(object->property("equalsSelf").toBool(), true);
+
+        delete object;
+    }
 }
 
 // Test bindings can write to value types