projects
/
situare
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved location update logic to new class called UpdateLocation.
[situare]
/
src
/
engine
/
engine.cpp
diff --git
a/src/engine/engine.cpp
b/src/engine/engine.cpp
index
bcce69d
..
6b68d34
100644
(file)
--- a/
src/engine/engine.cpp
+++ b/
src/engine/engine.cpp
@@
-376,14
+376,7
@@
void SituareEngine::onLogout()
qDebug() << __PRETTY_FUNCTION__;
m_ui->loggedIn(false);
qDebug() << __PRETTY_FUNCTION__;
m_ui->loggedIn(false);
-
- // signal to clear locationUpdateDialog's data
- connect(this, SIGNAL(clearUpdateLocationDialogData()),
- m_ui, SIGNAL(clearUpdateLocationDialogData()));
- emit clearUpdateLocationDialogData();
-
m_situareService->updateSession(""); // empty session string means logged out
m_situareService->updateSession(""); // empty session string means logged out
-
m_automaticUpdateFirstStart = true;
}
m_automaticUpdateFirstStart = true;
}
@@
-564,10
+557,10
@@
void SituareEngine::signalsFromFacebookAuthenticator()
connect(m_facebookAuthenticator, SIGNAL(error(int, int)),
this, SLOT(error(int, int)));
connect(m_facebookAuthenticator, SIGNAL(error(int, int)),
this, SLOT(error(int, int)));
- connect(m_facebookAuthenticator, SIGNAL(loggedIn(QString)),
+ connect(m_facebookAuthenticator, SIGNAL(loggedIn(QString, bool)),
m_situareService, SLOT(updateSession(QString)));
m_situareService, SLOT(updateSession(QString)));
- connect(m_facebookAuthenticator, SIGNAL(loggedIn(QString)),
+ connect(m_facebookAuthenticator, SIGNAL(loggedIn(QString, bool)),
this, SLOT(onLogin()));
connect(m_facebookAuthenticator, SIGNAL(loggedOut()), this, SLOT(onLogout()));
this, SLOT(onLogin()));
connect(m_facebookAuthenticator, SIGNAL(loggedOut()), this, SLOT(onLogout()));
@@
-632,7
+625,7
@@
void SituareEngine::signalsFromMainWindow()
connect(m_ui, SIGNAL(requestReverseGeo()),
this, SLOT(requestAddress()));
connect(m_ui, SIGNAL(requestReverseGeo()),
this, SLOT(requestAddress()));
- connect(m_ui, SIGNAL(statusUpdate(QString,bool)),
+ connect(m_ui, SIGNAL(locationUpdate(QString,bool)),
this, SLOT(requestUpdateLocation(QString,bool)));
connect(m_ui, SIGNAL(enableAutomaticLocationUpdate(bool, int)),
this, SLOT(requestUpdateLocation(QString,bool)));
connect(m_ui, SIGNAL(enableAutomaticLocationUpdate(bool, int)),
@@
-750,7
+743,7
@@
void SituareEngine::signalsFromSituareService()
this, SLOT(updateWasSuccessful()));
connect(m_situareService, SIGNAL(updateWasSuccessful()),
this, SLOT(updateWasSuccessful()));
connect(m_situareService, SIGNAL(updateWasSuccessful()),
- m_ui, SIGNAL(clearUpdateLocationDialogData()));
+ m_ui, SIGNAL(updateWasSuccessful()));
}
void SituareEngine::startAutomaticUpdate()
}
void SituareEngine::startAutomaticUpdate()