summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorIvan Solovev <ivan.solovev@qt.io>2021-01-21 12:25:05 +0100
committerIvan Solovev <ivan.solovev@qt.io>2021-01-22 14:32:03 +0100
commit8f25a043dae764bb7def1f67ea49595d74eeb1d0 (patch)
tree858d18240ed83edecd9a62b96b78cca1f1700cb5 /tests
parentb45ee37f5587f9193c8c03bba580334fbf0d9d42 (diff)
downloadqtlocation-8f25a043dae764bb7def1f67ea49595d74eeb1d0.tar.gz
QtPositioning: get rid of warnings
Fix warnings in QtPositioning sources. These are mostly the warnings regarding a missing "override" keyword in unit tests. Task-number: QTBUG-90491 Change-Id: I6ca676de0733767d4b85353670103ad5a8d60688 Reviewed-by: Juha Vuolle <juha.vuolle@insta.fi> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qgeoareamonitor/logfilepositionsource.h14
-rw-r--r--tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp16
-rw-r--r--tests/auto/qgeosatelliteinfosource/testqgeosatelliteinfosource.cpp12
-rw-r--r--tests/auto/qnmeapositioninfosource/dummynmeapositioninfosource/tst_dummynmeapositioninfosource.cpp10
-rw-r--r--tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_realtime_generic/tst_qnmeapositioninfosource_realtime_generic.cpp2
-rw-r--r--tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_simulation_generic/tst_qnmeapositioninfosource_simulation_generic.cpp2
-rw-r--r--tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource.h6
7 files changed, 31 insertions, 31 deletions
diff --git a/tests/auto/qgeoareamonitor/logfilepositionsource.h b/tests/auto/qgeoareamonitor/logfilepositionsource.h
index 3768d755..c284109e 100644
--- a/tests/auto/qgeoareamonitor/logfilepositionsource.h
+++ b/tests/auto/qgeoareamonitor/logfilepositionsource.h
@@ -42,17 +42,17 @@ class LogFilePositionSource : public QGeoPositionInfoSource
public:
LogFilePositionSource(QObject *parent = 0);
- QGeoPositionInfo lastKnownPosition(bool fromSatellitePositioningMethodsOnly = false) const;
+ QGeoPositionInfo lastKnownPosition(bool fromSatellitePositioningMethodsOnly = false) const override;
- PositioningMethods supportedPositioningMethods() const;
- int minimumUpdateInterval() const;
- Error error() const;
+ PositioningMethods supportedPositioningMethods() const override;
+ int minimumUpdateInterval() const override;
+ Error error() const override;
public slots:
- virtual void startUpdates();
- virtual void stopUpdates();
+ virtual void startUpdates() override;
+ virtual void stopUpdates() override;
- virtual void requestUpdate(int timeout = 5000);
+ virtual void requestUpdate(int timeout = 5000) override;
private slots:
void readNextPosition();
diff --git a/tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp b/tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp
index ce7b4d66..953d885a 100644
--- a/tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp
+++ b/tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp
@@ -68,7 +68,7 @@ public:
: QGeoPositionInfoSource(parent) {
}
- QGeoPositionInfo lastKnownPosition(bool /*fromSatellitePositioningMethodsOnly = false*/) const {
+ QGeoPositionInfo lastKnownPosition(bool /*fromSatellitePositioningMethodsOnly = false*/) const override {
return QGeoPositionInfo();
}
@@ -76,19 +76,19 @@ public:
m_methods = methods;
}
- virtual PositioningMethods supportedPositioningMethods() const {
+ virtual PositioningMethods supportedPositioningMethods() const override {
return m_methods;
}
- virtual int minimumUpdateInterval() const {
+ virtual int minimumUpdateInterval() const override {
return 0;
}
- virtual void startUpdates() {}
- virtual void stopUpdates() {}
+ virtual void startUpdates() override {}
+ virtual void stopUpdates() override {}
- virtual void requestUpdate(int) {}
+ virtual void requestUpdate(int) override {}
- Error error() const { return QGeoPositionInfoSource::NoError; }
+ Error error() const override { return QGeoPositionInfoSource::NoError; }
private:
PositioningMethods m_methods;
@@ -98,7 +98,7 @@ class DefaultSourceTest : public TestQGeoPositionInfoSource
{
Q_OBJECT
protected:
- QGeoPositionInfoSource *createTestSource() {
+ QGeoPositionInfoSource *createTestSource() override {
return QGeoPositionInfoSource::createSource(QStringLiteral("test.source"), 0);
}
};
diff --git a/tests/auto/qgeosatelliteinfosource/testqgeosatelliteinfosource.cpp b/tests/auto/qgeosatelliteinfosource/testqgeosatelliteinfosource.cpp
index 0e75baa4..42e2a3c6 100644
--- a/tests/auto/qgeosatelliteinfosource/testqgeosatelliteinfosource.cpp
+++ b/tests/auto/qgeosatelliteinfosource/testqgeosatelliteinfosource.cpp
@@ -64,13 +64,13 @@ public:
MySatelliteSource(QObject *parent = 0)
: QGeoSatelliteInfoSource(parent) {
}
- virtual void startUpdates() {}
- virtual void stopUpdates() {}
- virtual void requestUpdate(int) {}
- virtual int minimumUpdateInterval() const {
+ virtual void startUpdates() override {}
+ virtual void stopUpdates() override {}
+ virtual void requestUpdate(int) override {}
+ virtual int minimumUpdateInterval() const override {
return 0;
}
- Error error() const { return QGeoSatelliteInfoSource::NoError; }
+ Error error() const override { return QGeoSatelliteInfoSource::NoError; }
};
@@ -78,7 +78,7 @@ class DefaultSourceTest : public TestQGeoSatelliteInfoSource
{
Q_OBJECT
protected:
- QGeoSatelliteInfoSource *createTestSource() {
+ QGeoSatelliteInfoSource *createTestSource() override {
return QGeoSatelliteInfoSource::createDefaultSource(0);
}
};
diff --git a/tests/auto/qnmeapositioninfosource/dummynmeapositioninfosource/tst_dummynmeapositioninfosource.cpp b/tests/auto/qnmeapositioninfosource/dummynmeapositioninfosource/tst_dummynmeapositioninfosource.cpp
index e07fb707..8330e0b7 100644
--- a/tests/auto/qnmeapositioninfosource/dummynmeapositioninfosource/tst_dummynmeapositioninfosource.cpp
+++ b/tests/auto/qnmeapositioninfosource/dummynmeapositioninfosource/tst_dummynmeapositioninfosource.cpp
@@ -46,10 +46,10 @@ public:
DummyNmeaPositionInfoSource(QNmeaPositionInfoSource::UpdateMode mode, QObject *parent = 0);
protected:
- virtual bool parsePosInfoFromNmeaData(const char *data,
- int size,
- QGeoPositionInfo *posInfo,
- bool *hasFix);
+ bool parsePosInfoFromNmeaData(const char *data,
+ int size,
+ QGeoPositionInfo *posInfo,
+ bool *hasFix) override;
private:
int callCount;
@@ -70,7 +70,7 @@ bool DummyNmeaPositionInfoSource::parsePosInfoFromNmeaData(const char* data,
Q_UNUSED(size);
posInfo->setCoordinate(QGeoCoordinate(callCount * 1.0, callCount * 1.0, callCount * 1.0));
- posInfo->setTimestamp(QDateTime::currentDateTime().toUTC());
+ posInfo->setTimestamp(QDateTime::currentDateTimeUtc());
*hasFix = true;
++callCount;
diff --git a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_realtime_generic/tst_qnmeapositioninfosource_realtime_generic.cpp b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_realtime_generic/tst_qnmeapositioninfosource_realtime_generic.cpp
index d3f03c0d..5a7ec2e0 100644
--- a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_realtime_generic/tst_qnmeapositioninfosource_realtime_generic.cpp
+++ b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_realtime_generic/tst_qnmeapositioninfosource_realtime_generic.cpp
@@ -58,7 +58,7 @@ public:
}
protected:
- QGeoPositionInfoSource *createTestSource()
+ QGeoPositionInfoSource *createTestSource() override
{
QNmeaPositionInfoSource *source = new QNmeaPositionInfoSource(QNmeaPositionInfoSource::RealTimeMode);
QNmeaPositionInfoSourceProxy *proxy = static_cast<QNmeaPositionInfoSourceProxy*>(m_factory->createProxy(source));
diff --git a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_simulation_generic/tst_qnmeapositioninfosource_simulation_generic.cpp b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_simulation_generic/tst_qnmeapositioninfosource_simulation_generic.cpp
index adc55f64..2f2827de 100644
--- a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_simulation_generic/tst_qnmeapositioninfosource_simulation_generic.cpp
+++ b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_simulation_generic/tst_qnmeapositioninfosource_simulation_generic.cpp
@@ -51,7 +51,7 @@ public:
}
protected:
- QGeoPositionInfoSource *createTestSource()
+ QGeoPositionInfoSource *createTestSource() override
{
QNmeaPositionInfoSource *source = new QNmeaPositionInfoSource(QNmeaPositionInfoSource::SimulationMode);
source->setDevice(new UnlimitedNmeaStream(source));
diff --git a/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource.h b/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource.h
index 073a4aac..1b4aecce 100644
--- a/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource.h
+++ b/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource.h
@@ -162,7 +162,7 @@ public:
UnlimitedNmeaStream(QObject *parent) : QIODevice(parent) {}
protected:
- qint64 readData(char *data, qint64 maxSize)
+ qint64 readData(char *data, qint64 maxSize) override
{
QByteArray bytes = QLocationTestUtils::createRmcSentence(QDateTime::currentDateTime()).toLatin1();
qint64 sz = qMin(qint64(bytes.size()), maxSize);
@@ -170,12 +170,12 @@ protected:
return sz;
}
- qint64 writeData(const char *, qint64)
+ qint64 writeData(const char *, qint64) override
{
return -1;
}
- qint64 bytesAvailable() const
+ qint64 bytesAvailable() const override
{
return 1024 + QIODevice::bytesAvailable();
}