diff options
| -rw-r--r-- | tests/auto/qgeoareamonitor/tst_qgeoareamonitor.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/auto/qgeoareamonitor/tst_qgeoareamonitor.cpp b/tests/auto/qgeoareamonitor/tst_qgeoareamonitor.cpp index b6b4721c..5b9046e2 100644 --- a/tests/auto/qgeoareamonitor/tst_qgeoareamonitor.cpp +++ b/tests/auto/qgeoareamonitor/tst_qgeoareamonitor.cpp @@ -560,8 +560,8 @@ private slots: QCOMPARE(obj->sourceName(), QStringLiteral("positionpoll")); obj->setObjectName("firstObject"); QSignalSpy enteredSpy(obj.get(), - SIGNAL(areaEntered(QGeoAreaMonitorInfo, QGeoPositionInfo))); - QSignalSpy exitedSpy(obj.get(), SIGNAL(areaExited(QGeoAreaMonitorInfo, QGeoPositionInfo))); + SIGNAL(areaEntered(QGeoAreaMonitorInfo,QGeoPositionInfo))); + QSignalSpy exitedSpy(obj.get(), SIGNAL(areaExited(QGeoAreaMonitorInfo,QGeoPositionInfo))); // using this -> no need for smart pointer LogFilePositionSource *source = new LogFilePositionSource(m_fileData, this); @@ -574,9 +574,9 @@ private slots: QVERIFY(secondObj != nullptr); QCOMPARE(secondObj->sourceName(), QStringLiteral("positionpoll")); QSignalSpy enteredSpy2(secondObj.get(), - SIGNAL(areaEntered(QGeoAreaMonitorInfo, QGeoPositionInfo))); + SIGNAL(areaEntered(QGeoAreaMonitorInfo,QGeoPositionInfo))); QSignalSpy exitedSpy2(secondObj.get(), - SIGNAL(areaExited(QGeoAreaMonitorInfo, QGeoPositionInfo))); + SIGNAL(areaExited(QGeoAreaMonitorInfo,QGeoPositionInfo))); secondObj->setObjectName("secondObject"); QGeoAreaMonitorInfo infoRectangle("Rectangle"); @@ -696,8 +696,8 @@ private slots: QCOMPARE(obj->sourceName(), QStringLiteral("positionpoll")); obj->setObjectName("firstObject"); QSignalSpy enteredSpy(obj.get(), - SIGNAL(areaEntered(QGeoAreaMonitorInfo, QGeoPositionInfo))); - QSignalSpy exitedSpy(obj.get(), SIGNAL(areaExited(QGeoAreaMonitorInfo, QGeoPositionInfo))); + SIGNAL(areaEntered(QGeoAreaMonitorInfo,QGeoPositionInfo))); + QSignalSpy exitedSpy(obj.get(), SIGNAL(areaExited(QGeoAreaMonitorInfo,QGeoPositionInfo))); std::unique_ptr<QGeoAreaMonitorSource> obj2( QGeoAreaMonitorSource::createSource(QStringLiteral("positionpoll"), 0)); @@ -705,9 +705,9 @@ private slots: QCOMPARE(obj2->sourceName(), QStringLiteral("positionpoll")); obj2->setObjectName("secondObject"); QSignalSpy enteredSpy2(obj2.get(), - SIGNAL(areaEntered(QGeoAreaMonitorInfo, QGeoPositionInfo))); + SIGNAL(areaEntered(QGeoAreaMonitorInfo,QGeoPositionInfo))); QSignalSpy exitedSpy2(obj2.get(), - SIGNAL(areaExited(QGeoAreaMonitorInfo, QGeoPositionInfo))); + SIGNAL(areaExited(QGeoAreaMonitorInfo,QGeoPositionInfo))); // using this -> no need for smart pointer LogFilePositionSource *source = new LogFilePositionSource(m_fileData, this); @@ -872,13 +872,13 @@ private slots: singleShot_enter.setArea(QGeoRectangle(QGeoCoordinate(-27.67, 153.093), 0.2, 0.2)); QVERIFY(singleShot_enter.isValid()); QVERIFY(obj->requestUpdate(singleShot_enter, - SIGNAL(areaEntered(QGeoAreaMonitorInfo, QGeoPositionInfo)))); + SIGNAL(areaEntered(QGeoAreaMonitorInfo,QGeoPositionInfo)))); QGeoAreaMonitorInfo singleShot_exit("SingleShot_on_Exited"); singleShot_exit.setArea(QGeoRectangle(QGeoCoordinate(-27.70, 153.093), 0.2, 0.2)); QVERIFY(singleShot_exit.isValid()); QVERIFY(obj->requestUpdate(singleShot_exit, - SIGNAL(areaExited(QGeoAreaMonitorInfo, QGeoPositionInfo)))); + SIGNAL(areaExited(QGeoAreaMonitorInfo,QGeoPositionInfo)))); // wait until we read all data QTRY_COMPARE_WITH_TIMEOUT(noDataSpy.size(), 1, 5000); |