Merge branch 'master' into indicator

[situare] / src / ui / mainwindow.h

diff --git a/src/ui/mainwindow.h b/src/ui/mainwindow.h
index 16efacf..47aec72 100644 (file)
--- a/src/ui/mainwindow.h
+++ b/src/ui/mainwindow.h
@@ -32,23 +32,26 @@
 
 class QGraphicsScene;
 class QLabel;
-class QWebView;
+class QMessageBox;
 class QNetworkReply;
+class QToolButton;
+class QWebView;
 
 class FacebookAuthentication;
 class FullScreenButton;
 class FriendListPanel;
 class IndicatorButton;
+class GeoCoordinate;
 class MapScale;
 class MapScene;
 class MapView;
+class SettingsDialog;
+class SceneCoordinate;
 class SituareService;
 class User;
 class UserInfoPanel;
 class ZoomButtonPanel;
-class SettingsDialog;
-class QToolButton;
-class QMessageBox;
+
 
 /**
 * @brief Main Window Class
@@ -432,9 +435,9 @@ signals:
     /**
     * @brief View should be centered to new location
     *
-    * @param sceneCoordinate Scene coordinates of the new center point
+    * @param coordinate Scene coordinates of the new center point
     */
-    void centerToSceneCoordinates(QPoint sceneCoordinate);
+    void centerToSceneCoordinates(const SceneCoordinate &coordinate);
 
     /**
     * @brief Signal for enabling automatic location update.
@@ -463,7 +466,14 @@ signals:
     *
     * @param coordinates user geo coordinates
     */
-    void findUser(const QPointF &coordinates);
+    void findUser(const GeoCoordinate &coordinates);
+
+    /**
+    * @brief Signals when friend's profile image is ready
+    *
+    * @param user Friend
+    */
+    void friendImageReady(User *user);
 
     /**
     * @brief GPS setting changed
@@ -477,7 +487,7 @@ signals:
     *
     * @param coordinates friend's geo coordinates
     */
-    void findFriend(const QPointF &coordinates);
+    void findFriend(const GeoCoordinate &coordinates);
 
     /**
     * @brief Signal for friend location ready.
@@ -509,9 +519,9 @@ signals:
     /**
       * @brief Forwarding signal from MapView to MapEngine
       *
-      * @param sceneCoordinate
+      * @param coordinate
       */
-    void mapViewScrolled(QPoint sceneCoordinate);
+    void mapViewScrolled(const SceneCoordinate &coordinate);
 
     /**
       * @brief Forwarding signal from MapEngine to MapView