From 37ff0744c8c5f15606dbc2391b630ea433c3c939 Mon Sep 17 00:00:00 2001
From: Ivan Solovev <ivan.solovev@qt.io>
Date: Fri, 22 Jan 2021 14:14:49 +0100
Subject: 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>
---
 src/positioningquick/qdeclarativepositionsource_p.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/positioningquick/qdeclarativepositionsource_p.h')

diff --git a/src/positioningquick/qdeclarativepositionsource_p.h b/src/positioningquick/qdeclarativepositionsource_p.h
index aadb8772..96bc69f8 100644
--- a/src/positioningquick/qdeclarativepositionsource_p.h
+++ b/src/positioningquick/qdeclarativepositionsource_p.h
@@ -99,6 +99,7 @@ public:
         ClosedError = QGeoPositionInfoSource::ClosedError,
         UnknownSourceError = QGeoPositionInfoSource::UnknownSourceError,
         NoError = QGeoPositionInfoSource::NoError,
+        UpdateTimeoutError = QGeoPositionInfoSource::UpdateTimeoutError,
 
         //Leave a gap for future error enum values in QGeoPositionInfoSource::Error
         SocketError = 100
@@ -149,17 +150,16 @@ Q_SIGNALS:
     void sourceErrorChanged();
     void nameChanged();
     void validityChanged();
-    void updateTimeout();
 
 private Q_SLOTS:
     void positionUpdateReceived(const QGeoPositionInfo &update);
     void sourceErrorReceived(const QGeoPositionInfoSource::Error error);
     void socketConnected();
     void socketError(QAbstractSocket::SocketError error);
-    void updateTimeoutReceived();
     void onParameterInitialized();
 
 private:
+    void handleUpdateTimeout();
     void setPosition(const QGeoPositionInfo &pi);
     void setSource(QGeoPositionInfoSource *source);
     bool parametersReady();
-- 
cgit v1.2.1