QDeclarativePositionSource::{supported|preferred}PositioningMethods() always return AllPositioningMethods

Also added unit test for preferredPositioningMethods()

Change-Id: I28c1d5ce66987d3799d1d1cc97469112dd055a45
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>

1 files changed, 4 insertions, 18 deletions

diff --git a/src/imports/positioning/qdeclarativepositionsource.cpp b/src/imports/positioning/qdeclarativepositionsource.cpp
index 1d1d3a15..a13092fc 100644
--- a/src/imports/positioning/qdeclarativepositionsource.cpp
+++ b/src/imports/positioning/qdeclarativepositionsource.cpp
@@ -464,14 +464,8 @@ int QDeclarativePositionSource::updateInterval() const
 QDeclarativePositionSource::PositioningMethods QDeclarativePositionSource::supportedPositioningMethods() const
 {
     if (m_positionSource) {
-        QGeoPositionInfoSource::PositioningMethods methods = m_positionSource->supportedPositioningMethods();
-        if ( (methods & QGeoPositionInfoSource::AllPositioningMethods) == methods ) {
-            return QDeclarativePositionSource::AllPositioningMethods;
-        } else if (methods & QGeoPositionInfoSource::SatellitePositioningMethods) {
-            return QDeclarativePositionSource::SatellitePositioningMethods;
-        } else if (methods & QGeoPositionInfoSource::NonSatellitePositioningMethods) {
-            return QDeclarativePositionSource::NonSatellitePositioningMethods;
-        }
+        return static_cast<QDeclarativePositionSource::PositioningMethods>(
+            int(m_positionSource->supportedPositioningMethods()));
     }
     return QDeclarativePositionSource::NoPositioningMethods;
 }
@@ -515,16 +509,8 @@ void QDeclarativePositionSource::setPreferredPositioningMethods(PositioningMetho
 QDeclarativePositionSource::PositioningMethods QDeclarativePositionSource::preferredPositioningMethods() const
 {
     if (m_positionSource) {
-        QGeoPositionInfoSource::PositioningMethods methods =
-            m_positionSource->preferredPositioningMethods();
-        if ( (methods & QGeoPositionInfoSource::AllPositioningMethods) == methods) {
-            return QDeclarativePositionSource::AllPositioningMethods;
-        } else if (methods & QGeoPositionInfoSource::SatellitePositioningMethods) {
-            return QDeclarativePositionSource::SatellitePositioningMethods;
-        } else if (methods & QGeoPositionInfoSource::NonSatellitePositioningMethods) {
-            return QDeclarativePositionSource::NonSatellitePositioningMethods;
-        } else if (methods == QGeoPositionInfoSource::NoPositioningMethods)
-            return QDeclarativePositionSource::NoPositioningMethods;
+        return static_cast<QDeclarativePositionSource::PositioningMethods>(
+            int(m_positionSource->preferredPositioningMethods()));
     }
     return m_preferredPositioningMethods;
 }