Merge branch 'master' into login_browser

[situare] / src / ui / mainwindow.h

diff --git a/src/ui/mainwindow.h b/src/ui/mainwindow.h
index d07bbc7..95e58e3 100644 (file)
--- a/src/ui/mainwindow.h
+++ b/src/ui/mainwindow.h
@@ -41,6 +41,7 @@ class QToolButton;
 class QWebView;
 
 class FacebookAuthentication;
+class FacebookLoginBrowser;
 class FriendListPanel;
 class FullScreenButton;
 class GeoCoordinate;
@@ -156,6 +157,10 @@ public:
     const QString username();
 
 public slots:
+    void buildFacebookLoginBrowser();
+
+    void destroyFacebookLoginBrowser();
+
     /**
      * @brief Builds information box with message.
      *
@@ -187,13 +192,6 @@ public slots:
     void setCrosshairVisibility(bool visible);
 
     /**
-     * @brief Sets username to member variable for login dialog
-     *
-     * @param username Username to be set
-     */
-    void setUsername(const QString &username);
-
-    /**
     * @brief Shows contact dialog.
     *
     * Shows contact dialog with contact's information.
@@ -542,6 +540,8 @@ signals:
      */
     void loginActionPressed();
 
+    void loginBrowserCreated(FacebookLoginBrowser *);
+
     /**
      * @brief MapView has been resized
      *
@@ -617,13 +617,6 @@ signals:
     void routeToCursor();
 
     /**
-     * @brief Signal to save username to settings
-     *
-     * @param username Username
-     */
-    void saveUsername(const QString &username);
-
-    /**
      * @brief Signal for location search
      *
      * @param location QString location
@@ -721,6 +714,7 @@ private:
 
     QWebView *m_webView;                    ///< Shows facebook login page
 
+    FacebookLoginBrowser *m_facebookLoginBrowser;
     FriendListPanel *m_friendsListPanel;    ///< Instance of friends list panel
     FullScreenButton *m_fullScreenButton;   ///< Instance of the fullscreen toggle button
     IndicatorButtonPanel *m_indicatorButtonPanel;   ///< Instance of direction indicator button