Merge branch 'crosshair2'

[situare] / src / ui / mapviewscreen.h

diff --git a/src/ui/mapviewscreen.h b/src/ui/mapviewscreen.h
index 533072d..bde9443 100644 (file)
--- a/src/ui/mapviewscreen.h
+++ b/src/ui/mapviewscreen.h
@@ -32,8 +32,6 @@
 
 /**
 * @brief Map View class. Used to display Map
-*
-* @class MapViewScreen mainwindow.h "src/ui/mainwindow.h"
 */
 class MapViewScreen : public QWidget
 {
@@ -60,13 +58,6 @@ public slots:
 
 private slots:
     /**
-    * @brief Slot for enabling auto centering.
-    *
-    * @param enabled true if map should center to GPS position, false otherwise
-    */
-    void enableAutoCentering(bool enabled);
-
-    /**
     * @brief Slot for drawing the Open Street Map license text
     *
     * @param width Width of the viewport
@@ -82,10 +73,10 @@ private slots:
     */
     void drawOwnLocationCrosshair(int width, int height);
 
-    /**
-    * @brief Slot for map location change.
-    */
-    void locationChanged();
+//    /**
+//    * @brief Slot for map location change.
+//    */
+//    void locationChanged();
 
     /**
     * @brief Set correnct view port size to datamembers
@@ -95,19 +86,18 @@ private slots:
     */
     void setViewPortSize(const int width, const int height);
 
-    /**
-    * @brief Slot for GPS position.
-    *
-    * @param position latitude and longitude values
-    * @param accuracy coordinate accuracy in metres
-    */
-    void positionReceived(QPointF position, qreal accuracy);
-
 /*******************************************************************************
  * SIGNALS
  ******************************************************************************/
 signals:
     /**
+    * @brief Signal for enabling auto centering.
+    *
+    * @param enabled true if map should center to GPS position, false otherwise
+    */
+    void enableAutoCentering(bool enabled);
+
+    /**
     * @brief Signal when friend list locations are fetched
     *
     * Forwarded to map engine and friends list panel
@@ -116,12 +106,27 @@ signals:
     */
     void friendsLocationsReady(QList<User *> &friendsList);
 
-       /**
+    /**
+      * @brief Signal for GPS enabling / disabling
+      *
+      * @param enabled True is GPS is enabled, otherwise false
+      */
+    void gpsEnabled(bool enabled);
+
+    /**
     * @brief Signal for map location change.
     */
     void mapLocationChanged();
 
     /**
+    * @brief Slot for GPS position.
+    *
+    * @param position latitude and longitude values
+    * @param accuracy coordinate accuracy in metres
+    */
+    void positionReceived(QPointF position, qreal accuracy);
+
+    /**
     * @brief Signal from MapEngine to SituareEngine is travelling here
     */
     void ownLocation(QPointF ownLatitudeLongitudeLocation);
@@ -152,16 +157,15 @@ signals:
  * DATA MEMBERS
  ******************************************************************************/
 private:
-    MapEngine *m_mapEngine;                 ///< MapEngine
-    UserInfoPanel *m_userPanel;             ///< Instance of the user information panel
-    FriendListPanel *m_friendsListPanel;    ///< Instance of friends list panel
-    ZoomButtonPanel *m_zoomButtonPanel;     ///< Instance of zoom button panel
-    QLabel *m_osmLicense;                   ///< Label for Open Street Map license
-    bool m_autoCenteringEnabled;            ///< Enable
-    QLabel *m_ownLocationCrosshair;         ///< Label that show ownLocationCrosshair
-    bool m_drawOwnLocationCrosshair;        ///< Flag for making ownLocationCrosshair visible or not
-    int m_viewPortWidth;                    ///< Width of view port
-    int m_viewPortHeight;                   ///< Height of view port
+       bool m_drawOwnLocationCrosshair;        ///< Flag for making ownLocationCrosshair visible or not
+       FriendListPanel *m_friendsListPanel; ///< Instance of friends list panel
+       MapEngine *m_mapEngine;              ///< MapEngine
+       QLabel *m_osmLicense;                ///< Label for Open Street Map license
+       QLabel *m_ownLocationCrosshair;         ///< Label that show ownLocationCrosshair    
+       UserInfoPanel *m_userPanel;          ///< Instance of the user information panel
+       int m_viewPortHeight;   ///< Height of view port
+       int m_viewPortWidth;                    ///< Width of view port
+       ZoomButtonPanel *m_zoomButtonPanel;  ///< Instance of zoom button panel
 };
 
 #endif // MAPVIEWTAB_H