diff --git a/src/services/standard/standardserviceroot.cpp b/src/services/standard/standardserviceroot.cpp index ec9c7d861..d104cbd0d 100755 --- a/src/services/standard/standardserviceroot.cpp +++ b/src/services/standard/standardserviceroot.cpp @@ -119,12 +119,12 @@ bool StandardServiceRoot::deleteViaGui() { // TODO: todo // Remove all feeds. - if (!QSqlQuery(connection).exec(QSL("DELETE FROM Feeds WHERE account_id = %1;").arg(accountId()))) { + if (!QSqlQuery(connection).exec(QString("DELETE FROM Feeds WHERE account_id = %1;").arg(accountId()))) { return false; } // Remove all categories. - if (!QSqlQuery(connection).exec(QSL("DELETE FROM Categories WHERE account_id = %1;").arg(accountId()))) { + if (!QSqlQuery(connection).exec(QString("DELETE FROM Categories WHERE account_id = %1;").arg(accountId()))) { return false; } @@ -376,7 +376,7 @@ void StandardServiceRoot::loadFromDatabase(){ QSqlQuery query_feeds(database); query_feeds.setForwardOnly(true); - if (!query_feeds.exec(QSL("SELECT * FROM Feeds WHERE account_id = %1;").arg(accountId())) || query_feeds.lastError().isValid()) { + if (!query_feeds.exec(QString("SELECT * FROM Feeds WHERE account_id = %1;").arg(accountId())) || query_feeds.lastError().isValid()) { qFatal("Query for obtaining feeds failed. Error message: '%s'.", qPrintable(query_feeds.lastError().text())); } diff --git a/src/services/tt-rss/network/ttrssnetworkfactory.cpp b/src/services/tt-rss/network/ttrssnetworkfactory.cpp index f90f7d4b9..86d93e765 100755 --- a/src/services/tt-rss/network/ttrssnetworkfactory.cpp +++ b/src/services/tt-rss/network/ttrssnetworkfactory.cpp @@ -68,14 +68,14 @@ LoginResult TtRssNetworkFactory::login() { json["user"] = m_username; json["password"] = m_password; - QByteArray result; - NetworkResult res = NetworkFactory::uploadData(m_url, DOWNLOAD_TIMEOUT, QtJson::serialize(json), CONTENT_TYPE, result); + QByteArray result_raw; + NetworkResult res = NetworkFactory::uploadData(m_url, DOWNLOAD_TIMEOUT, QtJson::serialize(json), CONTENT_TYPE, result_raw); if (res.first != QNetworkReply::NoError) { return LoginResult(res.first, TtRssLoginResponse()); } else { - LoginResult result(res.first, TtRssLoginResponse(QString::fromUtf8(result))); + LoginResult result(res.first, TtRssLoginResponse(QString::fromUtf8(result_raw))); m_session_Id = result.second.sessionId(); return result; }