From 49b23532efd7669f1acfae41a0cfca474bf2ec60 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Sun, 23 Apr 2017 19:52:20 +0200 Subject: [PATCH] Some clazy fixes. --- src/network-web/downloader.cpp | 7 +++++-- src/services/abstract/gui/formfeeddetails.cpp | 2 +- src/services/abstract/gui/formfeeddetails.h | 2 +- src/services/owncloud/owncloudfeed.cpp | 2 +- src/services/owncloud/owncloudserviceroot.cpp | 2 +- src/services/standard/feedparser.cpp | 4 ++-- .../standard/gui/formstandardcategorydetails.cpp | 2 +- .../standard/gui/formstandardcategorydetails.h | 2 +- src/services/standard/standardcategory.cpp | 2 +- src/services/standard/standardfeed.cpp | 2 +- src/services/standard/standardserviceroot.cpp | 6 +++--- src/services/tt-rss/network/ttrssnetworkfactory.cpp | 12 ++++++------ src/services/tt-rss/ttrssfeed.cpp | 2 +- src/services/tt-rss/ttrssserviceroot.cpp | 2 +- 14 files changed, 26 insertions(+), 23 deletions(-) diff --git a/src/network-web/downloader.cpp b/src/network-web/downloader.cpp index f1632fd15..90d1c6177 100755 --- a/src/network-web/downloader.cpp +++ b/src/network-web/downloader.cpp @@ -53,8 +53,11 @@ void Downloader::manipulateData(const QString &url, QNetworkAccessManager::Opera QNetworkRequest request; QString non_const_url = url; - foreach (const QByteArray &header_name, m_customHeaders.keys()) { - request.setRawHeader(header_name, m_customHeaders.value(header_name)); + QHashIterator i(m_customHeaders); + + while (i.hasNext()) { + i.next(); + request.setRawHeader(i.key(), i.value()); } m_inputData = data; diff --git a/src/services/abstract/gui/formfeeddetails.cpp b/src/services/abstract/gui/formfeeddetails.cpp index 5fe0b76cf..c79dfdaf7 100755 --- a/src/services/abstract/gui/formfeeddetails.cpp +++ b/src/services/abstract/gui/formfeeddetails.cpp @@ -58,7 +58,7 @@ FormFeedDetails::FormFeedDetails(ServiceRoot *service_root, QWidget *parent) FormFeedDetails::~FormFeedDetails() { } -int FormFeedDetails::exec(Feed *input_feed, RootItem *parent_to_select, const QString &url) { +int FormFeedDetails::addEditFeed(Feed *input_feed, RootItem *parent_to_select, const QString &url) { // Load categories. loadCategories(m_serviceRoot->getSubTreeCategories(), m_serviceRoot); diff --git a/src/services/abstract/gui/formfeeddetails.h b/src/services/abstract/gui/formfeeddetails.h index c334b25fd..340707378 100644 --- a/src/services/abstract/gui/formfeeddetails.h +++ b/src/services/abstract/gui/formfeeddetails.h @@ -42,7 +42,7 @@ class FormFeedDetails : public QDialog { public slots: // Executes add/edit standard feed dialog. - int exec(Feed *input_feed, RootItem *parent_to_select, const QString &url = QString()); + int addEditFeed(Feed *input_feed, RootItem *parent_to_select, const QString &url = QString()); protected slots: // Applies changes. diff --git a/src/services/owncloud/owncloudfeed.cpp b/src/services/owncloud/owncloudfeed.cpp index fe4471a66..5b6846e31 100755 --- a/src/services/owncloud/owncloudfeed.cpp +++ b/src/services/owncloud/owncloudfeed.cpp @@ -48,7 +48,7 @@ bool OwnCloudFeed::canBeEdited() const { bool OwnCloudFeed::editViaGui() { QPointer form_pointer = new FormOwnCloudFeedDetails(serviceRoot(), qApp->mainFormWidget()); - form_pointer.data()->exec(this, nullptr); + form_pointer.data()->addEditFeed(this, nullptr); delete form_pointer.data(); return false; } diff --git a/src/services/owncloud/owncloudserviceroot.cpp b/src/services/owncloud/owncloudserviceroot.cpp index e19c93604..5d5159924 100755 --- a/src/services/owncloud/owncloudserviceroot.cpp +++ b/src/services/owncloud/owncloudserviceroot.cpp @@ -265,7 +265,7 @@ void OwnCloudServiceRoot::addNewFeed(const QString &url) { QScopedPointer form_pointer(new FormOwnCloudFeedDetails(this, qApp->mainFormWidget())); - form_pointer.data()->exec(nullptr, this, url); + form_pointer.data()->addEditFeed(nullptr, this, url); qApp->feedUpdateLock()->unlock(); } diff --git a/src/services/standard/feedparser.cpp b/src/services/standard/feedparser.cpp index a2a016b33..7da63dc13 100644 --- a/src/services/standard/feedparser.cpp +++ b/src/services/standard/feedparser.cpp @@ -67,7 +67,7 @@ QStringList FeedParser::textsFromPath(const QDomElement &element, const QString QList next_elements; QString next_local_name = paths.takeFirst(); - foreach (QDomElement elem, current_elements) { + foreach (const QDomElement &elem, current_elements) { QDomNodeList elements = elem.elementsByTagNameNS(namespace_uri, next_local_name); for (int i = 0; i < elements.size(); i++) { @@ -87,7 +87,7 @@ QStringList FeedParser::textsFromPath(const QDomElement &element, const QString } if (!current_elements.isEmpty()) { - foreach (QDomElement elem, current_elements) { + foreach (const QDomElement &elem, current_elements) { result.append(elem.text()); } } diff --git a/src/services/standard/gui/formstandardcategorydetails.cpp b/src/services/standard/gui/formstandardcategorydetails.cpp index 4069c2a02..e9a0ac9db 100755 --- a/src/services/standard/gui/formstandardcategorydetails.cpp +++ b/src/services/standard/gui/formstandardcategorydetails.cpp @@ -74,7 +74,7 @@ void FormStandardCategoryDetails::setEditableCategory(StandardCategory *editable m_ui->m_btnIcon->setIcon(editable_category->icon()); } -int FormStandardCategoryDetails::exec(StandardCategory *input_category, RootItem *parent_to_select) { +int FormStandardCategoryDetails::addEditCategory(StandardCategory *input_category, RootItem *parent_to_select) { // Load categories. loadCategories(m_serviceRoot->getSubTreeCategories(), m_serviceRoot, input_category); diff --git a/src/services/standard/gui/formstandardcategorydetails.h b/src/services/standard/gui/formstandardcategorydetails.h index 93f8ee3d3..d6fdb30ef 100755 --- a/src/services/standard/gui/formstandardcategorydetails.h +++ b/src/services/standard/gui/formstandardcategorydetails.h @@ -45,7 +45,7 @@ class FormStandardCategoryDetails : public QDialog { public slots: // Executes add/edit standard category dialog. - int exec(StandardCategory *input_category, RootItem *parent_to_select); + int addEditCategory(StandardCategory *input_category, RootItem *parent_to_select); protected slots: // Applies changes. diff --git a/src/services/standard/standardcategory.cpp b/src/services/standard/standardcategory.cpp index 4603712e1..fff3c5601 100755 --- a/src/services/standard/standardcategory.cpp +++ b/src/services/standard/standardcategory.cpp @@ -99,7 +99,7 @@ bool StandardCategory::performDragDropChange(RootItem *target_item) { bool StandardCategory::editViaGui() { QScopedPointer form_pointer(new FormStandardCategoryDetails(serviceRoot(), qApp->mainFormWidget())); - form_pointer.data()->exec(this, nullptr); + form_pointer.data()->addEditCategory(this, nullptr); return false; } diff --git a/src/services/standard/standardfeed.cpp b/src/services/standard/standardfeed.cpp index 718c0bead..bf9e20c77 100755 --- a/src/services/standard/standardfeed.cpp +++ b/src/services/standard/standardfeed.cpp @@ -95,7 +95,7 @@ StandardServiceRoot *StandardFeed::serviceRoot() const { bool StandardFeed::editViaGui() { QScopedPointer form_pointer(new FormStandardFeedDetails(serviceRoot(), qApp->mainFormWidget())); - form_pointer.data()->exec(this, nullptr); + form_pointer.data()->addEditFeed(this, nullptr); return false; } diff --git a/src/services/standard/standardserviceroot.cpp b/src/services/standard/standardserviceroot.cpp index ac6aeeb44..2f94ac01a 100755 --- a/src/services/standard/standardserviceroot.cpp +++ b/src/services/standard/standardserviceroot.cpp @@ -137,7 +137,7 @@ void StandardServiceRoot::addNewFeed(const QString &url) { } QScopedPointer form_pointer(new FormStandardFeedDetails(this, qApp->mainFormWidget())); - form_pointer.data()->exec(nullptr, nullptr, url); + form_pointer.data()->addEditFeed(nullptr, nullptr, url); qApp->feedUpdateLock()->unlock(); } @@ -180,7 +180,7 @@ void StandardServiceRoot::loadFromDatabase(){ } void StandardServiceRoot::checkArgumentsForFeedAdding() { - foreach (QString arg, qApp->arguments().mid(1)) { + foreach (const QString &arg, qApp->arguments().mid(1)) { checkArgumentForFeedAdding(arg); } } @@ -323,7 +323,7 @@ void StandardServiceRoot::addNewCategory() { } QScopedPointer form_pointer(new FormStandardCategoryDetails(this, qApp->mainFormWidget())); - form_pointer.data()->exec(nullptr, nullptr); + form_pointer.data()->addEditCategory(nullptr, nullptr); qApp->feedUpdateLock()->unlock(); } diff --git a/src/services/tt-rss/network/ttrssnetworkfactory.cpp b/src/services/tt-rss/network/ttrssnetworkfactory.cpp index 69aedaa24..751fec555 100755 --- a/src/services/tt-rss/network/ttrssnetworkfactory.cpp +++ b/src/services/tt-rss/network/ttrssnetworkfactory.cpp @@ -468,9 +468,9 @@ RootItem *TtRssGetFeedsCategoriesResponse::feedsCategories(bool obtain_icons, QS if (status() == API_STATUS_OK) { // We have data, construct object tree according to data. QJsonArray items_to_process = m_rawContent["content"].toObject()["categories"].toObject()["items"].toArray(); - QList > pairs; + QVector > pairs; - foreach (QJsonValue item, items_to_process) { + foreach (const QJsonValue &item, items_to_process) { pairs.append(QPair(parent, item)); } @@ -487,7 +487,7 @@ RootItem *TtRssGetFeedsCategoriesResponse::feedsCategories(bool obtain_icons, QS if (item_id == 0) { // This is "Uncategorized" category, all its feeds belong to top-level root. if (item.contains("items")) { - foreach (QJsonValue child_feed, item["items"].toArray()) { + foreach (const QJsonValue &child_feed, item["items"].toArray()) { pairs.append(QPair(parent, child_feed)); } } @@ -500,7 +500,7 @@ RootItem *TtRssGetFeedsCategoriesResponse::feedsCategories(bool obtain_icons, QS act_parent->appendChild(category); if (item.contains("items")) { - foreach (QJsonValue child, item["items"].toArray()) { + foreach (const QJsonValue &child, item["items"].toArray()) { pairs.append(QPair(category, child)); } } @@ -550,7 +550,7 @@ TtRssGetHeadlinesResponse::~TtRssGetHeadlinesResponse() { QList TtRssGetHeadlinesResponse::messages() const { QList messages; - foreach (QJsonValue item, m_rawContent["content"].toArray()) { + foreach (const QJsonValue &item, m_rawContent["content"].toArray()) { QJsonObject mapped = item.toObject(); Message message; @@ -570,7 +570,7 @@ QList TtRssGetHeadlinesResponse::messages() const { if (mapped.contains(QSL("attachments"))) { // Process enclosures. - foreach (QJsonValue attachment, mapped["attachments"].toArray()) { + foreach (const QJsonValue &attachment, mapped["attachments"].toArray()) { QJsonObject mapped_attachemnt = attachment.toObject(); Enclosure enclosure; diff --git a/src/services/tt-rss/ttrssfeed.cpp b/src/services/tt-rss/ttrssfeed.cpp index 43b9b0f66..91e38c8f8 100755 --- a/src/services/tt-rss/ttrssfeed.cpp +++ b/src/services/tt-rss/ttrssfeed.cpp @@ -101,7 +101,7 @@ bool TtRssFeed::canBeEdited() const { bool TtRssFeed::editViaGui() { QPointer form_pointer = new FormTtRssFeedDetails(serviceRoot(), qApp->mainFormWidget()); - form_pointer.data()->exec(this, nullptr); + form_pointer.data()->addEditFeed(this, nullptr); delete form_pointer.data(); return false; } diff --git a/src/services/tt-rss/ttrssserviceroot.cpp b/src/services/tt-rss/ttrssserviceroot.cpp index b5323fc0d..6e9b00e5f 100755 --- a/src/services/tt-rss/ttrssserviceroot.cpp +++ b/src/services/tt-rss/ttrssserviceroot.cpp @@ -124,7 +124,7 @@ void TtRssServiceRoot::addNewFeed(const QString &url) { QScopedPointer form_pointer(new FormTtRssFeedDetails(this, qApp->mainFormWidget())); - form_pointer.data()->exec(nullptr, this, url); + form_pointer.data()->addEditFeed(nullptr, this, url); qApp->feedUpdateLock()->unlock(); }