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>

23 files changed, 47 insertions, 48 deletions

diff --git a/examples/positioning/satelliteinfo/satellitemodel.cpp b/examples/positioning/satelliteinfo/satellitemodel.cpp
index 112fc9c8..373cd604 100644
--- a/examples/positioning/satelliteinfo/satellitemodel.cpp
+++ b/examples/positioning/satelliteinfo/satellitemodel.cpp
@@ -67,7 +67,7 @@ SatelliteModel::SatelliteModel(QObject *parent) :
                 this, SLOT(satellitesInViewUpdated(QList<QGeoSatelliteInfo>)));
         connect(source, SIGNAL(satellitesInUseUpdated(QList<QGeoSatelliteInfo>)),
                 this, SLOT(satellitesInUseUpdated(QList<QGeoSatelliteInfo>)));
-        connect(source, SIGNAL(error(QGeoSatelliteInfoSource::Error)),
+        connect(source, SIGNAL(errorOccurred(QGeoSatelliteInfoSource::Error)),
                 this, SLOT(error(QGeoSatelliteInfoSource::Error)));
     }
 
diff --git a/examples/positioning/weatherinfo/appmodel.cpp b/examples/positioning/weatherinfo/appmodel.cpp
index 8950bea4..e498da5b 100644
--- a/examples/positioning/weatherinfo/appmodel.cpp
+++ b/examples/positioning/weatherinfo/appmodel.cpp
@@ -229,7 +229,7 @@ AppModel::AppModel(QObject *parent) :
         d->useGps = true;
         connect(d->src, SIGNAL(positionUpdated(QGeoPositionInfo)),
                 this, SLOT(positionUpdated(QGeoPositionInfo)));
-        connect(d->src, SIGNAL(error(QGeoPositionInfoSource::Error)),
+        connect(d->src, SIGNAL(errorOccurred(QGeoPositionInfoSource::Error)),
                 this, SLOT(positionError(QGeoPositionInfoSource::Error)));
         d->src->startUpdates();
     } else {
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)
diff --git a/src/positioning/doc/src/cpp-position.qdoc b/src/positioning/doc/src/cpp-position.qdoc
index 085aecd1..0205ad08 100644
--- a/src/positioning/doc/src/cpp-position.qdoc
+++ b/src/positioning/doc/src/cpp-position.qdoc
@@ -82,7 +82,7 @@ position source; the method returns 0 if no default source is available for
 the platform.
 
 If a problem occurs with access to the information source then an
-\l {QGeoPositionInfoSource::error()}{error()} signal is emitted.
+\l {QGeoPositionInfoSource::errorOccurred()}{errorOccurred()} signal is emitted.
 
 The QGeoAreaMonitorSource class enables client applications to be notified when
 the receiving device has moved in or out of a particular area, as specified
