Added unit tests.
[situare] / src / engine / engine.cpp
index 9701f45..d4064c7 100644 (file)
@@ -733,6 +733,9 @@ void SituareEngine::signalsFromMainWindow()
     connect(m_ui, SIGNAL(centerToCoordinates(GeoCoordinate)),
             m_mapEngine, SLOT(centerToCoordinates(GeoCoordinate)));
 
+    connect(m_ui, SIGNAL(requestPopularTags()),
+            m_situareService, SLOT(fetchPopularTags()));
+
     // routing signal from friend list tab & search location tab
     connect(m_ui, SIGNAL(routeTo(const GeoCoordinate&)),
             this, SLOT(routeTo(const GeoCoordinate&)));
@@ -859,11 +862,14 @@ void SituareEngine::signalsFromSituareService()
     connect(m_situareService, SIGNAL(updateWasSuccessful(SituareService::SuccessfulMethod)),
             m_ui, SIGNAL(clearUpdateLocationDialogData()));
 
-    connect(m_situareService, SIGNAL(interestingPeopleReceived(QList<User>&)),
-            m_ui, SIGNAL(interestingPeopleReceived(QList<User>&)));
+    connect(m_situareService, SIGNAL(interestingPeopleReceived(QList<User>&,QList<User>&)),
+            m_ui, SIGNAL(interestingPeopleReceived(QList<User>&,QList<User>&)));
+
+    connect(m_situareService, SIGNAL(messagesReceived(QList<Message>&, QList<Message> &)),
+            m_ui, SIGNAL(messagesReceived(QList<Message>&, QList<Message>&)));
 
-    connect(m_situareService, SIGNAL(messagesReceived(QList<Message>&)),
-            m_ui, SIGNAL(messagesReceived(QList<Message>&)));
+    connect(m_situareService, SIGNAL(popularTagsReceived(QHash<QString,QString>&)),
+            m_ui, SIGNAL(popularTagsReceived(QHash<QString,QString>&)));
 }
 
 void SituareEngine::startAutomaticUpdate()
@@ -888,8 +894,12 @@ void SituareEngine::updateWasSuccessful(SituareService::SuccessfulMethod success
     if (m_networkAccessManager->isConnected()) {
         if (successfulMethod == SituareService::SuccessfulUpdateLocation)
             m_situareService->fetchLocations();
-        else  if (successfulMethod == SituareService::SuccessfulRemoveMessage)
+        else  if ((successfulMethod == SituareService::SuccessfulRemoveMessage) ||
+                  (successfulMethod == SituareService::SuccessfulSendMessage))
             m_situareService->fetchMessages();
+        else if ((successfulMethod == SituareService::SuccessfulAddTags) ||
+                 (successfulMethod == SituareService::SuccessfulRemoveTags))
+            m_situareService->fetchLocations();
     } else {
         error(ErrorContext::NETWORK, QNetworkReply::UnknownNetworkError);
     }