From d5466f28cb921929268bbcab335f0edaabbbfdd3 Mon Sep 17 00:00:00 2001 From: Sze Howe Koh Date: Mon, 28 Jan 2013 12:46:18 +0800 Subject: Rename namespace QtLocation -> QLocation Main code, tests and docs updated. For consistency (with minimal disruption to the Qt 5.0.0 release), namespaces with a "Qt" prefix were renamed. Part of the Header Consistency Project (http://lists.qt-project.org/pipermail/development/2012-October/007570.html) Change-Id: Ic728cbbe39e0140dca1cdee24257dda095c9a478 Reviewed-by: Laszlo Papp Reviewed-by: Aaron McCarthy --- .../qplacesearchrequest/tst_qplacesearchrequest.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'tests/auto/qplacesearchrequest') diff --git a/tests/auto/qplacesearchrequest/tst_qplacesearchrequest.cpp b/tests/auto/qplacesearchrequest/tst_qplacesearchrequest.cpp index fd0f341f..04b6d769 100644 --- a/tests/auto/qplacesearchrequest/tst_qplacesearchrequest.cpp +++ b/tests/auto/qplacesearchrequest/tst_qplacesearchrequest.cpp @@ -166,15 +166,15 @@ void tst_QPlaceSearchRequest::searchAreaTest() void tst_QPlaceSearchRequest::visibilityScopeTest() { QPlaceSearchRequest query; - QVERIFY2(query.visibilityScope() == QtLocation::UnspecifiedVisibility, "Wrong default value"); + QVERIFY2(query.visibilityScope() == QLocation::UnspecifiedVisibility, "Wrong default value"); - query.setVisibilityScope(QtLocation::DeviceVisibility); - QCOMPARE(query.visibilityScope(), QtLocation::DeviceVisibility); + query.setVisibilityScope(QLocation::DeviceVisibility); + QCOMPARE(query.visibilityScope(), QLocation::DeviceVisibility); - query.setVisibilityScope(QtLocation::DeviceVisibility | QtLocation::PublicVisibility); - QVERIFY(query.visibilityScope() & QtLocation::DeviceVisibility); - QVERIFY(!(query.visibilityScope() & QtLocation::PrivateVisibility)); - QVERIFY(query.visibilityScope() & QtLocation::PublicVisibility); + query.setVisibilityScope(QLocation::DeviceVisibility | QLocation::PublicVisibility); + QVERIFY(query.visibilityScope() & QLocation::DeviceVisibility); + QVERIFY(!(query.visibilityScope() & QLocation::PrivateVisibility)); + QVERIFY(query.visibilityScope() & QLocation::PublicVisibility); } void tst_QPlaceSearchRequest::relevanceHintTest() @@ -235,12 +235,12 @@ void tst_QPlaceSearchRequest::operatorsTest() //test that identical visibility scopes match testObj.clear(); testObj2.clear(); - testObj.setVisibilityScope(QtLocation::PublicVisibility); - testObj2.setVisibilityScope(QtLocation::PublicVisibility); + testObj.setVisibilityScope(QLocation::PublicVisibility); + testObj2.setVisibilityScope(QLocation::PublicVisibility); QVERIFY2(testObj == testObj2, "Identical scopes not identified as matching"); //test that different scopes do not match - testObj2.setVisibilityScope(QtLocation::PrivateVisibility); + testObj2.setVisibilityScope(QLocation::PrivateVisibility); QVERIFY2(testObj != testObj2, "Different scopes identified as matching"); } -- cgit v1.2.1