From b2cc920a7002395ea31fb6067b68755129218ec7 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Thu, 26 Dec 2013 15:56:37 +0100 Subject: [PATCH] Some foreach cleanups. --- src/core/localization.cpp | 7 +++--- src/core/messagesmodel.cpp | 10 ++++---- src/gui/feedmessageviewer.cpp | 7 ++++-- src/gui/feedsview.cpp | 17 +++++--------- src/gui/feedsview.h | 1 + src/gui/formmain.cpp | 8 +++---- src/gui/formmain.ui | 43 ++++++++++++----------------------- src/gui/formsettings.cpp | 11 ++++----- 8 files changed, 42 insertions(+), 62 deletions(-) diff --git a/src/core/localization.cpp b/src/core/localization.cpp index ca31c1ad1..1019091b5 100644 --- a/src/core/localization.cpp +++ b/src/core/localization.cpp @@ -15,12 +15,11 @@ Localization::Localization() { QList Localization::getInstalledLanguages() { QList languages; QDir file_dir(APP_LANG_PATH); - QFileInfoList file_list = file_dir.entryInfoList(QStringList() << "rssguard_*.qm", - QDir::Files, - QDir::Name); QTranslator translator; - foreach (const QFileInfo &file, file_list) { + foreach (const QFileInfo &file, file_dir.entryInfoList(QStringList() << "rssguard_*.qm", + QDir::Files, + QDir::Name)) { if (translator.load(file.absoluteFilePath())) { Language new_language; new_language.m_name = translator.translate("QObject", "LANG_NAME"); diff --git a/src/core/messagesmodel.cpp b/src/core/messagesmodel.cpp index d5b11049b..e226c1055 100644 --- a/src/core/messagesmodel.cpp +++ b/src/core/messagesmodel.cpp @@ -398,8 +398,8 @@ bool MessagesModel::setBatchMessagesRead(const QModelIndexList &messages, int re } int message_id; - QSqlQuery query_delete_msg(db_handle); - if (!query_delete_msg.prepare("UPDATE messages SET read = :read " + QSqlQuery query_read_msg(db_handle); + if (!query_read_msg.prepare("UPDATE messages SET read = :read " "WHERE id = :id")) { qWarning("Query preparation failed for message read change."); @@ -409,9 +409,9 @@ bool MessagesModel::setBatchMessagesRead(const QModelIndexList &messages, int re foreach (const QModelIndex &message, messages) { message_id = messageId(message.row()); - query_delete_msg.bindValue(":id", message_id); - query_delete_msg.bindValue(":read", read); - query_delete_msg.exec(); + query_read_msg.bindValue(":id", message_id); + query_read_msg.bindValue(":read", read); + query_read_msg.exec(); } // Commit changes. diff --git a/src/gui/feedmessageviewer.cpp b/src/gui/feedmessageviewer.cpp index c0eccf44e..ed3b05fdc 100644 --- a/src/gui/feedmessageviewer.cpp +++ b/src/gui/feedmessageviewer.cpp @@ -177,7 +177,7 @@ void FeedMessageViewer::createConnections() { SIGNAL(triggered()), m_messagesView, SLOT(setAllMessagesRead())); connect(FormMain::getInstance()->m_ui->m_actionMarkFeedsAsUnread, SIGNAL(triggered()), m_messagesView, SLOT(setAllMessagesUnread())); - connect(FormMain::getInstance()->m_ui->m_actionDeleteAllMessages, + connect(FormMain::getInstance()->m_ui->m_actionClearFeeds, SIGNAL(triggered()), m_messagesView, SLOT(setAllMessagesDeleted())); connect(FormMain::getInstance()->m_ui->m_actionUpdateSelectedFeeds, SIGNAL(triggered()), this, SLOT(updateSelectedFeeds())); @@ -200,8 +200,11 @@ void FeedMessageViewer::initialize() { m_toolBar->addAction(FormMain::getInstance()->m_ui->m_actionDeleteSelectedFeeds); m_toolBar->addAction(FormMain::getInstance()->m_ui->m_actionMarkFeedsAsRead); m_toolBar->addAction(FormMain::getInstance()->m_ui->m_actionMarkFeedsAsUnread); + m_toolBar->addAction(FormMain::getInstance()->m_ui->m_actionClearFeeds); m_toolBar->addSeparator(); - m_toolBar->addAction(FormMain::getInstance()->m_ui->m_actionDeleteAllMessages); + m_toolBar->addAction(FormMain::getInstance()->m_ui->m_actionMarkSelectedMessagesAsRead); + m_toolBar->addAction(FormMain::getInstance()->m_ui->m_actionMarkSelectedMessagesAsUnread); + m_toolBar->addAction(FormMain::getInstance()->m_ui->m_actionDeleteSelectedMessages); // Finish web/message browser setup. m_messagesBrowser->setNavigationBarVisible(false); diff --git a/src/gui/feedsview.cpp b/src/gui/feedsview.cpp index f99ee1663..31425b729 100644 --- a/src/gui/feedsview.cpp +++ b/src/gui/feedsview.cpp @@ -39,9 +39,7 @@ QList FeedsView::allFeeds() const { } void FeedsView::updateCountsOfSelectedFeeds(bool update_total_too) { - QList feeds = selectedFeeds(); - - foreach (FeedsModelFeed *feed, feeds) { + foreach (FeedsModelFeed *feed, selectedFeeds()) { feed->updateCounts(update_total_too); } @@ -50,9 +48,7 @@ void FeedsView::updateCountsOfSelectedFeeds(bool update_total_too) { } void FeedsView::updateCountsOfAllFeeds(bool update_total_too) { - QList feeds = allFeeds(); - - foreach (FeedsModelFeed *feed, feeds) { + foreach (FeedsModelFeed *feed, allFeeds()) { feed->updateCounts(update_total_too); } @@ -86,12 +82,11 @@ void FeedsView::selectionChanged(const QItemSelection &selected, const QItemSelection &deselected) { QTreeView::selectionChanged(selected, deselected); - QList selected_feeds = selectedFeeds(); - QList feed_ids; + m_selectedFeeds.clear(); - foreach (FeedsModelFeed *feed, selected_feeds) { - feed_ids << feed->id(); + foreach (FeedsModelFeed *feed, selectedFeeds()) { + m_selectedFeeds << feed->id(); } - emit feedsSelected(feed_ids); + emit feedsSelected(m_selectedFeeds); } diff --git a/src/gui/feedsview.h b/src/gui/feedsview.h index 785b63a1e..0a3689e82 100644 --- a/src/gui/feedsview.h +++ b/src/gui/feedsview.h @@ -41,6 +41,7 @@ class FeedsView : public QTreeView { void feedsSelected(const QList &feed_ids); private: + QList m_selectedFeeds; FeedsModel *m_sourceModel; FeedsProxyModel *m_proxyModel; }; diff --git a/src/gui/formmain.cpp b/src/gui/formmain.cpp index 16ef5d8ec..480f88c77 100755 --- a/src/gui/formmain.cpp +++ b/src/gui/formmain.cpp @@ -83,7 +83,7 @@ QList FormMain::getActions() { m_ui->m_actionOpenSelectedMessagesInternally << m_ui->m_actionMarkFeedsAsRead << m_ui->m_actionMarkFeedsAsUnread << - m_ui->m_actionDeleteAllMessages << + m_ui->m_actionClearFeeds << m_ui->m_actionMarkSelectedMessagesAsRead << m_ui->m_actionMarkSelectedMessagesAsUnread << m_ui->m_actionSwitchImportanceOfSelectedMessages << @@ -217,11 +217,9 @@ void FormMain::setupIcons() { // Feeds/messages. m_ui->m_actionUpdateAllFeeds->setIcon(IconThemeFactory::getInstance()->fromTheme("document-save-as")); m_ui->m_actionUpdateSelectedFeeds->setIcon(IconThemeFactory::getInstance()->fromTheme("document-save")); - m_ui->m_actionDeleteAllMessages->setIcon(IconThemeFactory::getInstance()->fromTheme("edit-delete")); - + m_ui->m_actionClearFeeds->setIcon(IconThemeFactory::getInstance()->fromTheme("mail-mark-junk")); m_ui->m_actionDeleteSelectedFeeds->setIcon(IconThemeFactory::getInstance()->fromTheme("edit-delete")); - m_ui->m_actionDeleteSelectedMessages->setIcon(IconThemeFactory::getInstance()->fromTheme("edit-delete")); - + m_ui->m_actionDeleteSelectedMessages->setIcon(IconThemeFactory::getInstance()->fromTheme("mail-mark-junk")); m_ui->m_actionAddNewCategory->setIcon(IconThemeFactory::getInstance()->fromTheme("document-new")); m_ui->m_actionAddNewFeed->setIcon(IconThemeFactory::getInstance()->fromTheme("document-new")); m_ui->m_actionEditSelectedFeed->setIcon(IconThemeFactory::getInstance()->fromTheme("gnome-other")); diff --git a/src/gui/formmain.ui b/src/gui/formmain.ui index bac55005e..fed300e15 100644 --- a/src/gui/formmain.ui +++ b/src/gui/formmain.ui @@ -46,9 +46,6 @@ &File - - - @@ -98,6 +95,7 @@ + @@ -106,9 +104,7 @@ - - @@ -221,20 +217,6 @@ Ctrl+Shift+C - - - false - - - &No actions possible - - - No actions are possible at this point of time. - - - - - Update &all feeds @@ -259,7 +241,7 @@ - &Edit selected feed(s)/category(ies) + &Edit selected feed/category Edit selected feed/category. @@ -314,7 +296,7 @@ - Mark &selected feed(s) read + Mark &selected feeds read Marks all messages (without message filters) from selected feeds as read. @@ -330,21 +312,18 @@ - &Delete selected messages + &Clear selected messages Delete selected messages. - - - - + - Dele&te all messages + Clear selected feeds - Delete all messages from selected feeds. This does NOT take message filters into account. + Removes all messages from selected feeds. @@ -399,6 +378,14 @@ + + + No actions available + + + No actions are available right now. + + diff --git a/src/gui/formsettings.cpp b/src/gui/formsettings.cpp index 7255ac7f7..aec4e3535 100755 --- a/src/gui/formsettings.cpp +++ b/src/gui/formsettings.cpp @@ -123,7 +123,7 @@ void FormSettings::onSkinSelected(QTreeWidgetItem *current, void FormSettings::changeBrowserProgressColor() { QPointer color_dialog = new QColorDialog(m_initialSettings.m_webBrowserProgress, - this); + this); color_dialog.data()->setWindowTitle(tr("Select color for web browser progress bar")); color_dialog.data()->setOption(QColorDialog::ShowAlphaChannel); @@ -225,7 +225,7 @@ void FormSettings::promptForRestart() { QStringList changed_data_texts = m_changedDataTexts; changed_data_texts.replaceInStrings(QRegExp("^"), - QString::fromUtf8(" • ")); + QString::fromUtf8(" • ")); QPointer msg_question = new QMessageBox(this); msg_question.data()->setText(tr("Some critical settings were changed and will be applied after the application gets restarted.")); @@ -368,9 +368,7 @@ void FormSettings::saveProxy() { } void FormSettings::loadLanguage() { - QList languages = Localization::getInstalledLanguages(); - - foreach (const Language &language, languages) { + foreach (const Language &language, Localization::getInstalledLanguages()) { QTreeWidgetItem *item = new QTreeWidgetItem(m_ui->m_treeLanguages); item->setText(0, language.m_name); item->setText(1, language.m_code); @@ -504,10 +502,9 @@ void FormSettings::loadInterface() { } // Load skin. - QList installed_skins = SkinFactory::getInstance()->getInstalledSkins(); QString selected_skin = SkinFactory::getInstance()->getSelectedSkinName(); - foreach (const Skin &skin, installed_skins) { + foreach (const Skin &skin, SkinFactory::getInstance()->getInstalledSkins()) { QTreeWidgetItem *new_item = new QTreeWidgetItem(QStringList() << skin.m_visibleName << skin.m_version <<