From 6e8d4953e01224e62f4ae78369e54dad41529ee6 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Fri, 18 Feb 2022 12:35:38 +0100 Subject: [PATCH] expand networkresult --- .../network-web/adblock/adblockmanager.cpp | 12 ++-- .../network-web/networkfactory.cpp | 23 ++++++-- src/librssguard/network-web/networkfactory.h | 10 +++- .../services/feedly/feedlynetwork.cpp | 28 ++++----- .../services/gmail/gmailnetworkfactory.cpp | 14 ++--- .../services/greader/greadernetwork.cpp | 32 +++++----- .../services/newsblur/newsblurnetwork.cpp | 4 +- .../owncloud/owncloudnetworkfactory.cpp | 46 +++++++-------- .../services/owncloud/owncloudserviceroot.cpp | 4 +- .../services/reddit/redditnetworkfactory.cpp | 2 +- .../services/standard/standardfeed.cpp | 6 +- .../services/standard/standardserviceroot.cpp | 4 +- .../services/tt-rss/ttrssnetworkfactory.cpp | 58 +++++++++---------- 13 files changed, 131 insertions(+), 112 deletions(-) diff --git a/src/librssguard/network-web/adblock/adblockmanager.cpp b/src/librssguard/network-web/adblock/adblockmanager.cpp index c52d51561..622cf4f8e 100644 --- a/src/librssguard/network-web/adblock/adblockmanager.cpp +++ b/src/librssguard/network-web/adblock/adblockmanager.cpp @@ -252,7 +252,7 @@ BlockingResult AdBlockManager::askServerIfBlocked(const QString& fp_url, const Q QSL(HTTP_HEADERS_CONTENT_TYPE).toLocal8Bit(), QSL("application/json").toLocal8Bit() } }); - if (network_res.first == QNetworkReply::NetworkError::NoError) { + if (network_res.m_networkError == QNetworkReply::NetworkError::NoError) { qDebugNN << LOGSEC_ADBLOCK << "Query for blocking info to server took " << tmr.elapsed() @@ -269,7 +269,7 @@ BlockingResult AdBlockManager::askServerIfBlocked(const QString& fp_url, const Q }; } else { - throw NetworkException(network_res.first); + throw NetworkException(network_res.m_networkError); } } @@ -293,7 +293,7 @@ QString AdBlockManager::askServerForCosmeticRules(const QString& url) const { QSL(HTTP_HEADERS_CONTENT_TYPE).toLocal8Bit(), QSL("application/json").toLocal8Bit() } }); - if (network_res.first == QNetworkReply::NetworkError::NoError) { + if (network_res.m_networkError == QNetworkReply::NetworkError::NoError) { qDebugNN << LOGSEC_ADBLOCK << "Query for cosmetic rules to server took " << tmr.elapsed() @@ -304,7 +304,7 @@ QString AdBlockManager::askServerForCosmeticRules(const QString& url) const { return out_obj[QSL("cosmetic")].toObject()[QSL("styles")].toString(); } else { - throw NetworkException(network_res.first); + throw NetworkException(network_res.m_networkError); } } @@ -370,7 +370,7 @@ void AdBlockManager::updateUnifiedFiltersFileAndStartServer() { out, QNetworkAccessManager::Operation::GetOperation); - if (res.first == QNetworkReply::NetworkError::NoError) { + if (res.m_networkError == QNetworkReply::NetworkError::NoError) { unified_contents = unified_contents.append(QString::fromUtf8(out)); unified_contents = unified_contents.append('\n'); @@ -379,7 +379,7 @@ void AdBlockManager::updateUnifiedFiltersFileAndStartServer() { << QUOTE_W_SPACE_DOT(filter_list_url); } else { - throw NetworkException(res.first, tr("failed to download filter list '%1'").arg(filter_list_url)); + throw NetworkException(res.m_networkError, tr("failed to download filter list '%1'").arg(filter_list_url)); } } diff --git a/src/librssguard/network-web/networkfactory.cpp b/src/librssguard/network-web/networkfactory.cpp index 010d60536..35ac4f299 100644 --- a/src/librssguard/network-web/networkfactory.cpp +++ b/src/librssguard/network-web/networkfactory.cpp @@ -169,7 +169,7 @@ QNetworkReply::NetworkError NetworkFactory::downloadIcon(const QList& cook) + : m_networkError(err), m_contentType(ct), m_cookies(cook) {} diff --git a/src/librssguard/network-web/networkfactory.h b/src/librssguard/network-web/networkfactory.h index a8cf3c60d..458e3277e 100644 --- a/src/librssguard/network-web/networkfactory.h +++ b/src/librssguard/network-web/networkfactory.h @@ -7,12 +7,20 @@ #include #include +#include #include #include #include #include -typedef QPair NetworkResult; +struct NetworkResult { + QNetworkReply::NetworkError m_networkError; + QString m_contentType; + QList m_cookies; + + explicit NetworkResult(); + explicit NetworkResult(QNetworkReply::NetworkError err, const QString& ct, const QList& cook); +}; class Downloader; diff --git a/src/librssguard/services/feedly/feedlynetwork.cpp b/src/librssguard/services/feedly/feedlynetwork.cpp index 1ecfac262..eda935410 100644 --- a/src/librssguard/services/feedly/feedlynetwork.cpp +++ b/src/librssguard/services/feedly/feedlynetwork.cpp @@ -83,8 +83,8 @@ void FeedlyNetwork::untagEntries(const QString& tag_id, const QStringList& msg_c {}, m_service->networkProxy()); - if (result.first != QNetworkReply::NetworkError::NoError) { - throw NetworkException(result.first, output); + if (result.m_networkError != QNetworkReply::NetworkError::NoError) { + throw NetworkException(result.m_networkError, output); } } while (i < msg_custom_ids.size()); @@ -123,8 +123,8 @@ void FeedlyNetwork::tagEntries(const QString& tag_id, const QStringList& msg_cus {}, m_service->networkProxy()); - if (result.first != QNetworkReply::NetworkError::NoError) { - throw NetworkException(result.first, output); + if (result.m_networkError != QNetworkReply::NetworkError::NoError) { + throw NetworkException(result.m_networkError, output); } } @@ -162,8 +162,8 @@ void FeedlyNetwork::markers(const QString& action, const QStringList& msg_custom {}, m_service->networkProxy()); - if (result.first != QNetworkReply::NetworkError::NoError) { - throw NetworkException(result.first, output); + if (result.m_networkError != QNetworkReply::NetworkError::NoError) { + throw NetworkException(result.m_networkError, output); } } @@ -212,8 +212,8 @@ QList FeedlyNetwork::streamContents(const QString& stream_id) { {}, m_service->networkProxy()); - if (result.first != QNetworkReply::NetworkError::NoError) { - throw NetworkException(result.first, output); + if (result.m_networkError != QNetworkReply::NetworkError::NoError) { + throw NetworkException(result.m_networkError, output); } messages += decodeStreamContents(output, continuation); @@ -328,8 +328,8 @@ RootItem* FeedlyNetwork::collections(bool obtain_icons) { {}, m_service->networkProxy()); - if (result.first != QNetworkReply::NetworkError::NoError) { - throw NetworkException(result.first, output); + if (result.m_networkError != QNetworkReply::NetworkError::NoError) { + throw NetworkException(result.m_networkError, output); } return decodeCollections(output, obtain_icons, m_service->networkProxy(), timeout); @@ -424,8 +424,8 @@ QVariantHash FeedlyNetwork::profile(const QNetworkProxy& network_proxy) { {}, network_proxy); - if (result.first != QNetworkReply::NetworkError::NoError) { - throw NetworkException(result.first, output); + if (result.m_networkError != QNetworkReply::NetworkError::NoError) { + throw NetworkException(result.m_networkError, output); } return QJsonDocument::fromJson(output).object().toVariantHash(); @@ -453,8 +453,8 @@ QList FeedlyNetwork::tags() { {}, m_service->networkProxy()); - if (result.first != QNetworkReply::NetworkError::NoError) { - throw NetworkException(result.first, output); + if (result.m_networkError != QNetworkReply::NetworkError::NoError) { + throw NetworkException(result.m_networkError, output); } QJsonDocument json = QJsonDocument::fromJson(output); diff --git a/src/librssguard/services/gmail/gmailnetworkfactory.cpp b/src/librssguard/services/gmail/gmailnetworkfactory.cpp index 4f83f3f09..8f0a01bc4 100644 --- a/src/librssguard/services/gmail/gmailnetworkfactory.cpp +++ b/src/librssguard/services/gmail/gmailnetworkfactory.cpp @@ -100,7 +100,7 @@ QString GmailNetworkFactory::sendEmail(Mimesis::Message msg, const QNetworkProxy {}, custom_proxy); - if (result.first != QNetworkReply::NetworkError::NoError) { + if (result.m_networkError != QNetworkReply::NetworkError::NoError) { if (!out.isEmpty()) { QJsonDocument doc = QJsonDocument::fromJson(out); auto json_message = doc.object()[QSL("error")].toObject()[QSL("message")].toString(); @@ -229,7 +229,7 @@ QList GmailNetworkFactory::messages(const QString& stream_id, {}, custom_proxy); - if (netw.first == QNetworkReply::NetworkError::NoError) { + if (netw.m_networkError == QNetworkReply::NetworkError::NoError) { // We parse this chunk. QString messages_data = QString::fromUtf8(messages_raw_data); QList more_messages = decodeLiteMessages(messages_data, stream_id, next_page_token); @@ -313,7 +313,7 @@ QNetworkReply::NetworkError GmailNetworkFactory::markMessagesRead(RootItem::Read false, {}, {}, - custom_proxy).first; + custom_proxy).m_networkError; if (result != QNetworkReply::NetworkError::NoError) { return result; @@ -372,7 +372,7 @@ QNetworkReply::NetworkError GmailNetworkFactory::markMessagesStarred(RootItem::I false, {}, {}, - custom_proxy).first; + custom_proxy).m_networkError; if (result != QNetworkReply::NetworkError::NoError) { return result; @@ -405,7 +405,7 @@ QVariantHash GmailNetworkFactory::getProfile(const QNetworkProxy& custom_proxy) false, {}, {}, - custom_proxy).first; + custom_proxy).m_networkError; if (result != QNetworkReply::NetworkError::NoError) { throw NetworkException(result, output); @@ -594,7 +594,7 @@ QMap GmailNetworkFactory::getMessageMetadata(const QString& ms {}, custom_proxy); - if (res.first == QNetworkReply::NetworkError::NoError) { + if (res.m_networkError == QNetworkReply::NetworkError::NoError) { QJsonDocument doc = QJsonDocument::fromJson(output); QMap result; auto json_headers = doc.object()[QSL("payload")].toObject()[QSL("headers")].toArray(); @@ -658,7 +658,7 @@ bool GmailNetworkFactory::obtainAndDecodeFullMessages(QList& messages, {}, custom_proxy); - if (res.first == QNetworkReply::NetworkError::NoError) { + if (res.m_networkError == QNetworkReply::NetworkError::NoError) { // We parse each part of HTTP response (it contains HTTP headers and payload with msg full data). for (const HttpResponse& part : qAsConst(output)) { QJsonObject msg_doc = QJsonDocument::fromJson(part.body().toUtf8()).object(); diff --git a/src/librssguard/services/greader/greadernetwork.cpp b/src/librssguard/services/greader/greadernetwork.cpp index f753c05e3..0a59ec5e4 100644 --- a/src/librssguard/services/greader/greadernetwork.cpp +++ b/src/librssguard/services/greader/greadernetwork.cpp @@ -89,8 +89,8 @@ QNetworkReply::NetworkError GreaderNetwork::editLabels(const QString& state, {}, proxy); - if (result_edit.first != QNetworkReply::NetworkError::NoError) { - return result_edit.first; + if (result_edit.m_networkError != QNetworkReply::NetworkError::NoError) { + return result_edit.m_networkError; } // Cleanup for next batch. @@ -121,8 +121,8 @@ QVariantHash GreaderNetwork::userInfo(const QNetworkProxy& proxy) { {}, proxy); - if (res.first != QNetworkReply::NetworkError::NoError) { - throw NetworkException(res.first); + if (res.m_networkError != QNetworkReply::NetworkError::NoError) { + throw NetworkException(res.m_networkError); } return QJsonDocument::fromJson(output).object().toVariantHash(); @@ -447,13 +447,13 @@ QStringList GreaderNetwork::itemIds(const QString& stream_id, bool unread_only, {}, proxy); - if (result_stream.first != QNetworkReply::NetworkError::NoError) { + if (result_stream.m_networkError != QNetworkReply::NetworkError::NoError) { qCriticalNN << LOGSEC_GREADER << "Cannot download item IDs for " << QUOTE_NO_SPACE(stream_id) << ", network error:" - << QUOTE_W_SPACE_DOT(result_stream.first); - throw NetworkException(result_stream.first); + << QUOTE_W_SPACE_DOT(result_stream.m_networkError); + throw NetworkException(result_stream.m_networkError); } else { ids.append(decodeItemIds(output_stream, continuation)); @@ -515,12 +515,12 @@ QList GreaderNetwork::itemContents(ServiceRoot* root, const QList GreaderNetwork::streamContents(ServiceRoot* root, const QString& {}, proxy); - if (result_stream.first != QNetworkReply::NetworkError::NoError) { + if (result_stream.m_networkError != QNetworkReply::NetworkError::NoError) { qCriticalNN << LOGSEC_GREADER << "Cannot download messages for " << QUOTE_NO_SPACE(stream_id) << ", network error:" - << QUOTE_W_SPACE_DOT(result_stream.first); + << QUOTE_W_SPACE_DOT(result_stream.m_networkError); error = Feed::Status::NetworkError; return {}; } @@ -625,7 +625,7 @@ RootItem* GreaderNetwork::categoriesFeedsLabelsTree(bool obtain_icons, const QNe {}, proxy); - if (result_labels.first != QNetworkReply::NetworkError::NoError) { + if (result_labels.m_networkError != QNetworkReply::NetworkError::NoError) { return nullptr; } @@ -642,7 +642,7 @@ RootItem* GreaderNetwork::categoriesFeedsLabelsTree(bool obtain_icons, const QNe {}, proxy); - if (result_feeds.first != QNetworkReply::NetworkError::NoError) { + if (result_feeds.m_networkError != QNetworkReply::NetworkError::NoError) { return nullptr; } @@ -824,7 +824,7 @@ QNetworkReply::NetworkError GreaderNetwork::clientLogin(const QNetworkProxy& pro {}, proxy); - if (network_result.first == QNetworkReply::NetworkError::NoError) { + if (network_result.m_networkError == QNetworkReply::NetworkError::NoError) { // Save credentials. auto lines = QString::fromUtf8(output).replace(QSL("\r"), QString()).split('\n'); @@ -873,7 +873,7 @@ QNetworkReply::NetworkError GreaderNetwork::clientLogin(const QNetworkProxy& pro {}, proxy); - if (network_result.first == QNetworkReply::NetworkError::NoError) { + if (network_result.m_networkError == QNetworkReply::NetworkError::NoError) { m_authToken = output; } else { @@ -882,7 +882,7 @@ QNetworkReply::NetworkError GreaderNetwork::clientLogin(const QNetworkProxy& pro } } - return network_result.first; + return network_result.m_networkError; } GreaderServiceRoot::Service GreaderNetwork::service() const { diff --git a/src/librssguard/services/newsblur/newsblurnetwork.cpp b/src/librssguard/services/newsblur/newsblurnetwork.cpp index 44064edee..82a0c139a 100755 --- a/src/librssguard/services/newsblur/newsblurnetwork.cpp +++ b/src/librssguard/services/newsblur/newsblurnetwork.cpp @@ -45,7 +45,7 @@ LoginResult NewsBlurNetwork::login(const QNetworkProxy& proxy) { {}, proxy); - if (network_result.first == QNetworkReply::NetworkError::NoError) { + if (network_result.m_networkError == QNetworkReply::NetworkError::NoError) { QJsonParseError err; QJsonDocument doc = QJsonDocument::fromJson(output, &err); @@ -61,7 +61,7 @@ LoginResult NewsBlurNetwork::login(const QNetworkProxy& proxy) { return res; } else { - throw NetworkException(network_result.first, output); + throw NetworkException(network_result.m_networkError, output); } } diff --git a/src/librssguard/services/owncloud/owncloudnetworkfactory.cpp b/src/librssguard/services/owncloud/owncloudnetworkfactory.cpp index 5d1da7806..92fe6399b 100644 --- a/src/librssguard/services/owncloud/owncloudnetworkfactory.cpp +++ b/src/librssguard/services/owncloud/owncloudnetworkfactory.cpp @@ -92,15 +92,15 @@ OwnCloudStatusResponse OwnCloudNetworkFactory::status(const QNetworkProxy& custo {}, {}, custom_proxy); - OwnCloudStatusResponse status_response(network_reply.first, QString::fromUtf8(result_raw)); + OwnCloudStatusResponse status_response(network_reply.m_networkError, QString::fromUtf8(result_raw)); qDebugNN << LOGSEC_NEXTCLOUD << "Raw status data is:" << QUOTE_W_SPACE_DOT(result_raw); - if (network_reply.first != QNetworkReply::NoError) { + if (network_reply.m_networkError != QNetworkReply::NoError) { qCriticalNN << LOGSEC_NEXTCLOUD << "Obtaining status info failed with error" - << QUOTE_W_SPACE_DOT(network_reply.first); + << QUOTE_W_SPACE_DOT(network_reply.m_networkError); } return status_response; @@ -125,11 +125,11 @@ OwnCloudGetFeedsCategoriesResponse OwnCloudNetworkFactory::feedsCategories(const {}, custom_proxy); - if (network_reply.first != QNetworkReply::NoError) { + if (network_reply.m_networkError != QNetworkReply::NoError) { qCriticalNN << LOGSEC_NEXTCLOUD << "Obtaining of categories failed with error" - << QUOTE_W_SPACE_DOT(network_reply.first); - return OwnCloudGetFeedsCategoriesResponse(network_reply.first); + << QUOTE_W_SPACE_DOT(network_reply.m_networkError); + return OwnCloudGetFeedsCategoriesResponse(network_reply.m_networkError); } QString content_categories = QString::fromUtf8(result_raw); @@ -147,16 +147,16 @@ OwnCloudGetFeedsCategoriesResponse OwnCloudNetworkFactory::feedsCategories(const {}, custom_proxy); - if (network_reply.first != QNetworkReply::NoError) { + if (network_reply.m_networkError != QNetworkReply::NoError) { qCriticalNN << LOGSEC_NEXTCLOUD << "Obtaining of feeds failed with error" - << QUOTE_W_SPACE_DOT(network_reply.first); - return OwnCloudGetFeedsCategoriesResponse(network_reply.first); + << QUOTE_W_SPACE_DOT(network_reply.m_networkError); + return OwnCloudGetFeedsCategoriesResponse(network_reply.m_networkError); } QString content_feeds = QString::fromUtf8(result_raw); - return OwnCloudGetFeedsCategoriesResponse(network_reply.first, content_categories, content_feeds); + return OwnCloudGetFeedsCategoriesResponse(network_reply.m_networkError, content_categories, content_feeds); } bool OwnCloudNetworkFactory::deleteFeed(const QString& feed_id, const QNetworkProxy& custom_proxy) { @@ -179,10 +179,10 @@ bool OwnCloudNetworkFactory::deleteFeed(const QString& feed_id, const QNetworkPr {}, custom_proxy); - if (network_reply.first != QNetworkReply::NoError) { + if (network_reply.m_networkError != QNetworkReply::NoError) { qCriticalNN << LOGSEC_NEXTCLOUD << "Obtaining of categories failed with error" - << QUOTE_W_SPACE_DOT(network_reply.first); + << QUOTE_W_SPACE_DOT(network_reply.m_networkError); return false; } else { @@ -222,10 +222,10 @@ bool OwnCloudNetworkFactory::createFeed(const QString& url, int parent_id, const {}, custom_proxy); - if (network_reply.first != QNetworkReply::NoError) { + if (network_reply.m_networkError != QNetworkReply::NoError) { qCriticalNN << LOGSEC_NEXTCLOUD << "Creating of category failed with error" - << QUOTE_W_SPACE_DOT(network_reply.first); + << QUOTE_W_SPACE_DOT(network_reply.m_networkError); return false; } else { @@ -259,10 +259,10 @@ bool OwnCloudNetworkFactory::renameFeed(const QString& new_name, {}, custom_proxy); - if (network_reply.first != QNetworkReply::NetworkError::NoError) { + if (network_reply.m_networkError != QNetworkReply::NetworkError::NoError) { qCriticalNN << LOGSEC_NEXTCLOUD << "Renaming of feed failed with error" - << QUOTE_W_SPACE_DOT(network_reply.first); + << QUOTE_W_SPACE_DOT(network_reply.m_networkError); return false; } else { @@ -296,12 +296,12 @@ OwnCloudGetMessagesResponse OwnCloudNetworkFactory::getMessages(int feed_id, con {}, {}, custom_proxy); - OwnCloudGetMessagesResponse msgs_response(network_reply.first, QString::fromUtf8(result_raw)); + OwnCloudGetMessagesResponse msgs_response(network_reply.m_networkError, QString::fromUtf8(result_raw)); - if (network_reply.first != QNetworkReply::NoError) { + if (network_reply.m_networkError != QNetworkReply::NoError) { qCriticalNN << LOGSEC_NEXTCLOUD << "Obtaining messages failed with error" - << QUOTE_W_SPACE_DOT(network_reply.first); + << QUOTE_W_SPACE_DOT(network_reply.m_networkError); } return msgs_response; @@ -328,13 +328,13 @@ QNetworkReply::NetworkError OwnCloudNetworkFactory::triggerFeedUpdate(int feed_i {}, custom_proxy); - if (network_reply.first != QNetworkReply::NetworkError::NoError) { + if (network_reply.m_networkError != QNetworkReply::NetworkError::NoError) { qCriticalNN << LOGSEC_NEXTCLOUD << "Feeds update failed with error" - << QUOTE_W_SPACE_DOT(network_reply.first); + << QUOTE_W_SPACE_DOT(network_reply.m_networkError); } - return network_reply.first; + return network_reply.m_networkError; } NetworkResult OwnCloudNetworkFactory::markMessagesRead(RootItem::ReadStatus status, @@ -514,7 +514,7 @@ RootItem* OwnCloudGetFeedsCategoriesResponse::feedsCategories(bool obtain_icons) if (NetworkFactory::performNetworkOperation(icon_path, DOWNLOAD_TIMEOUT, QByteArray(), icon_data, - QNetworkAccessManager::Operation::GetOperation).first == + QNetworkAccessManager::Operation::GetOperation).m_networkError == QNetworkReply::NetworkError::NoError) { // Icon downloaded, set it up. QPixmap icon_pixmap; diff --git a/src/librssguard/services/owncloud/owncloudserviceroot.cpp b/src/librssguard/services/owncloud/owncloudserviceroot.cpp index de1d9da1a..13d54e664 100644 --- a/src/librssguard/services/owncloud/owncloudserviceroot.cpp +++ b/src/librssguard/services/owncloud/owncloudserviceroot.cpp @@ -82,7 +82,7 @@ void OwnCloudServiceRoot::saveAllCachedData(bool ignore_errors) { if (!ids.isEmpty()) { auto res = network()->markMessagesRead(key, ids, networkProxy()); - if (!ignore_errors && res.first != QNetworkReply::NetworkError::NoError) { + if (!ignore_errors && res.m_networkError != QNetworkReply::NetworkError::NoError) { addMessageStatesToCache(ids, key); } } @@ -106,7 +106,7 @@ void OwnCloudServiceRoot::saveAllCachedData(bool ignore_errors) { auto res = network()->markMessagesStarred(key, feed_ids, guid_hashes, networkProxy()); - if (!ignore_errors && res.first != QNetworkReply::NetworkError::NoError) { + if (!ignore_errors && res.m_networkError != QNetworkReply::NetworkError::NoError) { addMessageStatesToCache(messages, key); } } diff --git a/src/librssguard/services/reddit/redditnetworkfactory.cpp b/src/librssguard/services/reddit/redditnetworkfactory.cpp index 7dfffc256..d70e038d3 100644 --- a/src/librssguard/services/reddit/redditnetworkfactory.cpp +++ b/src/librssguard/services/reddit/redditnetworkfactory.cpp @@ -114,7 +114,7 @@ QVariantHash RedditNetworkFactory::me(const QNetworkProxy& custom_proxy) { false, {}, {}, - custom_proxy).first; + custom_proxy).m_networkError; if (result != QNetworkReply::NetworkError::NoError) { throw NetworkException(result, output); diff --git a/src/librssguard/services/standard/standardfeed.cpp b/src/librssguard/services/standard/standardfeed.cpp index 57f1de938..0b42f8b9d 100644 --- a/src/librssguard/services/standard/standardfeed.cpp +++ b/src/librssguard/services/standard/standardfeed.cpp @@ -254,10 +254,10 @@ StandardFeed* StandardFeed::guessFeed(StandardFeed::SourceType source_type, {}, custom_proxy); - content_type = network_result.second.toString(); + content_type = network_result.m_contentType; - if (network_result.first != QNetworkReply::NetworkError::NoError) { - throw NetworkException(network_result.first); + if (network_result.m_networkError != QNetworkReply::NetworkError::NoError) { + throw NetworkException(network_result.m_networkError); } } else { diff --git a/src/librssguard/services/standard/standardserviceroot.cpp b/src/librssguard/services/standard/standardserviceroot.cpp index d8f3615c8..91ae9125d 100644 --- a/src/librssguard/services/standard/standardserviceroot.cpp +++ b/src/librssguard/services/standard/standardserviceroot.cpp @@ -173,7 +173,7 @@ QList StandardServiceRoot::obtainNewMessages(Feed* feed, false, {}, {}, - networkProxy()).first; + networkProxy()).m_networkError; if (network_result != QNetworkReply::NetworkError::NoError) { qWarningNN << LOGSEC_CORE @@ -360,7 +360,7 @@ bool StandardServiceRoot::mergeImportExportModel(FeedsImportExportModel* model, auto* source_feed = qobject_cast(source_item); const auto* feed_with_same_url = target_root_node->getItemFromSubTree([source_feed](const RootItem* it) { return it->kind() == RootItem::Kind::Feed && - it->toFeed()->source().toLower() == source_feed->source().toLower(); + it->toFeed()->source().toLower() == source_feed->source().toLower(); }); if (feed_with_same_url != nullptr) { diff --git a/src/librssguard/services/tt-rss/ttrssnetworkfactory.cpp b/src/librssguard/services/tt-rss/ttrssnetworkfactory.cpp index 41b1eefa4..d5a1a8cc4 100644 --- a/src/librssguard/services/tt-rss/ttrssnetworkfactory.cpp +++ b/src/librssguard/services/tt-rss/ttrssnetworkfactory.cpp @@ -102,17 +102,17 @@ TtRssLoginResponse TtRssNetworkFactory::login(const QNetworkProxy& proxy) { proxy); TtRssLoginResponse login_response(QString::fromUtf8(result_raw)); - if (network_reply.first == QNetworkReply::NoError) { + if (network_reply.m_networkError == QNetworkReply::NoError) { m_sessionId = login_response.sessionId(); m_lastLoginTime = QDateTime::currentDateTime(); } else { qWarningNN << LOGSEC_TTRSS << "Login failed with error:" - << QUOTE_W_SPACE_DOT(network_reply.first); + << QUOTE_W_SPACE_DOT(network_reply.m_networkError); } - m_lastError = network_reply.first; + m_lastError = network_reply.m_networkError; return login_response; } @@ -141,7 +141,7 @@ TtRssResponse TtRssNetworkFactory::logout(const QNetworkProxy& proxy) { {}, proxy); - m_lastError = network_reply.first; + m_lastError = network_reply.m_networkError; if (m_lastError == QNetworkReply::NoError) { m_sessionId.clear(); @@ -149,7 +149,7 @@ TtRssResponse TtRssNetworkFactory::logout(const QNetworkProxy& proxy) { else { qWarningNN << LOGSEC_TTRSS << "Logout failed with error:" - << QUOTE_W_SPACE_DOT(network_reply.first); + << QUOTE_W_SPACE_DOT(network_reply.m_networkError); } return TtRssResponse(QString::fromUtf8(result_raw)); @@ -199,13 +199,13 @@ TtRssGetLabelsResponse TtRssNetworkFactory::getLabels(const QNetworkProxy& proxy result = TtRssGetLabelsResponse(QString::fromUtf8(result_raw)); } - if (network_reply.first != QNetworkReply::NoError) { + if (network_reply.m_networkError != QNetworkReply::NoError) { qWarningNN << LOGSEC_TTRSS << "getLabels failed with error:" - << QUOTE_W_SPACE_DOT(network_reply.first); + << QUOTE_W_SPACE_DOT(network_reply.m_networkError); } - m_lastError = network_reply.first; + m_lastError = network_reply.m_networkError; return result; } @@ -254,13 +254,13 @@ TtRssResponse TtRssNetworkFactory::shareToPublished(const TtRssNoteToPublish& no result = TtRssResponse(QString::fromUtf8(result_raw)); } - if (network_reply.first != QNetworkReply::NoError) { + if (network_reply.m_networkError != QNetworkReply::NoError) { qWarningNN << LOGSEC_TTRSS << "shareToPublished failed with error:" - << QUOTE_W_SPACE_DOT(network_reply.first); + << QUOTE_W_SPACE_DOT(network_reply.m_networkError); } - m_lastError = network_reply.first; + m_lastError = network_reply.m_networkError; return result; } @@ -305,13 +305,13 @@ TtRssGetFeedsCategoriesResponse TtRssNetworkFactory::getFeedsCategories(const QN result = TtRssGetFeedsCategoriesResponse(QString::fromUtf8(result_raw)); } - if (network_reply.first != QNetworkReply::NoError) { + if (network_reply.m_networkError != QNetworkReply::NoError) { qWarningNN << LOGSEC_TTRSS << "getFeedTree failed with error:" - << QUOTE_W_SPACE_DOT(network_reply.first); + << QUOTE_W_SPACE_DOT(network_reply.m_networkError); } - m_lastError = network_reply.first; + m_lastError = network_reply.m_networkError; return result; } @@ -368,13 +368,13 @@ TtRssGetHeadlinesResponse TtRssNetworkFactory::getHeadlines(int feed_id, int lim result = TtRssGetHeadlinesResponse(QString::fromUtf8(result_raw)); } - if (network_reply.first != QNetworkReply::NoError) { + if (network_reply.m_networkError != QNetworkReply::NoError) { qWarningNN << LOGSEC_TTRSS << "getHeadlines failed with error:" - << QUOTE_W_SPACE_DOT(network_reply.first); + << QUOTE_W_SPACE_DOT(network_reply.m_networkError); } - m_lastError = network_reply.first; + m_lastError = network_reply.m_networkError; return result; } @@ -424,13 +424,13 @@ TtRssResponse TtRssNetworkFactory::setArticleLabel(const QStringList& article_id result = TtRssResponse(QString::fromUtf8(result_raw)); } - if (network_reply.first != QNetworkReply::NoError) { + if (network_reply.m_networkError != QNetworkReply::NoError) { qWarningNN << LOGSEC_TTRSS << "setArticleLabel failed with error" - << QUOTE_W_SPACE_DOT(network_reply.first); + << QUOTE_W_SPACE_DOT(network_reply.m_networkError); } - m_lastError = network_reply.first; + m_lastError = network_reply.m_networkError; return result; } @@ -482,13 +482,13 @@ TtRssUpdateArticleResponse TtRssNetworkFactory::updateArticles(const QStringList result = TtRssUpdateArticleResponse(QString::fromUtf8(result_raw)); } - if (network_reply.first != QNetworkReply::NoError) { + if (network_reply.m_networkError != QNetworkReply::NoError) { qWarningNN << LOGSEC_TTRSS << "updateArticle failed with error" - << QUOTE_W_SPACE_DOT(network_reply.first); + << QUOTE_W_SPACE_DOT(network_reply.m_networkError); } - m_lastError = network_reply.first; + m_lastError = network_reply.m_networkError; return result; } @@ -544,13 +544,13 @@ TtRssSubscribeToFeedResponse TtRssNetworkFactory::subscribeToFeed(const QString& result = TtRssSubscribeToFeedResponse(QString::fromUtf8(result_raw)); } - if (network_reply.first != QNetworkReply::NoError) { + if (network_reply.m_networkError != QNetworkReply::NoError) { qWarningNN << LOGSEC_TTRSS << "updateArticle failed with error" - << QUOTE_W_SPACE_DOT(network_reply.first); + << QUOTE_W_SPACE_DOT(network_reply.m_networkError); } - m_lastError = network_reply.first; + m_lastError = network_reply.m_networkError; return result; } @@ -596,13 +596,13 @@ TtRssUnsubscribeFeedResponse TtRssNetworkFactory::unsubscribeFeed(int feed_id, c result = TtRssUnsubscribeFeedResponse(QString::fromUtf8(result_raw)); } - if (network_reply.first != QNetworkReply::NoError) { + if (network_reply.m_networkError != QNetworkReply::NoError) { qWarningNN << LOGSEC_TTRSS << "getFeeds failed with error" - << QUOTE_W_SPACE_DOT(network_reply.first); + << QUOTE_W_SPACE_DOT(network_reply.m_networkError); } - m_lastError = network_reply.first; + m_lastError = network_reply.m_networkError; return result; }