From 65153f8f5477fb362065895f680c04121f33d8dd Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Wed, 20 Apr 2016 20:49:45 +0200 Subject: [PATCH] Fix comp. --- .../tt-rss/network/ttrssnetworkfactory.cpp | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/services/tt-rss/network/ttrssnetworkfactory.cpp b/src/services/tt-rss/network/ttrssnetworkfactory.cpp index 72abb8586..8cf511330 100755 --- a/src/services/tt-rss/network/ttrssnetworkfactory.cpp +++ b/src/services/tt-rss/network/ttrssnetworkfactory.cpp @@ -82,9 +82,9 @@ TtRssLoginResponse TtRssNetworkFactory::login() { } QJsonObject json; - json["op"] = "login"; - json["user"] = m_username; - json["password"] = m_password; + json.insert(QSL("op"), QJsonValue(QSL("login"))); + json.insert(QSL("user"), QJsonValue(m_username)); + json.insert(QSL("password"), QJsonValue(m_password)); QByteArray result_raw; NetworkResult network_reply = NetworkFactory::performNetworkOperation(m_url, qApp->settings()->value(GROUP(Feeds), @@ -110,8 +110,8 @@ TtRssResponse TtRssNetworkFactory::logout() { if (!m_sessionId.isEmpty()) { QJsonObject json; - json["op"] = "logout"; - json["sid"] = m_sessionId; + json.insert(QSL("op"), QJsonValue(QSL("logout"))); + json.insert(QSL("sid"), QJsonValue(m_sessionId)); QByteArray result_raw; NetworkResult network_reply = NetworkFactory::performNetworkOperation(m_url, qApp->settings()->value(GROUP(Feeds), @@ -141,9 +141,9 @@ TtRssResponse TtRssNetworkFactory::logout() { TtRssGetFeedsCategoriesResponse TtRssNetworkFactory::getFeedsCategories() { QJsonObject json; - json["op"] = "getFeedTree"; - json["sid"] = m_sessionId; - json["include_empty"] = true; + json.insert(QSL("op"), QJsonValue(QSL("getFeedTree"))); + json.insert(QSL("sid"), QJsonValue(m_sessionId)); + json.insert(QSL("include_empty"), QJsonValue(true)); const int timeout = qApp->settings()->value(GROUP(Feeds), SETTING(Feeds::UpdateTimeout)).toInt(); QByteArray result_raw; @@ -156,7 +156,7 @@ TtRssGetFeedsCategoriesResponse TtRssNetworkFactory::getFeedsCategories() { if (result.isNotLoggedIn()) { // We are not logged in. login(); - json["sid"] = m_sessionId; + json.insert(QSL("sid"), QJsonValue(m_sessionId)); network_reply = NetworkFactory::performNetworkOperation(m_url, timeout, QJsonDocument(json).toJson(QJsonDocument::Compact), CONTENT_TYPE, result_raw, QNetworkAccessManager::PostOperation, @@ -197,7 +197,7 @@ TtRssGetHeadlinesResponse TtRssNetworkFactory::getHeadlines(int feed_id, int lim if (result.isNotLoggedIn()) { // We are not logged in. login(); - json["sid"] = m_sessionId; + json.insert(QSL("sid"), QJsonValue(m_sessionId)); network_reply = NetworkFactory::performNetworkOperation(m_url, timeout, QJsonDocument(json).toJson(QJsonDocument::Compact), CONTENT_TYPE, result_raw, QNetworkAccessManager::PostOperation,