Some clazy fixes.

This commit is contained in:
Martin Rotter 2017-04-23 19:52:20 +02:00
parent 863a4e8237
commit 49b23532ef
14 changed files with 26 additions and 23 deletions

View file

@ -53,8 +53,11 @@ void Downloader::manipulateData(const QString &url, QNetworkAccessManager::Opera
QNetworkRequest request; QNetworkRequest request;
QString non_const_url = url; QString non_const_url = url;
foreach (const QByteArray &header_name, m_customHeaders.keys()) { QHashIterator<QByteArray, QByteArray> i(m_customHeaders);
request.setRawHeader(header_name, m_customHeaders.value(header_name));
while (i.hasNext()) {
i.next();
request.setRawHeader(i.key(), i.value());
} }
m_inputData = data; m_inputData = data;

View file

@ -58,7 +58,7 @@ FormFeedDetails::FormFeedDetails(ServiceRoot *service_root, QWidget *parent)
FormFeedDetails::~FormFeedDetails() { 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. // Load categories.
loadCategories(m_serviceRoot->getSubTreeCategories(), m_serviceRoot); loadCategories(m_serviceRoot->getSubTreeCategories(), m_serviceRoot);

View file

@ -42,7 +42,7 @@ class FormFeedDetails : public QDialog {
public slots: public slots:
// Executes add/edit standard feed dialog. // 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: protected slots:
// Applies changes. // Applies changes.

View file

@ -48,7 +48,7 @@ bool OwnCloudFeed::canBeEdited() const {
bool OwnCloudFeed::editViaGui() { bool OwnCloudFeed::editViaGui() {
QPointer<FormOwnCloudFeedDetails> form_pointer = new FormOwnCloudFeedDetails(serviceRoot(), qApp->mainFormWidget()); QPointer<FormOwnCloudFeedDetails> form_pointer = new FormOwnCloudFeedDetails(serviceRoot(), qApp->mainFormWidget());
form_pointer.data()->exec(this, nullptr); form_pointer.data()->addEditFeed(this, nullptr);
delete form_pointer.data(); delete form_pointer.data();
return false; return false;
} }

View file

@ -265,7 +265,7 @@ void OwnCloudServiceRoot::addNewFeed(const QString &url) {
QScopedPointer<FormOwnCloudFeedDetails> form_pointer(new FormOwnCloudFeedDetails(this, qApp->mainFormWidget())); QScopedPointer<FormOwnCloudFeedDetails> form_pointer(new FormOwnCloudFeedDetails(this, qApp->mainFormWidget()));
form_pointer.data()->exec(nullptr, this, url); form_pointer.data()->addEditFeed(nullptr, this, url);
qApp->feedUpdateLock()->unlock(); qApp->feedUpdateLock()->unlock();
} }

View file

@ -67,7 +67,7 @@ QStringList FeedParser::textsFromPath(const QDomElement &element, const QString
QList<QDomElement> next_elements; QList<QDomElement> next_elements;
QString next_local_name = paths.takeFirst(); 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); QDomNodeList elements = elem.elementsByTagNameNS(namespace_uri, next_local_name);
for (int i = 0; i < elements.size(); i++) { for (int i = 0; i < elements.size(); i++) {
@ -87,7 +87,7 @@ QStringList FeedParser::textsFromPath(const QDomElement &element, const QString
} }
if (!current_elements.isEmpty()) { if (!current_elements.isEmpty()) {
foreach (QDomElement elem, current_elements) { foreach (const QDomElement &elem, current_elements) {
result.append(elem.text()); result.append(elem.text());
} }
} }

View file

@ -74,7 +74,7 @@ void FormStandardCategoryDetails::setEditableCategory(StandardCategory *editable
m_ui->m_btnIcon->setIcon(editable_category->icon()); 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. // Load categories.
loadCategories(m_serviceRoot->getSubTreeCategories(), m_serviceRoot, input_category); loadCategories(m_serviceRoot->getSubTreeCategories(), m_serviceRoot, input_category);

View file

@ -45,7 +45,7 @@ class FormStandardCategoryDetails : public QDialog {
public slots: public slots:
// Executes add/edit standard category dialog. // 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: protected slots:
// Applies changes. // Applies changes.

View file

@ -99,7 +99,7 @@ bool StandardCategory::performDragDropChange(RootItem *target_item) {
bool StandardCategory::editViaGui() { bool StandardCategory::editViaGui() {
QScopedPointer<FormStandardCategoryDetails> form_pointer(new FormStandardCategoryDetails(serviceRoot(), qApp->mainFormWidget())); QScopedPointer<FormStandardCategoryDetails> form_pointer(new FormStandardCategoryDetails(serviceRoot(), qApp->mainFormWidget()));
form_pointer.data()->exec(this, nullptr); form_pointer.data()->addEditCategory(this, nullptr);
return false; return false;
} }

View file

@ -95,7 +95,7 @@ StandardServiceRoot *StandardFeed::serviceRoot() const {
bool StandardFeed::editViaGui() { bool StandardFeed::editViaGui() {
QScopedPointer<FormStandardFeedDetails> form_pointer(new FormStandardFeedDetails(serviceRoot(), qApp->mainFormWidget())); QScopedPointer<FormStandardFeedDetails> form_pointer(new FormStandardFeedDetails(serviceRoot(), qApp->mainFormWidget()));
form_pointer.data()->exec(this, nullptr); form_pointer.data()->addEditFeed(this, nullptr);
return false; return false;
} }

View file

@ -137,7 +137,7 @@ void StandardServiceRoot::addNewFeed(const QString &url) {
} }
QScopedPointer<FormStandardFeedDetails> form_pointer(new FormStandardFeedDetails(this, qApp->mainFormWidget())); QScopedPointer<FormStandardFeedDetails> form_pointer(new FormStandardFeedDetails(this, qApp->mainFormWidget()));
form_pointer.data()->exec(nullptr, nullptr, url); form_pointer.data()->addEditFeed(nullptr, nullptr, url);
qApp->feedUpdateLock()->unlock(); qApp->feedUpdateLock()->unlock();
} }
@ -180,7 +180,7 @@ void StandardServiceRoot::loadFromDatabase(){
} }
void StandardServiceRoot::checkArgumentsForFeedAdding() { void StandardServiceRoot::checkArgumentsForFeedAdding() {
foreach (QString arg, qApp->arguments().mid(1)) { foreach (const QString &arg, qApp->arguments().mid(1)) {
checkArgumentForFeedAdding(arg); checkArgumentForFeedAdding(arg);
} }
} }
@ -323,7 +323,7 @@ void StandardServiceRoot::addNewCategory() {
} }
QScopedPointer<FormStandardCategoryDetails> form_pointer(new FormStandardCategoryDetails(this, qApp->mainFormWidget())); QScopedPointer<FormStandardCategoryDetails> form_pointer(new FormStandardCategoryDetails(this, qApp->mainFormWidget()));
form_pointer.data()->exec(nullptr, nullptr); form_pointer.data()->addEditCategory(nullptr, nullptr);
qApp->feedUpdateLock()->unlock(); qApp->feedUpdateLock()->unlock();
} }

View file

@ -468,9 +468,9 @@ RootItem *TtRssGetFeedsCategoriesResponse::feedsCategories(bool obtain_icons, QS
if (status() == API_STATUS_OK) { if (status() == API_STATUS_OK) {
// We have data, construct object tree according to data. // We have data, construct object tree according to data.
QJsonArray items_to_process = m_rawContent["content"].toObject()["categories"].toObject()["items"].toArray(); QJsonArray items_to_process = m_rawContent["content"].toObject()["categories"].toObject()["items"].toArray();
QList<QPair<RootItem*,QJsonValue> > pairs; QVector<QPair<RootItem*,QJsonValue> > pairs;
foreach (QJsonValue item, items_to_process) { foreach (const QJsonValue &item, items_to_process) {
pairs.append(QPair<RootItem*,QJsonValue>(parent, item)); pairs.append(QPair<RootItem*,QJsonValue>(parent, item));
} }
@ -487,7 +487,7 @@ RootItem *TtRssGetFeedsCategoriesResponse::feedsCategories(bool obtain_icons, QS
if (item_id == 0) { if (item_id == 0) {
// This is "Uncategorized" category, all its feeds belong to top-level root. // This is "Uncategorized" category, all its feeds belong to top-level root.
if (item.contains("items")) { if (item.contains("items")) {
foreach (QJsonValue child_feed, item["items"].toArray()) { foreach (const QJsonValue &child_feed, item["items"].toArray()) {
pairs.append(QPair<RootItem*,QJsonValue>(parent, child_feed)); pairs.append(QPair<RootItem*,QJsonValue>(parent, child_feed));
} }
} }
@ -500,7 +500,7 @@ RootItem *TtRssGetFeedsCategoriesResponse::feedsCategories(bool obtain_icons, QS
act_parent->appendChild(category); act_parent->appendChild(category);
if (item.contains("items")) { if (item.contains("items")) {
foreach (QJsonValue child, item["items"].toArray()) { foreach (const QJsonValue &child, item["items"].toArray()) {
pairs.append(QPair<RootItem*,QJsonValue>(category, child)); pairs.append(QPair<RootItem*,QJsonValue>(category, child));
} }
} }
@ -550,7 +550,7 @@ TtRssGetHeadlinesResponse::~TtRssGetHeadlinesResponse() {
QList<Message> TtRssGetHeadlinesResponse::messages() const { QList<Message> TtRssGetHeadlinesResponse::messages() const {
QList<Message> messages; QList<Message> messages;
foreach (QJsonValue item, m_rawContent["content"].toArray()) { foreach (const QJsonValue &item, m_rawContent["content"].toArray()) {
QJsonObject mapped = item.toObject(); QJsonObject mapped = item.toObject();
Message message; Message message;
@ -570,7 +570,7 @@ QList<Message> TtRssGetHeadlinesResponse::messages() const {
if (mapped.contains(QSL("attachments"))) { if (mapped.contains(QSL("attachments"))) {
// Process enclosures. // Process enclosures.
foreach (QJsonValue attachment, mapped["attachments"].toArray()) { foreach (const QJsonValue &attachment, mapped["attachments"].toArray()) {
QJsonObject mapped_attachemnt = attachment.toObject(); QJsonObject mapped_attachemnt = attachment.toObject();
Enclosure enclosure; Enclosure enclosure;

View file

@ -101,7 +101,7 @@ bool TtRssFeed::canBeEdited() const {
bool TtRssFeed::editViaGui() { bool TtRssFeed::editViaGui() {
QPointer<FormTtRssFeedDetails> form_pointer = new FormTtRssFeedDetails(serviceRoot(), qApp->mainFormWidget()); QPointer<FormTtRssFeedDetails> form_pointer = new FormTtRssFeedDetails(serviceRoot(), qApp->mainFormWidget());
form_pointer.data()->exec(this, nullptr); form_pointer.data()->addEditFeed(this, nullptr);
delete form_pointer.data(); delete form_pointer.data();
return false; return false;
} }

View file

@ -124,7 +124,7 @@ void TtRssServiceRoot::addNewFeed(const QString &url) {
QScopedPointer<FormTtRssFeedDetails> form_pointer(new FormTtRssFeedDetails(this, qApp->mainFormWidget())); QScopedPointer<FormTtRssFeedDetails> form_pointer(new FormTtRssFeedDetails(this, qApp->mainFormWidget()));
form_pointer.data()->exec(nullptr, this, url); form_pointer.data()->addEditFeed(nullptr, this, url);
qApp->feedUpdateLock()->unlock(); qApp->feedUpdateLock()->unlock();
} }