Commit description: Rewrote the architecture, engine loads first now

Reviewed by:

diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
index e356fca..f50d98a 100644 (file)
--- a/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@ -20,10 +20,13 @@
  */
 
 #include "engine.h"
+#include "ui/mainwindow.h"
 
 SituareEngine::SituareEngine(QMainWindow *parent)
     : QObject(parent)
 {
+    m_ui = new MainWindow;
+
     m_networkManager = new QNetworkAccessManager;
     m_situareService = new SituareService(this,m_networkManager);
 
@@ -31,11 +34,13 @@ SituareEngine::SituareEngine(QMainWindow *parent)
     m_facebookAuthenticator = new FacebookAuthentication();
     connect(m_facebookAuthenticator, SIGNAL(credentialsReady()), this, SLOT(loginOk()));
     connect(m_facebookAuthenticator, SIGNAL(userExit()), this, SLOT(loginScreenClosed()));
+    start();
 }
 
 SituareEngine::~SituareEngine()
 {
     qDebug() << __PRETTY_FUNCTION__;
+    delete m_ui;
 }
 
 void SituareEngine::start()
@@ -45,22 +50,25 @@ void SituareEngine::start()
 
 
 void SituareEngine::loginOk()
+
 {
     qDebug() << __PRETTY_FUNCTION__;
     m_loggedIn = true;
     m_facebookAuthenticator->close();
 }
+
 void SituareEngine::loginScreenClosed()
 {
     qDebug() << __PRETTY_FUNCTION__ << m_loggedIn;
     if (m_loggedIn) {
-        emit engine_showMainWindow();
+        m_ui->show();
         return;
     }
     else {
-        emit engine_closeMainWindow();
+        m_ui->close();
     }
 }
+
 void SituareEngine::updateFriendsList()
 {
     qDebug() << __PRETTY_FUNCTION__;

diff --git a/src/engine/engine.h b/src/engine/engine.h
index 03d2cea..cc98c1a 100644 (file)
--- a/src/engine/engine.h
+++ b/src/engine/engine.h
@@ -28,6 +28,7 @@
 #include "facebookservice/facebookauthentication.h"
 #include "situareservice/situareservice.h"
 #include <QNetworkAccessManager>
+#include "../ui/mainwindow.h"
 
 /**
 * @brief Engine class for Situare Application
@@ -68,7 +69,7 @@ public slots:
     */
     void loginScreenClosed();
 
-    /**
+    /**#include "engine/engine.h"
     * @brief Slot to intercept signal from successful login
     */
     void loginOk();
@@ -93,6 +94,7 @@ signals:
  * DATA MEMBERS
  ******************************************************************************/
 private:
+    MainWindow *m_ui;
     FacebookAuthentication *m_facebookAuthenticator; ///< Instance for facebook authenticator
     QNetworkAccessManager *m_networkManager; ///< NetworkManager that is passed on to SituareService
     SituareService *m_situareService; ///< Instance of the situare server communication service

diff --git a/src/main.cpp b/src/main.cpp
index ff13904..e9b5671 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -20,12 +20,12 @@
  */
 
 #include <QtGui/QApplication>
-#include "ui/mainwindow.h"
+#include "engine/engine.h"
 
 int main(int argc, char *argv[])
 {
     QApplication a(argc, argv);
-    MainWindow w;
+    SituareEngine engine;
     int appRet = a.exec();
     return appRet;
 }

diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index 3fec4ce..959ec89 100644 (file)
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -26,7 +26,6 @@
 #include "mapviewscreen.h"
 #include "facebookservice/facebookauthentication.h"
 #include "situareservice/situareservice.h"
-#include "engine/engine.h"
 
 MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent)
@@ -39,19 +38,10 @@ MainWindow::MainWindow(QWidget *parent)
     setWindowTitle(tr("List view"));
     this->hide();
 
-    m_situareEngine = new SituareEngine(this);
-    connect(m_situareEngine, SIGNAL(engine_showMainWindow()), this, SLOT(show()));
-    connect(m_situareEngine, SIGNAL(engine_closeMainWindow()), this, SLOT(close()));
-
     m_locationDialog = new UpdateLocationDialog(this);
-//    connect(m_listViewScreen->m_personalInfo,
-//            SIGNAL(launchUpdateFriendsStatus()),
-//            m_situareEngine,
-//            SLOT(updateFriendsList()));
     connect(m_listViewScreen->m_personalInfo,SIGNAL(launchMessageUpdate()),
             this,SLOT(openLocationUpdateDialog()));
 
-    m_situareEngine->start();
 }
 
 MainWindow::~MainWindow()

diff --git a/src/ui/mainwindow.h b/src/ui/mainwindow.h
index 4a94811..fe61dde 100644 (file)
--- a/src/ui/mainwindow.h
+++ b/src/ui/mainwindow.h
@@ -31,10 +31,11 @@
 #include "facebookservice/facebookauthentication.h"
 #include "situareservice/situareservice.h"
 #include <QNetworkAccessManager>
-#include "engine/engine.h"
+//#include "engine/engine.h"
 #include "listviewscreen.h"
 #include "mapviewscreen.h"
 #include "updatelocation/updatelocationdialog.h"
+#include "ui/mainwindow.h"
 
 class QLabel;
 class QStackedWidget;
@@ -100,7 +101,7 @@ private slots:
  ******************************************************************************/
 
 private:
-    SituareEngine *m_situareEngine;
+//    SituareEngine *m_situareEngine;
 
     ListViewScreen *m_listViewScreen;
     MapViewScreen *m_mapViewScreen;