Changed implementation

[situare] / src / engine / engine.cpp

diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
index 4e8ad90..a5e37f8 100644 (file)
--- a/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@ -89,10 +89,10 @@ SituareEngine::SituareEngine(QMainWindow *parent)
     m_mapEngine->init();
     m_ui->show();
 
-    initializeGpsAndAutocentering();
-
     m_facebookAuthenticator->start();
 
+    initializeGpsAndAutocentering();
+
     m_automaticUpdateIntervalTimer = new QTimer(this);
     connect(m_automaticUpdateIntervalTimer, SIGNAL(timeout()),
             this, SLOT(automaticUpdateIntervalTimerTimeout()));
@@ -133,7 +133,7 @@ void SituareEngine::disableAutoCentering()
     qDebug() << __PRETTY_FUNCTION__;
 
     changeAutoCenteringSetting(false);
-    m_ui->queueInformationBox(tr("Auto centering disabled"));
+    m_ui->buildInformationBox(tr("Auto centering disabled"));
 }
 
 void SituareEngine::enableAutoCentering(bool enabled)
@@ -184,7 +184,7 @@ void SituareEngine::error(const QString &error)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    m_ui->queueInformationBox(error, true);
+    m_ui->buildInformationBox(error, true);
 
     if(error.compare(SESSION_EXPIRED) == 0) {
         m_facebookAuthenticator->clearAccountInformation(true); // keep username = true
@@ -216,17 +216,17 @@ void SituareEngine::initializeGpsAndAutocentering()
         changeAutoCenteringSetting(true);
         enableGPS(true);
 
-        m_ui->queueInformationBox(tr("GPS enabled"));
-        m_ui->queueInformationBox(tr("Auto centering enabled"));
+        m_ui->buildInformationBox(tr("GPS enabled"));
+        m_ui->buildInformationBox(tr("Auto centering enabled"));
     } else { // Normal start
         changeAutoCenteringSetting(autoCenteringEnabled.toBool());
         enableGPS(gpsEnabled.toBool());
 
         if (gpsEnabled.toBool())
-            m_ui->queueInformationBox(tr("GPS enabled"));
+            m_ui->buildInformationBox(tr("GPS enabled"));
 
         if (gpsEnabled.toBool() && autoCenteringEnabled.toBool())
-            m_ui->queueInformationBox(tr("Auto centering enabled"));
+            m_ui->buildInformationBox(tr("Auto centering enabled"));
     } 
 }
 
@@ -350,8 +350,8 @@ void SituareEngine::signalsFromFacebookAuthenticator()
     connect(m_facebookAuthenticator, SIGNAL(credentialsReady(FacebookCredentials)),
             this, SLOT(loginOk()));
 
-    connect(m_facebookAuthenticator, SIGNAL(newLoginRequest(QUrl)),
-            m_ui, SLOT(startLoginProcess(QUrl)));
+    connect(m_facebookAuthenticator, SIGNAL(newLoginRequest()),
+            m_ui, SLOT(startLoginProcess()));
 
     connect(m_facebookAuthenticator, SIGNAL(loginFailure()),
             m_ui, SLOT(loginFailed()));