Continued re-factoring, can now be compiled for device and desktop

diff --git a/src/gps/gpspositionprivate.cpp b/src/gps/gpspositionprivate.cpp
index 47c2760..6c571e2 100644 (file)
--- a/src/gps/gpspositionprivate.cpp
+++ b/src/gps/gpspositionprivate.cpp
@@ -47,7 +47,7 @@ void GPSPositionPrivate::setPowerSave(bool enabled)
     qDebug() << __PRETTY_FUNCTION__;
 }
 
-bool GPSPositionPrivate::isInitialized()
+bool GPSPositionPrivate::isInitialized() const
 {
     qDebug() << __PRETTY_FUNCTION__;
 
@@ -111,17 +111,17 @@ void GPSPositionPrivate::stop()
     }
 }
 
-bool GPSPositionPrivate::isRunning()
+bool GPSPositionPrivate::isRunning() const
 {
     qDebug() << __PRETTY_FUNCTION__;
 
     return m_running;
 }
 
-QPointF GPSPositionPrivate::lastPosition()
+GeoCoordinate GPSPositionPrivate::lastPosition() const
 {
     QGeoCoordinate coordinate = m_gpsSource->lastKnownPosition().coordinate();
-    return QPointF(coordinate.longitude(), coordinate.latitude());
+    return GeoCoordinate(coordinate.latitude(), coordinate.longitude());
 }
 
 void GPSPositionPrivate::requestLastPosition()
@@ -131,8 +131,8 @@ void GPSPositionPrivate::requestLastPosition()
     QGeoCoordinate coordinate = m_gpsSource->lastKnownPosition().coordinate();
 
     if (coordinate.isValid()) {
-        emit m_parent->position(QPointF(coordinate.longitude(), coordinate.latitude()),
-                      accuracy(m_gpsSource->lastKnownPosition()));
+        emit m_parent->position(GeoCoordinate(coordinate.latitude(), coordinate.longitude()),
+                                accuracy(m_gpsSource->lastKnownPosition()));
     }
 }
 
