From: Sami Rämö <sami.ramo@ixonos.com>
Date: Wed, 10 Nov 2010 09:55:26 +0000 (+0200)
Subject: Removed some old unused code
X-Git-Url: https://vcs.maemo.org/git/?p=situare;a=commitdiff_plain;h=16386092b6af918c97dbf9ad57f06f7b212cda68

Removed some old unused code
---

diff --git a/src/situareservice/situareservice.cpp b/src/situareservice/situareservice.cpp
index 5bbb36e..5ed52fd 100644
--- a/src/situareservice/situareservice.cpp
+++ b/src/situareservice/situareservice.cpp
@@ -156,114 +156,6 @@ void SituareService::fetchLocations()
     buildRequest(GET_LOCATIONS, parameters);
 }
 
-QString SituareService::formCookie(const QString &apiKeyValue, QString expiresValue,
-                                   QString userValue, QString sessionKeyValue,
-                                   QString sessionSecretValue, const QString &signatureValue,
-                                   const QString &localeValue)
-{
-    qDebug() << __PRETTY_FUNCTION__;
-
-    QString cookie;
-    QString apiKey;
-    QString user;
-    QString expires;
-    QString sessionKey;
-    QString sessionSecret;
-    QString locale;
-    QString variable;
-    QString signature = EQUAL_MARK;
-    QStringList variableList;
-
-    signature.append(signatureValue);
-    apiKey.append(apiKeyValue);
-    apiKey.append(UNDERLINE_MARK);
-
-    user.append(USER);
-    user.append(EQUAL_MARK);
-    expires.append(EXPIRES);
-    expires.append(EQUAL_MARK);
-    sessionKey.append(SESSION_KEY);
-    sessionKey.append(EQUAL_MARK);
-    sessionSecret.append(SESSION_SECRET);
-    sessionSecret.append(EQUAL_MARK);
-    locale.append(LOCALE);
-    locale.append(EQUAL_MARK);
-    locale.append(localeValue);
-
-    variableList.append(expires.append(expiresValue.append(BREAK_MARK)));
-    variableList.append(sessionKey.append(sessionKeyValue.append(BREAK_MARK)));
-    variableList.append(user.append(userValue).append(BREAK_MARK));
-    variableList.append(sessionSecret.append(sessionSecretValue.append(BREAK_MARK)));
-
-    cookie.append(BREAK_MARK);
-
-    foreach(variable, variableList) {
-        cookie.append(apiKey);
-        cookie.append(variable);
-    }
-    apiKey.remove(UNDERLINE_MARK);
-    cookie.append(apiKey);
-    cookie.append(signature);
-    cookie.append(BREAK_MARK);
-    cookie.append(locale);
-
-    qDebug() << cookie;
-
-    return cookie;
-}
-
-QUrl SituareService::formUrl(const QString &baseUrl, const QString &phpScript,
-                             QString urlParameters)
-{
-    qDebug() << __PRETTY_FUNCTION__;
-    QString urlString;
-
-    urlString.append(baseUrl);
-    urlString.append(phpScript);
-    if(!urlParameters.isEmpty())
-        urlString.append(urlParameters);
-
-    QUrl url = QUrl(urlString);
-
-    qDebug() << url;
-
-    return url;
-}
-
-QString SituareService::formUrlParameters(const GeoCoordinate &coordinates, QString status,
-                                          bool publish)
-{
-    qDebug() << __PRETTY_FUNCTION__;
-
-    QString parameters;
-    parameters.append(QUESTION_MARK);
-    parameters.append(LATITUDE);
-    parameters.append(EQUAL_MARK);
-    parameters.append(degreesToString(coordinates.latitude()));
-    parameters.append(AMBERSAND_MARK);
-    parameters.append(LONGTITUDE);
-    parameters.append(EQUAL_MARK);
-    parameters.append(degreesToString(coordinates.longitude()));
-
-    parameters.append(AMBERSAND_MARK);
-    parameters.append(PUBLISH);
-    parameters.append(EQUAL_MARK);
-
-    if(publish)
-        parameters.append(PUBLISH_TRUE);
-    else
-        parameters.append(PUBLISH_FALSE);
-
-    if(!status.isEmpty()) {
-        parameters.append(AMBERSAND_MARK);
-        parameters.append(DATA);
-        parameters.append(EQUAL_MARK);
-        parameters.append(status);
-    }
-
-    return parameters;
-}
-
 void SituareService::imageReceived(const QUrl &url, const QPixmap &image)
 {
     qDebug() << __PRETTY_FUNCTION__;
@@ -512,21 +404,6 @@ void SituareService::reverseGeo(const GeoCoordinate &coordinates)
     buildRequest(REVERSE_GEO, parameters);
 }
 
-void SituareService::sendRequest(const QUrl &url, const QString &cookieType, const QString &cookie)
-{
-    qDebug() << __PRETTY_FUNCTION__;
-
-    QNetworkRequest request;
-
-    request.setUrl(url);
-    request.setAttribute(QNetworkRequest::CacheSaveControlAttribute, false);
-    request.setRawHeader(cookieType.toAscii(), cookie.toUtf8());
-
-    QNetworkReply *reply = m_networkManager->get(request, true);
-
-    m_currentRequests.append(reply);
-}
-
 void SituareService::sendRequest(const QString &requestUrl)
 {
     qWarning() << __PRETTY_FUNCTION__ << "requestUrl" << requestUrl;
diff --git a/src/situareservice/situareservice.h b/src/situareservice/situareservice.h
index a85127c..f57bfa0 100644
--- a/src/situareservice/situareservice.h
+++ b/src/situareservice/situareservice.h
@@ -133,44 +133,6 @@ private:
     QString degreesToString(double degrees);
 
     /**
-    * @brief Forms a http cookie
-    *
-    * @param apiKeyValue application key
-    * @param expiresValue session expire date&time from Facebook
-    * @param userValue user id from Facebook
-    * @param sessionKeyValue session key from Facebook
-    * @param sessionSecretValue session secret from Facebook
-    * @param signatureValue md5 generated signature
-    * @param localeValue used locale
-    * @return QString formed cookie
-    */
-    QString formCookie(const QString &apiKeyValue, QString expiresValue, QString userValue,
-                       QString sessionKeyValue, QString sessionSecretValue,
-                       const QString &signatureValue, const QString &localeValue);
-
-    /**
-    * @brief Forms a http url
-    *
-    * @param baseUrl Server url
-    * @param phpScript Server script
-    * @param urlParameters optional parameters for url
-    * @return QUrl formed url
-    */
-    QUrl formUrl(const QString &baseUrl, const QString &phpScript,
-                 QString urlParameters = QString());
-
-    /**
-    * @brief Forms url parameters
-    *
-    * @param coordinates current coordinates
-    * @param status optional status message
-    * @param publish optional publish location on Facebook wall
-    * @return QString
-    */
-    QString formUrlParameters(const GeoCoordinate &coordinates, QString status = QString(),
-                              bool publish = false);
-
-    /**
     * @brief Parses user and friend data from JSON string
     *
     * @param jsonReply JSON string
@@ -178,15 +140,6 @@ private:
     void parseUserData(const QByteArray &jsonReply);
 
     /**
-    * @brief Sends http request
-    *
-    * @param url destination
-    * @param cookieType type of the cookie
-    * @param cookie http cookie
-    */
-    void sendRequest(const QUrl &url, const QString &cookieType, const QString &cookie);
-
-    /**
       * @brief Build and send request
       *
       * Appends script pathname and parameters to the server base URL. Access token is appended and