Re-factored SituareService::formUrlParameters() publish parameter

[situare] / src / situareservice / situareservice.cpp

diff --git a/src/situareservice/situareservice.cpp b/src/situareservice/situareservice.cpp
index 2ed9fae..03be242 100644 (file)
--- a/src/situareservice/situareservice.cpp
+++ b/src/situareservice/situareservice.cpp
@@ -96,21 +96,13 @@ void SituareService::updateLocation(const GeoCoordinate &coordinates, const QStr
 {
     qDebug() << __PRETTY_FUNCTION__;
 
+    QString urlParameters = formUrlParameters(coordinates, status, publish);
+    QUrl url = formUrl(SITUARE_URL, UPDATE_LOCATION, urlParameters);
+
     QString cookie = formCookie(API_KEY, m_credentials.expires(), m_credentials.userID(),
                                 m_credentials.sessionKey(), m_credentials.sessionSecret(),
                                 m_credentials.sig(), EN_LOCALE);
 
-
-    QString publishValue;
-    if(publish) {
-        publishValue = PUBLISH_TRUE;
-    }
-    else {
-        publishValue = PUBLISH_FALSE;
-    }
-    QString urlParameters = formUrlParameters(coordinates, status, publishValue);
-    QUrl url = formUrl(SITUARE_URL, UPDATE_LOCATION, urlParameters);
-
     sendRequest(url, COOKIE, cookie);
 }
 
@@ -189,7 +181,7 @@ QUrl SituareService::formUrl(const QString &baseUrl, const QString &phpScript,
 }
 
 QString SituareService::formUrlParameters(const GeoCoordinate &coordinates, QString status,
-                                          QString publish)
+                                          bool publish)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
@@ -208,17 +200,14 @@ QString SituareService::formUrlParameters(const GeoCoordinate &coordinates, QStr
     parameters.append(EQUAL_MARK);
     parameters.append(QString::number(coordinates.longitude(), 'f', COORDINATE_PRECISION));
 
-    if(publish.compare(PUBLISH_TRUE) == 0) {
-        parameters.append(AMBERSAND_MARK);
-        parameters.append(PUBLISH);
-        parameters.append(EQUAL_MARK);
+    parameters.append(AMBERSAND_MARK);
+    parameters.append(PUBLISH);
+    parameters.append(EQUAL_MARK);
+
+    if(publish)
         parameters.append(PUBLISH_TRUE);
-    } else if(publish.compare(PUBLISH_FALSE) == 0) {
-        parameters.append(AMBERSAND_MARK);
-        parameters.append(PUBLISH);
-        parameters.append(EQUAL_MARK);
+    else
         parameters.append(PUBLISH_FALSE);
-    }
 
     if(!status.isEmpty()) {
         parameters.append(AMBERSAND_MARK);