diff options
author | Sarah Smith <sarah.j.smith@nokia.com> | 2012-06-18 17:06:57 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-19 06:26:14 +0200 |
commit | 247cc1c39f9479f80e1af9757a9fb1e8da142103 (patch) | |
tree | 87fb1bd39bdb75c07b0ca2a0415e9c4cbc846ac2 | |
parent | 1e7c6abe072f29454f630be50fe5253a68f9cefc (diff) |
Quell warnings.
Address warnings about unsigned vs signed comparisons.
Change-Id: I26e481accfed37026f2ddf36cdb9485d7568c59f
Reviewed-by: Sergey Dubitskiy <sergey.dubitskiy@nokia.com>
-rw-r--r-- | tests/auto/imports/qcapsulemesh/tst_qcapsulemesh.cpp | 18 | ||||
-rw-r--r-- | tests/auto/imports/qcylindermesh/tst_qcylindermesh.cpp | 18 | ||||
-rw-r--r-- | tests/auto/imports/qspheremesh/tst_qspheremesh.cpp | 6 |
3 files changed, 21 insertions, 21 deletions
diff --git a/tests/auto/imports/qcapsulemesh/tst_qcapsulemesh.cpp b/tests/auto/imports/qcapsulemesh/tst_qcapsulemesh.cpp index a06d6ae17..03e98a19c 100644 --- a/tests/auto/imports/qcapsulemesh/tst_qcapsulemesh.cpp +++ b/tests/auto/imports/qcapsulemesh/tst_qcapsulemesh.cpp @@ -157,7 +157,7 @@ void tst_QCapsuleMesh::testGeometry() QGL::IndexArray ib = geom.indices(); for (int i=pSceneNodeLevel2->start(); i<pSceneNodeLevel2->start()+pSceneNodeLevel2->count(); i+=3) { unsigned int ii0 = ib.at(i); - QVERIFY(ii0<verts.size()); + QVERIFY(ii0<(unsigned int)verts.size()); QVector3D vv0 = verts.at(ii0); qreal vv0sq = (vv0-QVector3D(0,0,vv0.z())).lengthSquared(); QVERIFY(fabs(vv0sq-0.25)<0.0001); // vertex is on cylinder @@ -165,7 +165,7 @@ void tst_QCapsuleMesh::testGeometry() QVERIFY((fabs(QVector3D::dotProduct(nn0,(vv0-QVector3D(0,0,vv0.z()))))-1.0) < 0.0001); // vertex normal points to the same direction as vertex unsigned int ii1 = ib.at(i+1); - QVERIFY(ii1<verts.size()); + QVERIFY(ii1<(unsigned int)verts.size()); QVector3D vv1 = verts.at(ii1); qreal vv1sq = (vv1-QVector3D(0,0,vv1.z())).lengthSquared(); QVERIFY(fabs(vv1sq-0.25)<0.0001); // vertex is on cylinder @@ -173,7 +173,7 @@ void tst_QCapsuleMesh::testGeometry() QVERIFY((fabs(QVector3D::dotProduct(nn1,(vv1-QVector3D(0,0,vv1.z()))))-1.0) < 0.0001); // vertex normal points to the same direction as vertex unsigned int ii2 = ib.at(i+2); - QVERIFY(ii2<verts.size()); + QVERIFY(ii2<(unsigned int)verts.size()); QVector3D vv2 = verts.at(ii2); qreal vv2sq = (vv2-QVector3D(0,0,vv2.z())).lengthSquared(); QVERIFY(fabs(vv2sq-0.25)<0.0001); // vertex is on cylinder @@ -209,7 +209,7 @@ void tst_QCapsuleMesh::testGeometry() QGL::IndexArray ib = geom.indices(); for (int i=pSceneNodeLevel2->start(); i<pSceneNodeLevel2->start()+pSceneNodeLevel2->count(); i+=3) { unsigned int ii0 = ib.at(i); - QVERIFY(ii0<verts.size()); + QVERIFY(ii0<(unsigned int)verts.size()); QVector3D vv0 = verts.at(ii0); qreal vv0sq = vv0.lengthSquared(); QVERIFY(fabs(vv0sq-0.25)<0.0001); // vertex is on dome @@ -219,7 +219,7 @@ void tst_QCapsuleMesh::testGeometry() QVERIFY(fabs(QVector3D::dotProduct(nn0,vv0)-0.5) < 0.0001); // vertex normal points to the same direction as vertex unsigned int ii1 = ib.at(i+1); - QVERIFY(ii1<verts.size()); + QVERIFY(ii1<(unsigned int)verts.size()); QVector3D vv1 = verts.at(ii1); qreal vv1sq = vv1.lengthSquared(); QVERIFY(fabs(vv1sq-0.25)<0.0001); // vertex is on dome @@ -229,7 +229,7 @@ void tst_QCapsuleMesh::testGeometry() QVERIFY(fabs(QVector3D::dotProduct(nn1,vv1)-0.5) < 0.0001); // vertex normal points to the same direction as vertex unsigned int ii2 = ib.at(i+2); - QVERIFY(ii2<verts.size()); + QVERIFY(ii2<(unsigned int)verts.size()); QVector3D vv2 = verts.at(ii2); qreal vv2sq = vv2.lengthSquared(); QVERIFY(fabs(vv2sq-0.25)<0.0001); // vertex is on cylinder @@ -277,7 +277,7 @@ void tst_QCapsuleMesh::testGeometry() QGL::IndexArray ib = geom.indices(); for (int i=pSceneNodeLevel2->start(); i<pSceneNodeLevel2->start()+pSceneNodeLevel2->count(); i+=3) { unsigned int ii0 = ib.at(i); - QVERIFY(ii0<verts.size()); + QVERIFY(ii0<(unsigned int)verts.size()); QVector3D vv0 = verts.at(ii0); qreal vv0sq = vv0.lengthSquared(); QVERIFY(fabs(vv0sq-0.25)<0.0001); // vertex is on dome @@ -287,7 +287,7 @@ void tst_QCapsuleMesh::testGeometry() QVERIFY(fabs(QVector3D::dotProduct(nn0,vv0)-0.5) < 0.0001); // vertex normal points to the same direction as vertex unsigned int ii1 = ib.at(i+1); - QVERIFY(ii1<verts.size()); + QVERIFY(ii1<(unsigned int)verts.size()); QVector3D vv1 = verts.at(ii1); qreal vv1sq = vv1.lengthSquared(); QVERIFY(fabs(vv1sq-0.25)<0.0001); // vertex is on dome @@ -297,7 +297,7 @@ void tst_QCapsuleMesh::testGeometry() QVERIFY(fabs(QVector3D::dotProduct(nn1,vv1)-0.5) < 0.0001); // vertex normal points to the same direction as vertex unsigned int ii2 = ib.at(i+2); - QVERIFY(ii2<verts.size()); + QVERIFY(ii2<(unsigned int)verts.size()); QVector3D vv2 = verts.at(ii2); qreal vv2sq = vv2.lengthSquared(); QVERIFY(fabs(vv2sq-0.25)<0.0001); // vertex is on cylinder diff --git a/tests/auto/imports/qcylindermesh/tst_qcylindermesh.cpp b/tests/auto/imports/qcylindermesh/tst_qcylindermesh.cpp index 02c61e38a..61211b6e8 100644 --- a/tests/auto/imports/qcylindermesh/tst_qcylindermesh.cpp +++ b/tests/auto/imports/qcylindermesh/tst_qcylindermesh.cpp @@ -133,7 +133,7 @@ void tst_QCylinderMesh::testGeometry() QGL::IndexArray ib = geom.indices(); for (int i=pSceneNodeLevel2->start(); i<pSceneNodeLevel2->start()+pSceneNodeLevel2->count(); i+=3) { unsigned int ii0 = ib.at(i); - QVERIFY(ii0<verts.size()); + QVERIFY(ii0<(unsigned int)verts.size()); QVector3D vv0 = verts.at(ii0); qreal vv0sq = (vv0-QVector3D(0,0,0.5)).lengthSquared(); QVERIFY(fabs(vv0sq)<0.0001 || fabs(vv0sq-1.0)<0.0001); // vertex is either in center or on circle @@ -141,7 +141,7 @@ void tst_QCylinderMesh::testGeometry() QVERIFY((fabs(QVector3D::dotProduct(nn0,QVector3D(0,0,1)))-1.0) < 0.0001); // vertex normal == {0,0,1} unsigned int ii1 = ib.at(i+1); - QVERIFY(ii1<verts.size()); + QVERIFY(ii1<(unsigned int)verts.size()); QVector3D vv1 = verts.at(ii1); qreal vv1sq = (vv1-QVector3D(0,0,0.5)).lengthSquared(); QVERIFY(fabs(vv1sq)<0.0001 || fabs(vv1sq-1.0)<0.0001); // vertex is either in center or on circle @@ -149,7 +149,7 @@ void tst_QCylinderMesh::testGeometry() QVERIFY((fabs(QVector3D::dotProduct(nn1,QVector3D(0,0,1)))-1.0) < 0.0001); // vertex normal == {0,0,1} unsigned int ii2 = ib.at(i+2); - QVERIFY(ii2<verts.size()); + QVERIFY(ii2<(unsigned int)verts.size()); QVector3D vv2 = verts.at(ii2); qreal vv2sq = (vv2-QVector3D(0,0,0.5)).lengthSquared(); QVERIFY(fabs(vv2sq)<0.0001 || fabs(vv2sq-1.0)<0.0001); // vertex is either in center or on circle @@ -173,7 +173,7 @@ void tst_QCylinderMesh::testGeometry() QGL::IndexArray ib = geom.indices(); for (int i=pSceneNodeLevel2->start(); i<pSceneNodeLevel2->start()+pSceneNodeLevel2->count(); i+=3) { unsigned int ii0 = ib.at(i); - QVERIFY(ii0<verts.size()); + QVERIFY(ii0<(unsigned int)verts.size()); QVector3D vv0 = verts.at(ii0); qreal vv0sq = (vv0-QVector3D(0,0,vv0.z())).lengthSquared(); QVERIFY(fabs(vv0sq-1.0)<0.0001); // vertex is on cylinder @@ -181,7 +181,7 @@ void tst_QCylinderMesh::testGeometry() QVERIFY((fabs(QVector3D::dotProduct(nn0,(vv0-QVector3D(0,0,vv0.z()))))-1.0) < 0.0001); // vertex normal points to the same direction as vertex unsigned int ii1 = ib.at(i+1); - QVERIFY(ii1<verts.size()); + QVERIFY(ii1<(unsigned int)verts.size()); QVector3D vv1 = verts.at(ii1); qreal vv1sq = (vv1-QVector3D(0,0,vv1.z())).lengthSquared(); QVERIFY(fabs(vv1sq-1.0)<0.0001); // vertex is on cylinder @@ -189,7 +189,7 @@ void tst_QCylinderMesh::testGeometry() QVERIFY((fabs(QVector3D::dotProduct(nn1,(vv1-QVector3D(0,0,vv1.z()))))-1.0) < 0.0001); // vertex normal points to the same direction as vertex unsigned int ii2 = ib.at(i+2); - QVERIFY(ii2<verts.size()); + QVERIFY(ii2<(unsigned int)verts.size()); QVector3D vv2 = verts.at(ii2); qreal vv2sq = (vv2-QVector3D(0,0,vv2.z())).lengthSquared(); QVERIFY(fabs(vv2sq-1.0)<0.0001); // vertex is on cylinder @@ -214,7 +214,7 @@ void tst_QCylinderMesh::testGeometry() QGL::IndexArray ib = geom.indices(); for (int i=pSceneNodeLevel2->start(); i<pSceneNodeLevel2->start()+pSceneNodeLevel2->count(); i+=3) { unsigned int ii0 = ib.at(i); - QVERIFY(ii0<verts.size()); + QVERIFY(ii0<(unsigned int)verts.size()); QVector3D vv0 = verts.at(ii0); qreal vv0sq = (vv0-QVector3D(0,0,-0.5)).lengthSquared(); QVERIFY(fabs(vv0sq)<0.0001 || fabs(vv0sq-1.0)<0.0001); // vertex is either in center or on circle @@ -222,7 +222,7 @@ void tst_QCylinderMesh::testGeometry() QVERIFY((fabs(QVector3D::dotProduct(nn0,QVector3D(0,0,-1)))-1.0) < 0.0001); // vertex normal == {0,0,-1} unsigned int ii1 = ib.at(i+1); - QVERIFY(ii1<verts.size()); + QVERIFY(ii1<(unsigned int)verts.size()); QVector3D vv1 = verts.at(ii1); qreal vv1sq = (vv1-QVector3D(0,0,-0.5)).lengthSquared(); QVERIFY(fabs(vv1sq)<0.0001 || fabs(vv1sq-1.0)<0.0001); // vertex is either in center or on circle @@ -230,7 +230,7 @@ void tst_QCylinderMesh::testGeometry() QVERIFY((fabs(QVector3D::dotProduct(nn1,QVector3D(0,0,-1)))-1.0) < 0.0001); // vertex normal == {0,0,-1} unsigned int ii2 = ib.at(i+2); - QVERIFY(ii2<verts.size()); + QVERIFY(ii2<(unsigned int)verts.size()); QVector3D vv2 = verts.at(ii2); qreal vv2sq = (vv2-QVector3D(0,0,-0.5)).lengthSquared(); QVERIFY(fabs(vv2sq)<0.0001 || fabs(vv2sq-1.0)<0.0001); // vertex is either in center or on circle diff --git a/tests/auto/imports/qspheremesh/tst_qspheremesh.cpp b/tests/auto/imports/qspheremesh/tst_qspheremesh.cpp index 4017c4be9..7da925c0e 100644 --- a/tests/auto/imports/qspheremesh/tst_qspheremesh.cpp +++ b/tests/auto/imports/qspheremesh/tst_qspheremesh.cpp @@ -131,21 +131,21 @@ void tst_QSphereMesh::testGeometry() QGL::IndexArray ib = geom.indices(); for (int i=pSceneNodeLevel2->start(); i<pSceneNodeLevel2->start()+pSceneNodeLevel2->count(); i+=3) { unsigned int ii0 = ib.at(i); - QVERIFY(ii0<verts.size()); + QVERIFY(ii0<(unsigned int)verts.size()); QVector3D vv0 = verts.at(ii0); qreal vv0sq = vv0.lengthSquared(); QVERIFY(fabs(vv0sq-1.0)<0.0001); // vertex is on sphere QVector3D nn0 = norms.at(ii0); QVERIFY((fabs(QVector3D::dotProduct(vv0,nn0))-1.0) < 0.0001); // vertex normal == vertex itself unsigned int ii1 = ib.at(i+1); - QVERIFY(ii1<verts.size()); + QVERIFY(ii1<(unsigned int)verts.size()); QVector3D vv1 = verts.at(ii1); qreal vv1sq = vv1.lengthSquared(); QVERIFY(fabs(vv1sq-1.0)<0.0001); // vertex is on sphere QVector3D nn1 = norms.at(ii1); QVERIFY((fabs(QVector3D::dotProduct(vv1,nn1))-1.0) < 0.0001); // vertex normal == vertex itself unsigned int ii2 = ib.at(i+2); - QVERIFY(ii2<verts.size()); + QVERIFY(ii2<(unsigned int)verts.size()); QVector3D vv2 = verts.at(ii2); qreal vv2sq = vv2.lengthSquared(); QVERIFY(fabs(vv2sq-1.0)<0.0001); // vertex is on sphere |