summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorIvan Solovev <ivan.solovev@qt.io>2021-01-22 14:14:49 +0100
committerIvan Solovev <ivan.solovev@qt.io>2021-01-26 17:20:35 +0100
commit37ff0744c8c5f15606dbc2391b630ea433c3c939 (patch)
tree57bee3560bae24dd574ea330d28f9aa26c3fb126 /examples
parent82bc59433ba56139730382881438996c63cad68d (diff)
downloadqtlocation-37ff0744c8c5f15606dbc2391b630ea433c3c939.tar.gz
QtPositioning: remove QGeoPositionInfoSource::updateTimeout signal
A new Error::UpdateTimeoutError enum value is introduced instead. An errorOccurred() signal with this value is used to notify about update timeouts. As a result, an updateTimeout() signal is also removed from QML PositionSource object (QDeclarativePositionSource C++ class). It's also replaced by the sourceErrorChanged() signal with PositionSource.UpdateTimeoutError error value. Apart from that - several more warnings in the unit tests are fixed. [ChangeLog][QtPositioning][Important Behavior Changes] Removed QGeoPositionInfoSource::updateTimeout() signal. Use QGeoPositionInfoSource::errorOccurred() with a new Error::UpdateTimeoutError value instead. Removed PositionSource::updateTimeout() signal from QML. Use PositionSource::sourceErrorChanged() with a new PositionSource.UpdateTimeoutError value instead. Task-number: QTBUG-90491 Change-Id: I7458382a5cb7fdea192b3924baf9e86ee28d1028 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'examples')
-rw-r--r--examples/positioning/logfilepositionsource/logfilepositionsource.cpp10
-rw-r--r--examples/positioning/logfilepositionsource/logfilepositionsource.h1
2 files changed, 7 insertions, 4 deletions
diff --git a/examples/positioning/logfilepositionsource/logfilepositionsource.cpp b/examples/positioning/logfilepositionsource/logfilepositionsource.cpp
index 9c414c60..6c6c3180 100644
--- a/examples/positioning/logfilepositionsource/logfilepositionsource.cpp
+++ b/examples/positioning/logfilepositionsource/logfilepositionsource.cpp
@@ -96,10 +96,12 @@ void LogFilePositionSource::requestUpdate(int /*timeout*/)
{
// For simplicity, ignore timeout - assume that if data is not available
// now, no data will be added to the file later
- if (logFile->canReadLine())
+ if (logFile->canReadLine()) {
readNextPosition();
- else
- emit updateTimeout();
+ } else {
+ lastError = QGeoPositionInfoSource::UpdateTimeoutError;
+ emit QGeoPositionInfoSource::errorOccurred(lastError);
+ }
}
void LogFilePositionSource::readNextPosition()
@@ -128,5 +130,5 @@ void LogFilePositionSource::readNextPosition()
QGeoPositionInfoSource::Error LogFilePositionSource::error() const
{
- return QGeoPositionInfoSource::NoError;
+ return lastError;
}
diff --git a/examples/positioning/logfilepositionsource/logfilepositionsource.h b/examples/positioning/logfilepositionsource/logfilepositionsource.h
index 027dabd4..aca72ab2 100644
--- a/examples/positioning/logfilepositionsource/logfilepositionsource.h
+++ b/examples/positioning/logfilepositionsource/logfilepositionsource.h
@@ -82,6 +82,7 @@ private:
QFile *logFile;
QTimer *timer;
QGeoPositionInfo lastPosition;
+ Error lastError = QGeoPositionInfoSource::NoError;
};
#endif