Merge branch 'master' into cookies_refactored

[situare] / src / ui / mainwindow.h

diff --git a/src/ui/mainwindow.h b/src/ui/mainwindow.h
index 44d5878..05c98eb 100644 (file)
--- a/src/ui/mainwindow.h
+++ b/src/ui/mainwindow.h
@@ -137,6 +137,10 @@ public slots:
     */
     void loginFailed();
 
+    /**
+    * @brief Slot to intercept signal when login with cookies is requested
+    *
+    */
     void loginUsingCookies();
 
     /**
@@ -179,6 +183,10 @@ private:
       */
     void buildFriendListPanel();
 
+    /**
+    * @brief Build login dialog and connect slots
+    *
+    */
     void buildLoginDialog();
 
     /**
@@ -201,6 +209,10 @@ private:
       */
     void buildUserInfoPanel();
 
+    /**
+    * @brief Build webview and connect slots
+    *
+    */
     void buildWebView();
 
     /**
@@ -208,9 +220,20 @@ private:
       */
     void buildZoomButtonPanel();
 
+    /**
+    * @brief Clears cookie jar
+    *
+    */
     void clearCookieJar();
 
     /**
+    * @brief connect/disconnect webview signals
+    *
+    * @param connectSignals true = connect, false = disconnect
+    */
+    void connectWebViewSignals(bool connectSignals);
+
+    /**
     * @brief Private method to create the Menu items
     */
     void createMenus();
@@ -259,6 +282,10 @@ private slots:
     */
     void gpsTimeout();
 
+    /**
+    * @brief Slot to load cookies from settings
+    *
+    */
     void loadCookies();
 
     /**
@@ -268,6 +295,10 @@ private slots:
     */
     void loadDone(bool done);
 
+    /**
+    * @brief Slot to save cookies to settings
+    *
+    */
     void saveCookies();
 
     /**
@@ -309,6 +340,13 @@ signals:
     void fetchUsernameFromSettings();
 
     /**
+    * @brief Signal for finding user.
+    *
+    * @param coordinates user geo coordinates
+    */
+    void findUser(const QPointF &coordinates);
+
+    /**
     * @brief GPS setting changed
     *
     * @param enabled True if GPS is enabled, otherwise false
@@ -457,7 +495,7 @@ private:
     FriendListPanel *m_friendsListPanel;    ///< Instance of friends list panel
     LoginDialog *m_loginDialog;             ///< Login dialog
     MapView *m_mapView;                     ///< Instance of the map view
-    NetworkCookieJar *m_cookieJar;
+    NetworkCookieJar *m_cookieJar;          ///< Placeholder for QNetworkCookies
     PanelSideBar *m_userPanelSidebar;       ///< User panel side bar
     PanelSideBar *m_friendsListPanelSidebar;///< Friends panel side bar
     UserInfoPanel *m_userPanel;             ///< Instance of the user information panel