QtPositioning: rename signal error() to errorOccurred()

Signal name was previouly clashing with the error() method.
The new signal name is aligned with QtNetwork and QProcess

[ChangeLog][QtPositioning][Important Behavior Changes] Rename signal
error() to errorOccurred() in QGeoAreaMonitorSource, QGeoPositionInfoSource
and QGeoSatelliteInfoSource

Task-number: QTBUG-90491
Change-Id: I241322c6654e1c92e1a3c63a8958bcf96bf5f4f7
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>

10 files changed, 15 insertions, 15 deletions

diff --git a/src/plugins/position/android/src/qgeopositioninfosource_android.cpp b/src/plugins/position/android/src/qgeopositioninfosource_android.cpp
index 38778ec4..0cf68c6d 100644
--- a/src/plugins/position/android/src/qgeopositioninfosource_android.cpp
+++ b/src/plugins/position/android/src/qgeopositioninfosource_android.cpp
@@ -123,7 +123,7 @@ void QGeoPositionInfoSourceAndroid::setError(Error error)
     if (error != QGeoPositionInfoSource::NoError)
     {
         m_error = error;
-        emit QGeoPositionInfoSource::error(m_error);
+        emit QGeoPositionInfoSource::errorOccurred(m_error);
     }
 }
 
diff --git a/src/plugins/position/android/src/qgeosatelliteinfosource_android.cpp b/src/plugins/position/android/src/qgeosatelliteinfosource_android.cpp
index f89f6663..92ad0df4 100644
--- a/src/plugins/position/android/src/qgeosatelliteinfosource_android.cpp
+++ b/src/plugins/position/android/src/qgeosatelliteinfosource_android.cpp
@@ -110,7 +110,7 @@ void QGeoSatelliteInfoSourceAndroid::startUpdates()
     if (error != QGeoSatelliteInfoSource::NoError) {
         updatesRunning = false;
         m_error = error;
-        emit QGeoSatelliteInfoSource::error(m_error);
+        emit QGeoSatelliteInfoSource::errorOccurred(m_error);
     }
 }
 
@@ -149,7 +149,7 @@ void QGeoSatelliteInfoSourceAndroid::requestUpdate(int timeout)
     if (error != QGeoSatelliteInfoSource::NoError) {
         requestTimer.stop();
         m_error = error;
-        emit QGeoSatelliteInfoSource::error(m_error);
+        emit QGeoSatelliteInfoSource::errorOccurred(m_error);
     }
 }
 
@@ -212,5 +212,5 @@ void QGeoSatelliteInfoSourceAndroid::reconfigureRunningSystem()
 void QGeoSatelliteInfoSourceAndroid::locationProviderDisabled()
 {
     m_error = QGeoSatelliteInfoSource::ClosedError;
-    emit QGeoSatelliteInfoSource::error(m_error);
+    emit QGeoSatelliteInfoSource::errorOccurred(m_error);
 }
diff --git a/src/plugins/position/corelocation/qgeopositioninfosource_cl.mm b/src/plugins/position/corelocation/qgeopositioninfosource_cl.mm
index 8d9c6dab..ee8be31d 100644
--- a/src/plugins/position/corelocation/qgeopositioninfosource_cl.mm
+++ b/src/plugins/position/corelocation/qgeopositioninfosource_cl.mm
@@ -325,7 +325,7 @@ QGeoPositionInfoSource::Error QGeoPositionInfoSourceCL::error() const
 void QGeoPositionInfoSourceCL::setError(QGeoPositionInfoSource::Error positionError)
 {
     m_positionError = positionError;
-    emit QGeoPositionInfoSource::error(positionError);
+    emit QGeoPositionInfoSource::errorOccurred(positionError);
 }
 
 QT_END_NAMESPACE
diff --git a/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp b/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp
index 95ca42be..d133a675 100644
--- a/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp
+++ b/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp
@@ -477,13 +477,13 @@ void QGeoPositionInfoSourceGeoclueMaster::configurePositionSource()
     default:
         qWarning("QGeoPositionInfoSourceGeoclueMaster unknown preferred method.");
         m_error = UnknownSourceError;
-        emit QGeoPositionInfoSource::error(m_error);
+        emit QGeoPositionInfoSource::errorOccurred(m_error);
         return;
     }
 
     if (!created) {
         m_error = UnknownSourceError;
-        emit QGeoPositionInfoSource::error(m_error);
+        emit QGeoPositionInfoSource::errorOccurred(m_error);
     }
 }
 
