Re-factored the source to use the new coordinate classes

[situare] / src / user / user.h

diff --git a/src/user/user.h b/src/user/user.h
index 35d4cf3..ba37a28 100644 (file)
--- a/src/user/user.h
+++ b/src/user/user.h
@@ -23,10 +23,11 @@
 #define USER_H
 
 #include <QPixmap>
-#include <QPointF>
 #include <QString>
 #include <QUrl>
 
+#include "coordinates/geocoordinate.h"
+
 /**
 * @brief Class to store user information (applies to friends also)
 *
@@ -41,7 +42,7 @@ public:
     * @brief Constructor, initializes member data
     *
     */
-    User(const QString &address, const QPointF &coordinates, const QString &name,
+    User(const QString &address, const GeoCoordinate &coordinates, const QString &name,
          const QString &note, const QUrl &imageUrl, const QString &timestamp,
          const bool &type, const QString &userId, const QString &units = 0,
          const double &value = 0);
@@ -68,7 +69,7 @@ public:
     *
     * @param coordinates coordinates
     */
-    void setCoordinates(const QPointF &coordinates);
+    void setCoordinates(const GeoCoordinate &coordinates);
 
     /**
     * @brief Set distance
@@ -116,9 +117,9 @@ public:
     /**
     * @brief Get coordinates
     *
-    * @return QPointF coordinates
+    * @return GeoCoordinate coordinates
     */
-    const QPointF &coordinates() const;
+    const GeoCoordinate &coordinates() const;
 
     /**
     * @brief Get distance and units
@@ -183,7 +184,7 @@ public:
 
 private:
     QString m_address; ///< placeholder for address information
-    QPointF m_coordinates; ///< placeholder for coordinates
+    GeoCoordinate m_coordinates; ///< placeholder for coordinates
     QString m_name; ///< placeholder for name
     QString m_note; ///< placeholder for note
     QUrl m_profileImageUrl; ///< placeholder for image url