Add NoError to the various Positioning Source classes.

This became apparent while implementing the BB10 and Android backends.

Change-Id: I54e2c0fce63021b9fad0c544777792aed726608b
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>

6 files changed, 8 insertions, 6 deletions

diff --git a/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp b/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp
index 1a062431..48c731e8 100644
--- a/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp
+++ b/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp
@@ -528,7 +528,7 @@ QGeoPositionInfo QGeoPositionInfoSourceGeoclueMaster::geoclueToPositionInfo(
 
 QGeoPositionInfoSource::Error QGeoPositionInfoSourceGeoclueMaster::error() const
 {
-    return UnknownSourceError;
+    return NoError;
 }
 
 #include "moc_qgeopositioninfosource_geocluemaster_p.cpp"
diff --git a/src/plugins/position/geoclue/qgeosatelliteinfosource_geocluemaster.cpp b/src/plugins/position/geoclue/qgeosatelliteinfosource_geocluemaster.cpp
index 2a8d19fc..35901d10 100644
--- a/src/plugins/position/geoclue/qgeosatelliteinfosource_geocluemaster.cpp
+++ b/src/plugins/position/geoclue/qgeosatelliteinfosource_geocluemaster.cpp
@@ -143,7 +143,7 @@ int QGeoSatelliteInfoSourceGeoclueMaster::minimumUpdateInterval() const
 
 QGeoSatelliteInfoSource::Error QGeoSatelliteInfoSourceGeoclueMaster::error() const
 {
-    return UnknownSourceError;
+    return NoError;
 }
 
 void QGeoSatelliteInfoSourceGeoclueMaster::startUpdates()
diff --git a/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp b/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp
index 3a41047a..d7c93ebd 100644
--- a/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp
+++ b/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp
@@ -290,7 +290,7 @@ int QGeoSatelliteInfoSourceGypsy::minimumUpdateInterval() const
 
 QGeoSatelliteInfoSource::Error QGeoSatelliteInfoSourceGypsy::error() const
 {
-    return UnknownSourceError;
+    return NoError;
 }
 
 void QGeoSatelliteInfoSourceGypsy::startUpdates()
diff --git a/src/plugins/position/positionpoll/qgeoareamonitor_polling.cpp b/src/plugins/position/positionpoll/qgeoareamonitor_polling.cpp
index 55d66993..c6d97c59 100644
--- a/src/plugins/position/positionpoll/qgeoareamonitor_polling.cpp
+++ b/src/plugins/position/positionpoll/qgeoareamonitor_polling.cpp
@@ -321,7 +321,7 @@ QGeoAreaMonitorPolling::QGeoAreaMonitorPolling(QObject *parent)
     : QGeoAreaMonitorSource(parent), signalsAreConnected(false)
 {
     d = pollingPrivate();
-    lastError = QGeoAreaMonitorSource::UnknownSourceError;
+    lastError = QGeoAreaMonitorSource::NoError;
     d->registerClient(this);
     //hookup to default source if existing
     if (!positionInfoSource())
@@ -492,6 +492,8 @@ void QGeoAreaMonitorPolling::positionError(const QGeoPositionInfoSource::Error e
     case QGeoPositionInfoSource::ClosedError:
         lastError = QGeoAreaMonitorSource::InsufficientPositionInfo;
         break;
+    case QGeoPositionInfoSource::NoError:
+        return;
     }
 
     emit QGeoAreaMonitorSource::error(lastError);
diff --git a/src/plugins/position/simulator/qgeopositioninfosource_simulator.cpp b/src/plugins/position/simulator/qgeopositioninfosource_simulator.cpp
index 359a9b16..3a078e16 100644
--- a/src/plugins/position/simulator/qgeopositioninfosource_simulator.cpp
+++ b/src/plugins/position/simulator/qgeopositioninfosource_simulator.cpp
@@ -78,7 +78,7 @@ QGeoPositionInfoSourceSimulator::QGeoPositionInfoSourceSimulator(QObject *parent
     : QGeoPositionInfoSource(parent)
     , timer(new QTimer(this))
     , requestTimer(new QTimer(this))
-    , m_positionError(QGeoPositionInfoSource::UnknownSourceError)
+    , m_positionError(QGeoPositionInfoSource::NoError)
 {
     Simulator::LocationConnection::ensureSimulatorConnection();
 
diff --git a/src/plugins/position/simulator/qgeosatelliteinfosource_simulator_p.h b/src/plugins/position/simulator/qgeosatelliteinfosource_simulator_p.h
index 5d97c7eb..4ed73eb7 100644
--- a/src/plugins/position/simulator/qgeosatelliteinfosource_simulator_p.h
+++ b/src/plugins/position/simulator/qgeosatelliteinfosource_simulator_p.h
@@ -64,7 +64,7 @@ public:
     virtual int minimumUpdateInterval() const;
 
     // Default implementation for error()
-    Error error() const { return QGeoSatelliteInfoSource::UnknownSourceError; }
+    Error error() const { return QGeoSatelliteInfoSource::NoError; }
 public slots:
     virtual void startUpdates();
     virtual void stopUpdates();