Preliminary merge. Integration is brancehd from fresh master.

[situare] / src / ui / mainwindow.cpp

diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index 0202682..e7137cc 100644 (file)
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -32,18 +32,13 @@ MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent)
 {
     qDebug() << __PRETTY_FUNCTION__;
-    m_loggedIn = false;
+
     createViews();
     setCentralWidget(m_situareViews);
     createMenus();
     setWindowTitle(tr("List view"));
     this->hide();
 
-    //m_facebookAuthenticator = new FacebookAuthentication(this);
-    //connect(m_facebookAuthenticator, SIGNAL(credentialsReady(FacebookCredentials)), this, SLOT(loginOK()));
-    //connect(m_facebookAuthenticator, SIGNAL(userExit()), this, SLOT(loginScreenClosed()));
-   // m_facebookAuthenticator->start();
-
     m_locationDialog = new UpdateLocationDialog(this);
     connect(m_listViewScreen->m_personalInfo,SIGNAL(launchMessageUpdate()),
             this,SLOT(openLocationUpdateDialog()));
@@ -51,10 +46,6 @@ MainWindow::MainWindow(QWidget *parent)
     connect(this, SIGNAL(reverseGeoReady(QString)), m_locationDialog, SLOT(setAddress(QString)));
     connect(m_locationDialog, SIGNAL(statusUpdate(QString,bool)), this,
             SIGNAL(statusUpdate(QString,bool)));
-    
-    m_networkManager = new QNetworkAccessManager;
-    m_situareService = new SituareService(this,m_networkManager);
-
     connect(this, SIGNAL(userLocationReady(User*)),
             m_mapViewScreen, SLOT(userLocationReady(User*)));
     connect(this, SIGNAL(friendsLocationsReady(QList<User*>&)),
@@ -148,32 +139,3 @@ void MainWindow::openSettingsDialog()
     dialog->show();
 }
 
-void MainWindow::loginScreenClosed()
-{
-    qDebug() << __PRETTY_FUNCTION__ << m_loggedIn;
-    if (m_loggedIn) {
-        this->show();
-        return;
-    }
-    else {
-        this->close();
-    }
-}
-
-void MainWindow::loginOK()
-{
-    qDebug() << __PRETTY_FUNCTION__ << m_loggedIn;
-    m_loggedIn = true;
-    //m_facebookAuthenticator->close();
-}
-
-//void MainWindow::userLocationReady(User &user)
-//{
-//    emit userLocationReady(user);
-//}
-//
-//void MainWindow::friendsLocationsReady(QList<User *>friendsList)
-//{
-//    emit friendsLocationsReady(friendsList);
-//}
-