Cleaning up some signals
authorSami Rämö <sami.ramo@ixonos.com>
Mon, 1 Nov 2010 12:28:41 +0000 (14:28 +0200)
committerSami Rämö <sami.ramo@ixonos.com>
Mon, 1 Nov 2010 12:28:41 +0000 (14:28 +0200)
src/engine/engine.cpp
src/ui/mainwindow.cpp
src/ui/mainwindow.h

index a58716a..48fa6cd 100644 (file)
@@ -651,15 +651,9 @@ void SituareEngine::signalsFromMainWindow()
     connect(m_ui, SIGNAL(error(int, int)),
             this, SLOT(error(int, int)));
 
-    connect(m_ui, SIGNAL(fetchUsernameFromSettings()),
-            this, SLOT(fetchUsernameFromSettings()));
-
     connect(m_ui, SIGNAL(loginActionPressed()),
             this, SLOT(loginActionPressed()));
 
-    connect(m_ui, SIGNAL(saveUsername(QString)),
-            m_facebookAuthenticator, SLOT(saveUsername(QString)));
-
     connect(m_ui, SIGNAL(updateCredentials(QUrl)),
             m_facebookAuthenticator, SLOT(updateCredentials(QUrl)));
 
index 8d5b3cf..e5ce88b 100644 (file)
@@ -590,6 +590,7 @@ void MainWindow::dialogFinished(int status)
     LoginDialog *loginDialog = qobject_cast<LoginDialog *>(dialog);
     SearchDialog *searchDialog = qobject_cast<SearchDialog *>(dialog);
     if(loginDialog) {
+        /// @todo Remove login related code
         if(status != 0) {
             buildWebView();
             loginDialog->userInput(m_email, m_password);
@@ -604,7 +605,6 @@ void MainWindow::dialogFinished(int status)
             urlParts.append(SITUARE_LOGIN_FAILURE);
             urlParts.append(FACEBOOK_LOGIN_ENDING);
 
-            emit saveUsername(m_email);
             m_refresh = true;
             m_webView->load(QUrl(urlParts.join(EMPTY)));
             toggleProgressIndicator(true);
index 1e353c3..c4ff407 100644 (file)
@@ -611,13 +611,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