diff --git a/src/plugins/position/geoclue/qgeosatelliteinfosource_geocluemaster.cpp b/src/plugins/position/geoclue/qgeosatelliteinfosource_geocluemaster.cpp
index bc1f8d7d..a54a51a5 100644
--- a/src/plugins/position/geoclue/qgeosatelliteinfosource_geocluemaster.cpp
+++ b/src/plugins/position/geoclue/qgeosatelliteinfosource_geocluemaster.cpp
@@ -251,7 +251,7 @@ void QGeoSatelliteInfoSourceGeoclueMaster::positionProviderChanged(const QString
 
     if (providerService.isEmpty() || providerPath.isEmpty()) {
         m_error = AccessError;
-        emit QGeoSatelliteInfoSource::error(m_error);
+        emit QGeoSatelliteInfoSource::errorOccurred(m_error);
         return;
     }
 
@@ -293,7 +293,7 @@ void QGeoSatelliteInfoSourceGeoclueMaster::configureSatelliteSource()
 {
     if (!m_master->createMasterClient(Accuracy::Detailed, QGeoclueMaster::ResourceGps)) {
         m_error = UnknownSourceError;
-        emit QGeoSatelliteInfoSource::error(m_error);
+        emit QGeoSatelliteInfoSource::errorOccurred(m_error);
     }
 }
 
diff --git a/src/plugins/position/geoclue2/qgeopositioninfosource_geoclue2.cpp b/src/plugins/position/geoclue2/qgeopositioninfosource_geoclue2.cpp
index 10484e3b..7ca76ae5 100644
--- a/src/plugins/position/geoclue2/qgeopositioninfosource_geoclue2.cpp
+++ b/src/plugins/position/geoclue2/qgeopositioninfosource_geoclue2.cpp
@@ -201,7 +201,7 @@ void QGeoPositionInfoSourceGeoclue2::requestUpdate(int timeout)
 void QGeoPositionInfoSourceGeoclue2::setError(QGeoPositionInfoSource::Error error)
 {
     m_error = error;
-    emit QGeoPositionInfoSource::error(m_error);
+    emit QGeoPositionInfoSource::errorOccurred(m_error);
 }
 
 void QGeoPositionInfoSourceGeoclue2::restoreLastPosition()
diff --git a/src/plugins/position/positionpoll/qgeoareamonitor_polling.cpp b/src/plugins/position/positionpoll/qgeoareamonitor_polling.cpp
index 414d2f34..cd480bab 100644
--- a/src/plugins/position/positionpoll/qgeoareamonitor_polling.cpp
+++ b/src/plugins/position/positionpoll/qgeoareamonitor_polling.cpp
@@ -163,7 +163,7 @@ public:
             disconnect(source, 0, 0, 0); //disconnect all
             connect(source, SIGNAL(positionUpdated(QGeoPositionInfo)),
                     this, SLOT(positionUpdated(QGeoPositionInfo)));
-            connect(source, SIGNAL(error(QGeoPositionInfoSource::Error)),
+            connect(source, SIGNAL(errorOccurred(QGeoPositionInfoSource::Error)),
                     this, SIGNAL(positionError(QGeoPositionInfoSource::Error)));
             checkStartStop();
         }
@@ -477,7 +477,7 @@ void QGeoAreaMonitorPolling::positionError(const QGeoPositionInfoSource::Error e
         return;
     }
 
-    emit QGeoAreaMonitorSource::error(lastError);
+    emit QGeoAreaMonitorSource::errorOccurred(lastError);
 }
 
 void QGeoAreaMonitorPolling::timeout(const QGeoAreaMonitorInfo& monitor)
diff --git a/src/plugins/position/serialnmea/qnmeasatelliteinfosource.cpp b/src/plugins/position/serialnmea/qnmeasatelliteinfosource.cpp
index 9804c406..d0a4d3b5 100644
--- a/src/plugins/position/serialnmea/qnmeasatelliteinfosource.cpp
+++ b/src/plugins/position/serialnmea/qnmeasatelliteinfosource.cpp
@@ -549,7 +549,7 @@ void QNmeaSatelliteInfoSource::requestUpdate(int msec)
 void QNmeaSatelliteInfoSource::setError(QGeoSatelliteInfoSource::Error satelliteError)
 {
     d->m_satelliteError = satelliteError;
-    emit QGeoSatelliteInfoSource::error(satelliteError);
+    emit QGeoSatelliteInfoSource::errorOccurred(satelliteError);
 }
 
 
diff --git a/src/plugins/position/simulator/qgeopositioninfosource_simulator.cpp b/src/plugins/position/simulator/qgeopositioninfosource_simulator.cpp
index 39651b8f..3849e9ad 100644
--- a/src/plugins/position/simulator/qgeopositioninfosource_simulator.cpp
+++ b/src/plugins/position/simulator/qgeopositioninfosource_simulator.cpp
@@ -164,7 +164,7 @@ QGeoPositionInfoSource::Error QGeoPositionInfoSourceSimulator::error() const
 void QGeoPositionInfoSourceSimulator::setError(QGeoPositionInfoSource::Error positionError)
 {
     m_positionError = positionError;
-    emit QGeoPositionInfoSource::error(positionError);
+    emit QGeoPositionInfoSource::errorOccurred(positionError);
 }
 
 QT_END_NAMESPACE
diff --git a/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp b/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp
index b326db89..46164273 100644
--- a/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp
+++ b/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp
@@ -483,7 +483,7 @@ void QGeoPositionInfoSourceWinRT::setError(QGeoPositionInfoSource::Error positio
     qCDebug(lcPositioningWinRT) << __FUNCTION__ << positionError;
     d->positionError = positionError;
     if (positionError != QGeoPositionInfoSource::NoError)
-        emit QGeoPositionInfoSource::error(positionError);
+        emit QGeoPositionInfoSource::errorOccurred(positionError);
 }
 
 void QGeoPositionInfoSourceWinRT::reactOnError(QGeoPositionInfoSource::Error positionError)