Changes to logout prosess and login state storing, logout bug fix

[situare] / src / ui / mainwindow.cpp

diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index 0d60bb0..7bdb807 100644 (file)
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -38,7 +38,6 @@
 #include "fullscreenbutton.h"
 #include "indicatorbuttonpanel.h"
 #include "locationsearchpanel.h"
-#include "logindialog.h"
 #include "map/mapcommon.h"
 #include "map/mapview.h"
 #include "mapscale.h"
@@ -74,8 +73,6 @@ MainWindow::MainWindow(QWidget *parent)
       m_progressIndicatorCount(0),
       m_loginDialog(0),
       m_crosshair(0),
-      m_email(), ///< @todo WTF?!?!?!?
-      m_password(),
       m_fullScreenButton(0),
       m_indicatorButtonPanel(0),
       m_mapScale(0)
@@ -662,7 +659,6 @@ void MainWindow::keyPressEvent(QKeyEvent* event)
 
 void MainWindow::loggedIn(bool logged)
 {
-    /// @todo OLD CODE
     qDebug() << __PRETTY_FUNCTION__;
 
     m_loggedIn = logged;
@@ -670,30 +666,10 @@ void MainWindow::loggedIn(bool logged)
     if(logged) {
         m_loginAct->setText(tr("Logout"));
     } else {
-//        clearCookieJar();
-        m_email.clear();
-        m_password.clear();
-
         m_loginAct->setText(tr("Login"));
         m_userInfoPanel->showUserInfo(false);
     }
-    updateItemVisibility();
-}
-
-void MainWindow::loginFailed()
-{
-    /// @todo OLD CODE
-    qDebug() << __PRETTY_FUNCTION__;
-
-//    clearCookieJar();
-    startLoginProcess();
-}
-
-bool MainWindow::loginState()
-{
-    qDebug() << __PRETTY_FUNCTION__;
-
-    return m_loggedIn;
+    updateItemVisibility(logged);
 }
 
 void MainWindow::mapCenterHorizontalShiftingChanged(int shifting)
@@ -867,22 +843,6 @@ void MainWindow::startLocationSearch()
     queueDialog(searchDialog);
 }
 
-void MainWindow::startLoginProcess()
-{
-    qDebug() << __PRETTY_FUNCTION__;
-
-    LoginDialog *loginDialog = new LoginDialog();
-
-    emit fetchUsernameFromSettings();
-
-    loginDialog->clearTextFields();
-
-    if(!m_email.isEmpty())
-        loginDialog->setEmailField(m_email);
-
-    queueDialog(loginDialog);
-}
-
 void MainWindow::toggleFullScreen()
 {
     qDebug() << __PRETTY_FUNCTION__;
@@ -913,16 +873,9 @@ void MainWindow::toggleProgressIndicator(bool value)
 #endif // Q_WS_MAEMO_5
 }
 
-void MainWindow::updateItemVisibility()
-{
-    qDebug() << __PRETTY_FUNCTION__;
-
-    m_tabbedPanel->setTabsEnabled(m_situareTabsIndexes, m_loggedIn);
-}
-
-const QString MainWindow::username()
+void MainWindow::updateItemVisibility(bool loggedIn)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    return m_email;
+    m_tabbedPanel->setTabsEnabled(m_situareTabsIndexes, loggedIn);
 }