@@ -150,10 +150,11 @@ void GPSPositionPrivate::positionUpdated(const QGeoPositionInfo &positionInfo)
 {
     qDebug() << __PRETTY_FUNCTION__ << positionInfo;
 
-    if (positionInfo.coordinate().isValid()) {
-        emit m_parent->position(QPointF(positionInfo.coordinate().longitude(),
-                              positionInfo.coordinate().latitude()),
-                      accuracy(positionInfo));
+    const QGeoCoordinate &coordinate = positionInfo.coordinate();
+
+    if (coordinate().isValid()) {
+        emit m_parent->position(GeoCoordinate(coordinate.latitude(), coordinate.longitude()),
+                                accuracy(positionInfo));
     }
 }
 

diff --git a/src/gps/gpspositionprivate.h b/src/gps/gpspositionprivate.h
index 213c4ea..6567023 100644 (file)
--- a/src/gps/gpspositionprivate.h
+++ b/src/gps/gpspositionprivate.h
@@ -22,14 +22,14 @@
 #ifndef GPSPOSITIONPRIVATE_H
 #define GPSPOSITIONPRIVATE_H
 
-#include <QPointF>
-
 #include <QGeoPositionInfo>
 #include <QGeoPositionInfoSource>
 #include <QNmeaPositionInfoSource>
 
 #include "gpsposition.h"
 
+class GeoCoordinate;
+
 QTM_USE_NAMESPACE
 
 /**
@@ -56,19 +56,19 @@ public:
     *
     * @return true if initialized, false otherwise
     */
-    bool isInitialized();
+    bool isInitialized() const;
 
     /**
     * @brief Checks if GPS is running.
     *
     * @return true if GPS running, false otherwise
     */
-    bool isRunning();
+    bool isRunning() const;
 
     /**
     * @brief Return last known position.
     */
-    QPointF lastPosition();
+    GeoCoordinate lastPosition() const;
 
     /**
     * @brief Informs gps to emit last known position.

diff --git a/src/gps/gpspositionprivateliblocation.cpp b/src/gps/gpspositionprivateliblocation.cpp
index cd8bf80..24ea392 100644 (file)
--- a/src/gps/gpspositionprivateliblocation.cpp
+++ b/src/gps/gpspositionprivateliblocation.cpp
@@ -60,7 +60,7 @@ void GPSPositionPrivate::delayedPowerSaveStart()
     m_liblocationWrapper->stopUpdates();
 }
 
-bool GPSPositionPrivate::isInitialized()
+bool GPSPositionPrivate::isInitialized() const
 {
     qDebug() << __PRETTY_FUNCTION__;
 
@@ -81,7 +81,7 @@ void GPSPositionPrivate::setMode(GPSPosition::Mode mode, const QString &filePath
     if (mode == GPSPosition::Default) {
         m_liblocationWrapper = new LiblocationWrapper(this);
 
-        if (!m_liblocationWrapper) {     
+        if (!m_liblocationWrapper) {
             m_initialized = false;
             emit m_parent->error(ErrorContext::SITUARE, SituareError::GPS_INITIALIZATION_FAILED);
             return;
@@ -137,20 +137,20 @@ void GPSPositionPrivate::stop()
     }
 }
 
-bool GPSPositionPrivate::isRunning()
+bool GPSPositionPrivate::isRunning() const
 {
     qDebug() << __PRETTY_FUNCTION__;
 
     return m_running;
 }
 
-QPointF GPSPositionPrivate::lastPosition()
+GeoCoordinate GPSPositionPrivate::lastPosition() const
 {
     qDebug() << __PRETTY_FUNCTION__;
 
     GeoPositionInfo positionInfo =  m_liblocationWrapper->lastKnownPosition();
 
-    return QPointF(positionInfo.coordinate().longitude(), positionInfo.coordinate().latitude());
+    return positionInfo.coordinate();
 }
 
 void GPSPositionPrivate::requestLastPosition()
@@ -159,11 +159,8 @@ void GPSPositionPrivate::requestLastPosition()
 
     GeoPositionInfo positionInfo = m_liblocationWrapper->lastKnownPosition();
 
-    if (positionInfo.isValid()) {
-        GeoCoordinate coordinate = positionInfo.coordinate();
-        emit m_parent->position(QPointF(coordinate.longitude(), coordinate.latitude()),
-                      accuracy(positionInfo));
-    }
+    if (positionInfo.isValid())
+        emit m_parent->position(positionInfo.coordinate(), accuracy(positionInfo));
 }
 
 void GPSPositionPrivate::requestUpdate()
@@ -180,11 +177,8 @@ void GPSPositionPrivate::positionUpdated(const GeoPositionInfo &positionInfo)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    if (positionInfo.coordinate().isValid()) {
-        GeoCoordinate coordinate = positionInfo.coordinate();
-        emit m_parent->position(QPointF(coordinate.longitude(), coordinate.latitude()),
-                      accuracy(positionInfo));
-    }
+    if (positionInfo.coordinate().isValid())
+        emit m_parent->position(positionInfo.coordinate(), accuracy(positionInfo));
 
     if (m_powerSave)
         m_liblocationWrapper->stopUpdates();

diff --git a/src/gps/gpspositionprivateliblocation.h b/src/gps/gpspositionprivateliblocation.h
index eae5141..3e1b872 100644 (file)
--- a/src/gps/gpspositionprivateliblocation.h
+++ b/src/gps/gpspositionprivateliblocation.h
@@ -22,13 +22,13 @@
 #ifndef GPSPOSITIONPRIVATELIBLOCATION_H
 #define GPSPOSITIONPRIVATELIBLOCATION_H
 
-#include <QPointF>
-
 #include "gpsposition.h"
 #include "geopositioninfo.h"
 
 class QTimer;
+
 class LiblocationWrapper;
+class GeoCoordinate;
 
 /**
 * @brief GPSPositionPrivate class use GPS to receive location information.
@@ -54,19 +54,19 @@ public:
     *
     * @return true if initialized, false otherwise
     */
-    bool isInitialized();
+    bool isInitialized() const;
 
     /**
     * @brief Checks if GPS is running.
     *
     * @return true if GPS running, false otherwise
     */
-    bool isRunning();
+    bool isRunning() const;
 
     /**
     * @brief Return last known position.
     */
-    QPointF lastPosition();
+    GeoCoordinate lastPosition() const;
 
     /**
     * @brief Informs gps to emit last known position.