diff --git a/src/positioning/qgeoareamonitorsource.cpp b/src/positioning/qgeoareamonitorsource.cpp
index 5ef05a1e..fd01a370 100644
--- a/src/positioning/qgeoareamonitorsource.cpp
+++ b/src/positioning/qgeoareamonitorsource.cpp
@@ -379,7 +379,7 @@ void QGeoAreaMonitorSource::setPositionInfoSource(QGeoPositionInfoSource *newSou
 */
 
 /*!
-    \fn void QGeoAreaMonitorSource::error(QGeoAreaMonitorSource::Error areaMonitoringError)
+    \fn void QGeoAreaMonitorSource::errorOccurred(QGeoAreaMonitorSource::Error areaMonitoringError)
 
     This signal is emitted after an error occurred. The \a areaMonitoringError
     parameter describes the type of error that occurred.
diff --git a/src/positioning/qgeoareamonitorsource.h b/src/positioning/qgeoareamonitorsource.h
index 519f3130..07faae9a 100644
--- a/src/positioning/qgeoareamonitorsource.h
+++ b/src/positioning/qgeoareamonitorsource.h
@@ -95,7 +95,7 @@ Q_SIGNALS:
     void areaEntered(const QGeoAreaMonitorInfo &monitor, const QGeoPositionInfo &update);
     void areaExited(const QGeoAreaMonitorInfo &monitor, const QGeoPositionInfo &update);
     void monitorExpired(const QGeoAreaMonitorInfo &monitor);
-    void error(QGeoAreaMonitorSource::Error error);
+    void errorOccurred(QGeoAreaMonitorSource::Error error);
 
 private:
     Q_DISABLE_COPY(QGeoAreaMonitorSource)
diff --git a/src/positioning/qgeopositioninfosource.cpp b/src/positioning/qgeopositioninfosource.cpp
index 79357729..d8cc89d7 100644
--- a/src/positioning/qgeopositioninfosource.cpp
+++ b/src/positioning/qgeopositioninfosource.cpp
@@ -576,7 +576,7 @@ QGeoPositionInfoSource::QGeoPositionInfoSource(QGeoPositionInfoSourcePrivate &dd
 */
 
 /*!
-    \fn void QGeoPositionInfoSource::error(QGeoPositionInfoSource::Error positioningError)
+    \fn void QGeoPositionInfoSource::errorOccurred(QGeoPositionInfoSource::Error positioningError)
 
     This signal is emitted after an error occurred. The \a positioningError
     parameter describes the type of error that occurred.
diff --git a/src/positioning/qgeopositioninfosource.h b/src/positioning/qgeopositioninfosource.h
index 15465bdf..b5d85a6a 100644
--- a/src/positioning/qgeopositioninfosource.h
+++ b/src/positioning/qgeopositioninfosource.h
@@ -106,7 +106,7 @@ public Q_SLOTS:
 Q_SIGNALS:
     void positionUpdated(const QGeoPositionInfo &update);
     void updateTimeout();
-    void error(QGeoPositionInfoSource::Error);
+    void errorOccurred(QGeoPositionInfoSource::Error);
     void supportedPositioningMethodsChanged();
 
 protected:
diff --git a/src/positioning/qgeosatelliteinfosource.cpp b/src/positioning/qgeosatelliteinfosource.cpp
index 379c20df..d271cbf2 100644
--- a/src/positioning/qgeosatelliteinfosource.cpp
+++ b/src/positioning/qgeosatelliteinfosource.cpp
@@ -356,16 +356,15 @@ QStringList QGeoSatelliteInfoSource::availableSources()
     \fn QGeoSatelliteInfoSource::Error QGeoSatelliteInfoSource::error() const = 0
 
     Returns the last error that occurred.
-
-    This signal is not emitted when a requestTimeout() has occurred.
 */
 
 /*!
-    \fn void QGeoSatelliteInfoSource::error(QGeoSatelliteInfoSource::Error satelliteError)
+    \fn void QGeoSatelliteInfoSource::errorOccurred(QGeoSatelliteInfoSource::Error satelliteError)
 
     This signal is emitted after an error occurred. The \a satelliteError
     parameter describes the type of error that occurred.
 
+    This signal is not emitted when a requestTimeout() has occurred.
 */
 
 /*!
diff --git a/src/positioning/qgeosatelliteinfosource.h b/src/positioning/qgeosatelliteinfosource.h
index e9c4fa19..e588a60e 100644
--- a/src/positioning/qgeosatelliteinfosource.h
+++ b/src/positioning/qgeosatelliteinfosource.h
@@ -88,7 +88,7 @@ Q_SIGNALS:
     void satellitesInViewUpdated(const QList<QGeoSatelliteInfo> &satellites);
     void satellitesInUseUpdated(const QList<QGeoSatelliteInfo> &satellites);
     void requestTimeout();
-    void error(QGeoSatelliteInfoSource::Error);
+    void errorOccurred(QGeoSatelliteInfoSource::Error);
 
 protected:
     explicit QGeoSatelliteInfoSource(QGeoSatelliteInfoSourcePrivate &dd, QObject *parent);
diff --git a/src/positioning/qnmeapositioninfosource.cpp b/src/positioning/qnmeapositioninfosource.cpp
index 58d935f3..131fe52a 100644
--- a/src/positioning/qnmeapositioninfosource.cpp
+++ b/src/positioning/qnmeapositioninfosource.cpp
@@ -955,7 +955,7 @@ QGeoPositionInfoSource::Error QNmeaPositionInfoSource::error() const
 void QNmeaPositionInfoSource::setError(QGeoPositionInfoSource::Error positionError)
 {
     d->m_positionError = positionError;
-    emit QGeoPositionInfoSource::error(positionError);
+    emit QGeoPositionInfoSource::errorOccurred(positionError);
 }
 
 QT_END_NAMESPACE
diff --git a/src/positioningquick/qdeclarativepositionsource.cpp b/src/positioningquick/qdeclarativepositionsource.cpp
index f0f0b97b..b3723956 100644
--- a/src/positioningquick/qdeclarativepositionsource.cpp
+++ b/src/positioningquick/qdeclarativepositionsource.cpp
@@ -212,7 +212,7 @@ void QDeclarativePositionSource::tryAttach(const QString &newName, bool useFallb
     if (m_positionSource) {
         connect(m_positionSource, SIGNAL(positionUpdated(QGeoPositionInfo)),
                 this, SLOT(positionUpdateReceived(QGeoPositionInfo)));
-        connect(m_positionSource, SIGNAL(error(QGeoPositionInfoSource::Error)),
+        connect(m_positionSource, SIGNAL(errorOccurred(QGeoPositionInfoSource::Error)),
                 this, SLOT(sourceErrorReceived(QGeoPositionInfoSource::Error)));
         connect(m_positionSource, SIGNAL(updateTimeout()),
                 this, SLOT(updateTimeoutReceived()));
@@ -332,7 +332,7 @@ void QDeclarativePositionSource::setNmeaSource(const QUrl &nmeaSource)
             (qobject_cast<QNmeaPositionInfoSource *>(m_positionSource))->setDevice(m_nmeaFile);
             connect(m_positionSource, SIGNAL(positionUpdated(QGeoPositionInfo)),
                     this, SLOT(positionUpdateReceived(QGeoPositionInfo)));
-            connect(m_positionSource, SIGNAL(error(QGeoPositionInfoSource::Error)),
+            connect(m_positionSource, SIGNAL(errorOccurred(QGeoPositionInfoSource::Error)),
                     this, SLOT(sourceErrorReceived(QGeoPositionInfoSource::Error)));
             connect(m_positionSource, SIGNAL(updateTimeout()),
                     this, SLOT(updateTimeoutReceived()));
@@ -383,7 +383,7 @@ void QDeclarativePositionSource::socketConnected()
 
     connect(m_positionSource, &QNmeaPositionInfoSource::positionUpdated,
             this, &QDeclarativePositionSource::positionUpdateReceived);
-    connect(m_positionSource, SIGNAL(error(QGeoPositionInfoSource::Error)),
+    connect(m_positionSource, SIGNAL(errorOccurred(QGeoPositionInfoSource::Error)),
             this, SLOT(sourceErrorReceived(QGeoPositionInfoSource::Error)));
     connect(m_positionSource, SIGNAL(updateTimeout()),
             this, SLOT(updateTimeoutReceived()));
diff --git a/tests/applications/positioning_backend/widget.cpp b/tests/applications/positioning_backend/widget.cpp
index 3244c478..627ae2d6 100644
--- a/tests/applications/positioning_backend/widget.cpp
+++ b/tests/applications/positioning_backend/widget.cpp
@@ -52,7 +52,7 @@ Widget::Widget(LogWidget *logWidget, QWidget *parent) :
     ui->horizontalSlider->setMinimum(m_posSource->minimumUpdateInterval());
     ui->labelTimeOut->setVisible(false);
 
-    connect(m_posSource, SIGNAL(error(QGeoPositionInfoSource::Error)),
+    connect(m_posSource, SIGNAL(errorOccurred(QGeoPositionInfoSource::Error)),
             this, SLOT(errorChanged(QGeoPositionInfoSource::Error)));
     connect(m_posSource, &QGeoPositionInfoSource::supportedPositioningMethodsChanged,
             this, [this]() {
diff --git a/tests/auto/qgeosatelliteinfosource/testqgeosatelliteinfosource.cpp b/tests/auto/qgeosatelliteinfosource/testqgeosatelliteinfosource.cpp
index 42e2a3c6..50b963ff 100644
--- a/tests/auto/qgeosatelliteinfosource/testqgeosatelliteinfosource.cpp
+++ b/tests/auto/qgeosatelliteinfosource/testqgeosatelliteinfosource.cpp
@@ -247,7 +247,7 @@ void TestQGeoSatelliteInfoSource::startUpdates_testIntervals()
     QSignalSpy spyUse(m_source,
                       SIGNAL(satellitesInUseUpdated(QList<QGeoSatelliteInfo>)));
     QSignalSpy timeout(m_source, SIGNAL(requestTimeout()));
-    QSignalSpy errorSpy(m_source, SIGNAL(error(QGeoSatelliteInfoSource::Error)));
+    QSignalSpy errorSpy(m_source, SIGNAL(errorOccurred(QGeoSatelliteInfoSource::Error)));
 
     m_source->setUpdateInterval(7000);
     int interval = m_source->updateInterval();
@@ -282,7 +282,7 @@ void TestQGeoSatelliteInfoSource::startUpdates_testIntervalChangesWhileRunning()
     QSignalSpy spyUse(m_source,
                       SIGNAL(satellitesInUseUpdated(QList<QGeoSatelliteInfo>)));
     QSignalSpy timeout(m_source, SIGNAL(requestTimeout()));
-    QSignalSpy errorSpy(m_source, SIGNAL(error(QGeoSatelliteInfoSource::Error)));
+    QSignalSpy errorSpy(m_source, SIGNAL(errorOccurred(QGeoSatelliteInfoSource::Error)));
 
     m_source->setUpdateInterval(0);
     m_source->startUpdates();
@@ -342,7 +342,7 @@ void TestQGeoSatelliteInfoSource::startUpdates_testDefaultInterval()
     QSignalSpy spyUse(m_source,
                       SIGNAL(satellitesInUseUpdated(QList<QGeoSatelliteInfo>)));
     QSignalSpy timeout(m_source, SIGNAL(requestTimeout()));
-    QSignalSpy errorSpy(m_source, SIGNAL(error(QGeoSatelliteInfoSource::Error)));
+    QSignalSpy errorSpy(m_source, SIGNAL(errorOccurred(QGeoSatelliteInfoSource::Error)));
 
     m_source->startUpdates();
 
@@ -365,7 +365,7 @@ void TestQGeoSatelliteInfoSource::startUpdates_testZeroInterval()
     QSignalSpy spyUse(m_source,
                       SIGNAL(satellitesInUseUpdated(QList<QGeoSatelliteInfo>)));
     QSignalSpy timeout(m_source, SIGNAL(requestTimeout()));
-    QSignalSpy errorSpy(m_source, SIGNAL(error(QGeoSatelliteInfoSource::Error)));
+    QSignalSpy errorSpy(m_source, SIGNAL(errorOccurred(QGeoSatelliteInfoSource::Error)));
 
     m_source->setUpdateInterval(0);
     m_source->startUpdates();
@@ -388,7 +388,7 @@ void TestQGeoSatelliteInfoSource::startUpdates_moreThanOnce()
                        SIGNAL(satellitesInViewUpdated(QList<QGeoSatelliteInfo>)));
     QSignalSpy spyUse(m_source,
                       SIGNAL(satellitesInUseUpdated(QList<QGeoSatelliteInfo>)));
-    QSignalSpy errorSpy(m_source, SIGNAL(error(QGeoSatelliteInfoSource::Error)));
+    QSignalSpy errorSpy(m_source, SIGNAL(errorOccurred(QGeoSatelliteInfoSource::Error)));
 
     m_source->setUpdateInterval(0);
     m_source->startUpdates();
@@ -413,7 +413,7 @@ void TestQGeoSatelliteInfoSource::stopUpdates()
                        SIGNAL(satellitesInViewUpdated(QList<QGeoSatelliteInfo>)));
     QSignalSpy spyUse(m_source,
                       SIGNAL(satellitesInUseUpdated(QList<QGeoSatelliteInfo>)));
-    QSignalSpy errorSpy(m_source, SIGNAL(error(QGeoSatelliteInfoSource::Error)));
+    QSignalSpy errorSpy(m_source, SIGNAL(errorOccurred(QGeoSatelliteInfoSource::Error)));
 
     m_source->setUpdateInterval(10000);
     m_source->startUpdates();
@@ -447,7 +447,7 @@ void TestQGeoSatelliteInfoSource::requestUpdate()
     QSignalSpy spy(m_source, SIGNAL(requestTimeout()));
     QSignalSpy spyView(m_source,
                        SIGNAL(satellitesInViewUpdated(QList<QGeoSatelliteInfo>)));
-    QSignalSpy errorSpy(m_source, SIGNAL(error(QGeoSatelliteInfoSource::Error)));
+    QSignalSpy errorSpy(m_source, SIGNAL(errorOccurred(QGeoSatelliteInfoSource::Error)));
 
     m_source->requestUpdate(timeout);
 
@@ -474,7 +474,7 @@ void TestQGeoSatelliteInfoSource::requestUpdate_validTimeout()
     QSignalSpy spyUse(m_source,
                       SIGNAL(satellitesInUseUpdated(QList<QGeoSatelliteInfo>)));
     QSignalSpy spyTimeout(m_source, SIGNAL(requestTimeout()));
-    QSignalSpy errorSpy(m_source, SIGNAL(error(QGeoSatelliteInfoSource::Error)));
+    QSignalSpy errorSpy(m_source, SIGNAL(errorOccurred(QGeoSatelliteInfoSource::Error)));
 
     m_source->requestUpdate(7000);
 
@@ -494,7 +494,7 @@ void TestQGeoSatelliteInfoSource::requestUpdate_defaultTimeout()
     QSignalSpy spyUse(m_source,
                       SIGNAL(satellitesInUseUpdated(QList<QGeoSatelliteInfo>)));
     QSignalSpy spyTimeout(m_source, SIGNAL(requestTimeout()));
-    QSignalSpy errorSpy(m_source, SIGNAL(error(QGeoSatelliteInfoSource::Error)));
+    QSignalSpy errorSpy(m_source, SIGNAL(errorOccurred(QGeoSatelliteInfoSource::Error)));
 
     m_source->requestUpdate(0);
 
@@ -511,7 +511,7 @@ void TestQGeoSatelliteInfoSource::requestUpdate_timeoutLessThanMinimumInterval()
     CHECK_SOURCE_VALID;
 
     QSignalSpy spyTimeout(m_source, SIGNAL(requestTimeout()));
-    QSignalSpy errorSpy(m_source, SIGNAL(error(QGeoSatelliteInfoSource::Error)));
+    QSignalSpy errorSpy(m_source, SIGNAL(errorOccurred(QGeoSatelliteInfoSource::Error)));
 
     m_source->requestUpdate(1);
 
@@ -529,7 +529,7 @@ void TestQGeoSatelliteInfoSource::requestUpdate_repeatedCalls()
                        SIGNAL(satellitesInViewUpdated(QList<QGeoSatelliteInfo>)));
     QSignalSpy spyUse(m_source,
                       SIGNAL(satellitesInUseUpdated(QList<QGeoSatelliteInfo>)));
-    QSignalSpy errorSpy(m_source, SIGNAL(error(QGeoSatelliteInfoSource::Error)));
+    QSignalSpy errorSpy(m_source, SIGNAL(errorOccurred(QGeoSatelliteInfoSource::Error)));
 
     m_source->requestUpdate(7000);
 
@@ -553,7 +553,7 @@ void TestQGeoSatelliteInfoSource::requestUpdate_overlappingCalls()
                        SIGNAL(satellitesInViewUpdated(QList<QGeoSatelliteInfo>)));
     QSignalSpy spyUse(m_source,
                       SIGNAL(satellitesInUseUpdated(QList<QGeoSatelliteInfo>)));
-    QSignalSpy errorSpy(m_source, SIGNAL(error(QGeoSatelliteInfoSource::Error)));
+    QSignalSpy errorSpy(m_source, SIGNAL(errorOccurred(QGeoSatelliteInfoSource::Error)));
 
     m_source->requestUpdate(7000);
 
@@ -575,7 +575,7 @@ void TestQGeoSatelliteInfoSource::requestUpdate_overlappingCallsWithTimeout()
                       SIGNAL(satellitesInUseUpdated(QList<QGeoSatelliteInfo>)));
     QSignalSpy spyTimeout(m_source,
                       SIGNAL(requestTimeout()));
-    QSignalSpy errorSpy(m_source, SIGNAL(error(QGeoSatelliteInfoSource::Error)));
+    QSignalSpy errorSpy(m_source, SIGNAL(errorOccurred(QGeoSatelliteInfoSource::Error)));
 
     m_source->requestUpdate(0);
 
@@ -598,7 +598,7 @@ void TestQGeoSatelliteInfoSource::requestUpdateAfterStartUpdates_ZeroInterval()
     QSignalSpy spyUse(m_source,
                       SIGNAL(satellitesInUseUpdated(QList<QGeoSatelliteInfo>)));
     QSignalSpy spyTimeout(m_source, SIGNAL(requestTimeout()));
-    QSignalSpy errorSpy(m_source, SIGNAL(error(QGeoSatelliteInfoSource::Error)));
+    QSignalSpy errorSpy(m_source, SIGNAL(errorOccurred(QGeoSatelliteInfoSource::Error)));
 
     m_source->setUpdateInterval(0);
     m_source->startUpdates();
@@ -632,7 +632,7 @@ void TestQGeoSatelliteInfoSource::requestUpdateAfterStartUpdates_SmallInterval()
     QSignalSpy spyUse(m_source,
                       SIGNAL(satellitesInUseUpdated(QList<QGeoSatelliteInfo>)));
     QSignalSpy spyTimeout(m_source, SIGNAL(requestTimeout()));
-    QSignalSpy errorSpy(m_source, SIGNAL(error(QGeoSatelliteInfoSource::Error)));
+    QSignalSpy errorSpy(m_source, SIGNAL(errorOccurred(QGeoSatelliteInfoSource::Error)));
 
     m_source->setUpdateInterval(10000);
     m_source->requestUpdate(7000);
@@ -661,7 +661,7 @@ void TestQGeoSatelliteInfoSource::requestUpdateBeforeStartUpdates_ZeroInterval()
     QSignalSpy spyUse(m_source,
                       SIGNAL(satellitesInUseUpdated(QList<QGeoSatelliteInfo>)));
     QSignalSpy timeout(m_source, SIGNAL(requestTimeout()));
-    QSignalSpy errorSpy(m_source, SIGNAL(error(QGeoSatelliteInfoSource::Error)));
+    QSignalSpy errorSpy(m_source, SIGNAL(errorOccurred(QGeoSatelliteInfoSource::Error)));
 
     m_source->requestUpdate(7000);
 
@@ -690,7 +690,7 @@ void TestQGeoSatelliteInfoSource::requestUpdateBeforeStartUpdates_SmallInterval(
     QSignalSpy spyUse(m_source,
                       SIGNAL(satellitesInUseUpdated(QList<QGeoSatelliteInfo>)));
     QSignalSpy timeout(m_source, SIGNAL(requestTimeout()));
-    QSignalSpy errorSpy(m_source, SIGNAL(error(QGeoSatelliteInfoSource::Error)));
+    QSignalSpy errorSpy(m_source, SIGNAL(errorOccurred(QGeoSatelliteInfoSource::Error)));
 
     m_source->requestUpdate(7000);