Merge branch 'situare_service_v2' into situare_interact

[situare] / src / situareservice / situareservice.h

diff --git a/src/situareservice/situareservice.h b/src/situareservice/situareservice.h
index 6b076b6..f5eaed4 100644 (file)
--- a/src/situareservice/situareservice.h
+++ b/src/situareservice/situareservice.h
@@ -49,6 +49,9 @@ class SituareService : public QObject
 {
     Q_OBJECT
 
+private:
+
+
 public:
 
     /**
@@ -214,6 +217,14 @@ private:
       * @returns Coordinate value as string
       */
     QString degreesToString(double degrees);
+    
+    /**
+    * @brief Returns reuquest script's name.
+    *
+    * @param url url to check
+    * @return RequestName
+    */
+    SituareService::RequestName getRequestName(const QUrl &url) const;
 
     /**
     * @brief Temporary method to get tags.
@@ -246,11 +257,25 @@ private:
     void parsePopularTagsData(const QByteArray &jsonReply);
 
     /**
+    * @brief Parses reply from JSON string
+    *
+    * Calls different parse methods or emits error signal if response contains error status.
+    */
+    void parseReply(const QByteArray &jsonReply, RequestName requestName);
+
+    /**
+    * @brief Parses reverse geo data
+    *
+    * @param reverseGeoData reverse geo data QVariant tree
+    */
+    void parseReverseGeoData(const QVariant &reverseGeoData);
+
+    /**
     * @brief Parses user and friend data from JSON string
     *
-    * @param jsonReply JSON string
+    * @param userData user data QVariant tree
     */
-    void parseUserData(const QByteArray &jsonReply);
+    void parseUserData(const QVariant &userData);
 
     /**
       * @brief Send request