diff options
author | Tim Jenssen <tim.jenssen@qt.io> | 2019-01-18 20:25:30 +0100 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@qt.io> | 2019-01-21 15:10:54 +0000 |
commit | a78e3e5dd5f882a28a3152f2e63ae986a9f2a8c5 (patch) | |
tree | 046f13d3382f0e9c6da0bc50893cab4e71ae379c /src | |
parent | 620086109ada596969033112a71b754c3e29c186 (diff) |
use initializer lists
Change-Id: I82b04601f1db52197b3dc625b6b7e0f143c1c8b6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src')
23 files changed, 33 insertions, 38 deletions
diff --git a/src/libs/extensionsystem/pluginview.cpp b/src/libs/extensionsystem/pluginview.cpp index 6c310c8858..39a39643cb 100644 --- a/src/libs/extensionsystem/pluginview.cpp +++ b/src/libs/extensionsystem/pluginview.cpp @@ -180,7 +180,7 @@ public: bool setData(int column, const QVariant &data, int role) override { if (column == LoadedColumn && role == Qt::CheckStateRole) - return m_view->setPluginsEnabled(QSet<PluginSpec *>() << m_spec, data.toBool()); + return m_view->setPluginsEnabled({m_spec}, data.toBool()); return false; } diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp index 519f9ca15c..63d716d2d1 100644 --- a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp +++ b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp @@ -1202,7 +1202,7 @@ void PropertiesView::MView::onClassMembersChanged(QList<MClassMember> &classMemb &MClass::members, &MClass::setMembers); foreach (DElement *element, m_diagramElements) { if (showMembers.contains(element->modelUid())) { - assignModelElement<DClass, bool>(QList<DElement *>() << element, SelectionSingle, true, + assignModelElement<DClass, bool>(QList<DElement *>({element}), SelectionSingle, true, &DClass::showAllMembers, &DClass::setShowAllMembers); } } diff --git a/src/libs/utils/wizard.cpp b/src/libs/utils/wizard.cpp index a1c0e2fb68..2680f41c2d 100644 --- a/src/libs/utils/wizard.cpp +++ b/src/libs/utils/wizard.cpp @@ -510,9 +510,9 @@ void Wizard::_q_pageAdded(int pageId) nextItem = d->m_wizardProgress->item(nextId); if (prevItem) - prevItem->setNextItems(QList<WizardProgressItem *>() << item); + prevItem->setNextItems({item}); if (nextItem) - item->setNextItems(QList<WizardProgressItem *>() << nextItem); + item->setNextItems({nextItem}); } void Wizard::_q_pageRemoved(int pageId) @@ -626,7 +626,7 @@ QList<WizardProgressItem *> WizardProgressPrivate::singlePathBetween(WizardProgr // When we had X->A in addition and "from" was X and "to" was C, this would not work // (it should return the shortest path which would be X->A->C). if (item->nextItems().contains(toItem)) - return QList<WizardProgressItem *>() << toItem; + return {toItem}; QHash<WizardProgressItem *, QHash<WizardProgressItem *, bool> > visitedItemsToParents; QList<QPair<WizardProgressItem *, WizardProgressItem *> > workingItems; // next to prev item @@ -662,7 +662,7 @@ QList<WizardProgressItem *> WizardProgressPrivate::singlePathBetween(WizardProgr return path; itItem = visitedItemsToParents.constFind(it); } - return QList<WizardProgressItem *>(); + return {}; } void WizardProgressPrivate::updateReachableItems() diff --git a/src/plugins/clangtools/clangtidyclazytool.cpp b/src/plugins/clangtools/clangtidyclazytool.cpp index 3e469534e9..23fd043fc4 100644 --- a/src/plugins/clangtools/clangtidyclazytool.cpp +++ b/src/plugins/clangtools/clangtidyclazytool.cpp @@ -218,7 +218,7 @@ ClangTidyClazyTool::ClangTidyClazyTool() m_diagnosticView->setWindowTitle(tr("Clang-Tidy and Clazy Issues")); foreach (auto * const model, - QList<QAbstractItemModel *>() << m_diagnosticModel << m_diagnosticFilterModel) { + QList<QAbstractItemModel *>({m_diagnosticModel, m_diagnosticFilterModel})) { connect(model, &QAbstractItemModel::rowsInserted, this, &ClangTidyClazyTool::handleStateUpdate); connect(model, &QAbstractItemModel::rowsRemoved, diff --git a/src/plugins/clangtools/clangtoolsdiagnosticview.cpp b/src/plugins/clangtools/clangtoolsdiagnosticview.cpp index 4e27b060cf..a4c2c757ec 100644 --- a/src/plugins/clangtools/clangtoolsdiagnosticview.cpp +++ b/src/plugins/clangtools/clangtoolsdiagnosticview.cpp @@ -132,7 +132,7 @@ void DiagnosticView::suppressCurrentDiagnostic() QList<QAction *> DiagnosticView::customActions() const { - return QList<QAction *>() << m_suppressAction; + return {m_suppressAction}; } bool DiagnosticView::eventFilter(QObject *watched, QEvent *event) diff --git a/src/plugins/coreplugin/documentmanager.cpp b/src/plugins/coreplugin/documentmanager.cpp index a2a90e5833..13b5b42546 100644 --- a/src/plugins/coreplugin/documentmanager.cpp +++ b/src/plugins/coreplugin/documentmanager.cpp @@ -895,7 +895,7 @@ bool DocumentManager::saveModifiedDocumentsSilently(const QList<IDocument *> &do bool DocumentManager::saveModifiedDocumentSilently(IDocument *document, bool *canceled, QList<IDocument *> *failedToClose) { - return saveModifiedDocumentsSilently(QList<IDocument *>() << document, canceled, failedToClose); + return saveModifiedDocumentsSilently({document}, canceled, failedToClose); } /*! @@ -957,7 +957,7 @@ bool DocumentManager::saveModifiedDocument(IDocument *document, const QString &m const QString &alwaysSaveMessage, bool *alwaysSave, QList<IDocument *> *failedToClose) { - return saveModifiedDocuments(QList<IDocument *>() << document, message, canceled, + return saveModifiedDocuments({document}, message, canceled, alwaysSaveMessage, alwaysSave, failedToClose); } diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp index 5c91901eab..a0fd5bdc7e 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.cpp +++ b/src/plugins/coreplugin/editormanager/editormanager.cpp @@ -2189,7 +2189,7 @@ bool EditorManagerPrivate::saveDocumentAs(IDocument *document) // close existing editors for the new file name IDocument *otherDocument = DocumentModel::documentForFilePath(absoluteFilePath); if (otherDocument) - EditorManager::closeDocuments(QList<IDocument *>() << otherDocument, false); + EditorManager::closeDocuments({otherDocument}, false); } emit m_instance->aboutToSave(document); @@ -2569,9 +2569,8 @@ void EditorManager::revertToSaved() void EditorManager::closeEditor(IEditor *editor, bool askAboutModifiedEditors) { - if (!editor) - return; - closeEditors(QList<IEditor *>() << editor, askAboutModifiedEditors); + if (editor) + closeEditors({editor}, askAboutModifiedEditors); } void EditorManager::closeDocument(DocumentModel::Entry *entry) @@ -2581,7 +2580,7 @@ void EditorManager::closeDocument(DocumentModel::Entry *entry) if (entry->isSuspended) DocumentModelPrivate::removeEntry(entry); else - closeDocuments(QList<IDocument *>() << entry->document); + closeDocuments({entry->document}); } bool EditorManager::closeEditors(const QList<IEditor*> &editorsToClose, bool askAboutModifiedEditors) @@ -2856,7 +2855,7 @@ QList<IEditor*> EditorManager::visibleEditors() bool EditorManager::closeDocument(IDocument *document, bool askAboutModifiedEditors) { - return closeDocuments(QList<IDocument *>() << document, askAboutModifiedEditors); + return closeDocuments({document}, askAboutModifiedEditors); } bool EditorManager::closeDocuments(const QList<IDocument *> &documents, bool askAboutModifiedEditors) diff --git a/src/plugins/coreplugin/locator/locatorfiltertest.cpp b/src/plugins/coreplugin/locator/locatorfiltertest.cpp index 8318e008c1..6e24cc91fc 100644 --- a/src/plugins/coreplugin/locator/locatorfiltertest.cpp +++ b/src/plugins/coreplugin/locator/locatorfiltertest.cpp @@ -46,10 +46,9 @@ BasicLocatorFilterTest::~BasicLocatorFilterTest() = default; QList<LocatorFilterEntry> BasicLocatorFilterTest::matchesFor(const QString &searchText) { doBeforeLocatorRun(); - const QList<ILocatorFilter *> filters = QList<ILocatorFilter *>() << m_filter; m_filter->prepareSearch(searchText); - QFuture<LocatorFilterEntry> locatorSearch = Utils::runAsync(&Internal::runSearch, filters, - searchText); + QFuture<LocatorFilterEntry> locatorSearch = Utils::runAsync( + &Internal::runSearch, QList<ILocatorFilter *>({m_filter}), searchText); locatorSearch.waitForFinished(); doAfterLocatorRun(); return locatorSearch.results(); diff --git a/src/plugins/cpptools/cpptoolstestcase.cpp b/src/plugins/cpptools/cpptoolstestcase.cpp index f06dcf79a2..2b6d794955 100644 --- a/src/plugins/cpptools/cpptoolstestcase.cpp +++ b/src/plugins/cpptools/cpptoolstestcase.cpp @@ -195,7 +195,7 @@ void TestCase::closeEditorAtEndOfTestCase(Core::IEditor *editor) bool TestCase::closeEditorWithoutGarbageCollectorInvocation(Core::IEditor *editor) { - return closeEditorsWithoutGarbageCollectorInvocation(QList<Core::IEditor *>() << editor); + return closeEditorsWithoutGarbageCollectorInvocation({editor}); } CPlusPlus::Document::Ptr TestCase::waitForFileInGlobalSnapshot(const QString &filePath, diff --git a/src/plugins/debugger/disassembleragent.cpp b/src/plugins/debugger/disassembleragent.cpp index 1fad2a4b63..8e65cec051 100644 --- a/src/plugins/debugger/disassembleragent.cpp +++ b/src/plugins/debugger/disassembleragent.cpp @@ -148,7 +148,7 @@ DisassemblerAgentPrivate::DisassemblerAgentPrivate(DebuggerEngine *engine) DisassemblerAgentPrivate::~DisassemblerAgentPrivate() { - EditorManager::closeDocuments(QList<IDocument *>() << document); + EditorManager::closeDocuments({document}); document = nullptr; qDeleteAll(breakpointMarks); } diff --git a/src/plugins/designer/formeditorplugin.cpp b/src/plugins/designer/formeditorplugin.cpp index 3972bd8f30..06be563702 100644 --- a/src/plugins/designer/formeditorplugin.cpp +++ b/src/plugins/designer/formeditorplugin.cpp @@ -96,7 +96,7 @@ bool FormEditorPlugin::initialize(const QStringList &arguments, QString *error) wizard->setDescription(tr("Creates a Qt Designer form along with a matching class (C++ header and source file) " "for implementation purposes. You can add the form and class to an existing Qt Widget Project.")); - return QList<IWizardFactory *>() << wizard; + return {wizard}; }); #endif diff --git a/src/plugins/help/helpwidget.cpp b/src/plugins/help/helpwidget.cpp index 6e75a3d1c7..355cb460ab 100644 --- a/src/plugins/help/helpwidget.cpp +++ b/src/plugins/help/helpwidget.cpp @@ -395,13 +395,10 @@ void HelpWidget::addSideBar() shortcutMap.insert(Constants::HELP_OPENPAGES, cmd); } - QList<Core::SideBarItem *> itemList; - itemList << contentItem << indexItem << bookmarkItem << searchItem; + QList<Core::SideBarItem *> itemList = {contentItem, indexItem, bookmarkItem, searchItem}; if (openPagesItem) itemList << openPagesItem; - m_sideBar = new Core::SideBar(itemList, - QList<Core::SideBarItem *>() << contentItem - << (openPagesItem ? openPagesItem : indexItem)); + m_sideBar = new Core::SideBar(itemList, {contentItem, (openPagesItem ? openPagesItem : indexItem)}); m_sideBar->setShortcutMap(shortcutMap); m_sideBar->setCloseWhenEmpty(true); m_sideBarSplitter->insertWidget(0, m_sideBar); diff --git a/src/plugins/help/searchwidget.cpp b/src/plugins/help/searchwidget.cpp index ccf120b59a..fe03f6e0e6 100644 --- a/src/plugins/help/searchwidget.cpp +++ b/src/plugins/help/searchwidget.cpp @@ -281,5 +281,5 @@ QList<QToolButton *> SearchSideBarItem::createToolBarWidgets() reindexButton->setToolTip(tr("Regenerate Index")); connect(reindexButton, &QAbstractButton::clicked, static_cast<SearchWidget *>(widget()), &SearchWidget::reindexDocumentation); - return QList<QToolButton *>() << reindexButton; + return {reindexButton}; } diff --git a/src/plugins/projectexplorer/appoutputpane.cpp b/src/plugins/projectexplorer/appoutputpane.cpp index d5afad9ad3..34f71efc24 100644 --- a/src/plugins/projectexplorer/appoutputpane.cpp +++ b/src/plugins/projectexplorer/appoutputpane.cpp @@ -688,7 +688,7 @@ void AppOutputPane::tabChanged(int i) void AppOutputPane::contextMenuRequested(const QPoint &pos, int index) { - QList<QAction *> actions = QList<QAction *>() << m_closeCurrentTabAction << m_closeAllTabsAction << m_closeOtherTabsAction; + const QList<QAction *> actions = {m_closeCurrentTabAction, m_closeAllTabsAction, m_closeOtherTabsAction}; QAction *action = QMenu::exec(actions, m_tabWidget->mapToGlobal(pos), nullptr, m_tabWidget); const int currentIdx = index != -1 ? index : currentIndex(); if (action == m_closeCurrentTabAction) { diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp index 202e6cb463..b646f599d5 100644 --- a/src/plugins/projectexplorer/buildconfiguration.cpp +++ b/src/plugins/projectexplorer/buildconfiguration.cpp @@ -115,7 +115,7 @@ void BuildConfiguration::initialize(const BuildInfo *info) QList<NamedWidget *> BuildConfiguration::createSubConfigWidgets() { - return QList<NamedWidget *>() << new BuildEnvironmentWidget(this); + return {new BuildEnvironmentWidget(this)}; } QList<Core::Id> BuildConfiguration::knownStepLists() const diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp index 9cf215c7c3..68fe6f1356 100644 --- a/src/plugins/projectexplorer/buildmanager.cpp +++ b/src/plugins/projectexplorer/buildmanager.cpp @@ -553,7 +553,7 @@ bool BuildManager::buildLists(QList<BuildStepList *> bsls, const QStringList &pr void BuildManager::appendStep(BuildStep *step, const QString &name) { - bool success = buildQueueAppend(QList<BuildStep *>() << step, QStringList() << name); + bool success = buildQueueAppend({step}, {name}); if (!success) { d->m_outputWindow->popup(IOutputPane::NoModeSwitch); return; diff --git a/src/plugins/projectexplorer/currentprojectfind.cpp b/src/plugins/projectexplorer/currentprojectfind.cpp index 578e0bdba7..75aaf3e601 100644 --- a/src/plugins/projectexplorer/currentprojectfind.cpp +++ b/src/plugins/projectexplorer/currentprojectfind.cpp @@ -86,7 +86,7 @@ Utils::FileIterator *CurrentProjectFind::files(const QStringList &nameFilters, QString projectFile = additionalParameters.toString(); for (Project *project : SessionManager::projects()) { if (project->document() && projectFile == project->projectFilePath().toString()) - return filesForProjects(nameFilters, exclusionFilters, QList<Project *>() << project); + return filesForProjects(nameFilters, exclusionFilters, {project}); } return new Utils::FileListIterator(QStringList(), QList<QTextCodec *>()); } diff --git a/src/plugins/projectexplorer/projectfilewizardextension.cpp b/src/plugins/projectexplorer/projectfilewizardextension.cpp index 7f0dd8a77f..4b4ecaeb30 100644 --- a/src/plugins/projectexplorer/projectfilewizardextension.cpp +++ b/src/plugins/projectexplorer/projectfilewizardextension.cpp @@ -172,7 +172,7 @@ QList<QWizardPage *> ProjectFileWizardExtension::extensionPages(const IWizardFac // Init context with page and projects m_context->page = new ProjectWizardPage; m_context->wizard = wizard; - return QList<QWizardPage *>() << m_context->page; + return {m_context->page}; } bool ProjectFileWizardExtension::processFiles( diff --git a/src/plugins/scxmleditor/common/search.cpp b/src/plugins/scxmleditor/common/search.cpp index 52178b1e96..54f79ea33f 100644 --- a/src/plugins/scxmleditor/common/search.cpp +++ b/src/plugins/scxmleditor/common/search.cpp @@ -83,7 +83,7 @@ void Search::rowEntered(const QModelIndex &index) if (m_scene) { ScxmlTag *tag = m_model->tag(m_proxyModel->mapToSource(index)); if (tag) - m_scene->highlightItems(QVector<ScxmlTag*>() << tag); + m_scene->highlightItems({tag}); else m_scene->unhighlightAll(); } diff --git a/src/plugins/scxmleditor/common/structure.cpp b/src/plugins/scxmleditor/common/structure.cpp index 658032ae7a..ea5fe972e9 100644 --- a/src/plugins/scxmleditor/common/structure.cpp +++ b/src/plugins/scxmleditor/common/structure.cpp @@ -202,7 +202,7 @@ void Structure::rowEntered(const QModelIndex &index) QModelIndex ind = m_proxyModel->mapToSource(index); auto tag = static_cast<ScxmlTag*>(ind.internalPointer()); if (tag) - m_scene->highlightItems(QVector<ScxmlTag*>() << tag); + m_scene->highlightItems({tag}); else m_scene->unhighlightAll(); } diff --git a/src/plugins/scxmleditor/plugin_interface/graphicsscene.cpp b/src/plugins/scxmleditor/plugin_interface/graphicsscene.cpp index c7f7ad6864..3773635f44 100644 --- a/src/plugins/scxmleditor/plugin_interface/graphicsscene.cpp +++ b/src/plugins/scxmleditor/plugin_interface/graphicsscene.cpp @@ -870,7 +870,7 @@ void GraphicsScene::highlightWarningItem(const ScxmlEditor::OutputPane::Warning ScxmlTag *tag = tagByWarning(w); if (tag) - highlightItems(QVector<ScxmlTag*>() << tag); + highlightItems({tag}); else unhighlightAll(); } diff --git a/src/plugins/texteditor/findincurrentfile.cpp b/src/plugins/texteditor/findincurrentfile.cpp index b9b629fc4f..13cb63fa96 100644 --- a/src/plugins/texteditor/findincurrentfile.cpp +++ b/src/plugins/texteditor/findincurrentfile.cpp @@ -66,7 +66,7 @@ Utils::FileIterator *FindInCurrentFile::files(const QStringList &nameFilters, QTextCodec *codec = openEditorEncodings.value(fileName); if (!codec) codec = Core::EditorManager::defaultTextCodec(); - return new Utils::FileListIterator(QStringList(fileName), QList<QTextCodec *>() << codec); + return new Utils::FileListIterator({fileName}, {codec}); } QVariant FindInCurrentFile::additionalParameters() const diff --git a/src/plugins/texteditor/findinfiles.cpp b/src/plugins/texteditor/findinfiles.cpp index 19c226e326..9c61d76922 100644 --- a/src/plugins/texteditor/findinfiles.cpp +++ b/src/plugins/texteditor/findinfiles.cpp @@ -79,7 +79,7 @@ FileIterator *FindInFiles::files(const QStringList &nameFilters, const QStringList &exclusionFilters, const QVariant &additionalParameters) const { - return new SubDirFileIterator(QStringList() << additionalParameters.toString(), + return new SubDirFileIterator({additionalParameters.toString()}, nameFilters, exclusionFilters, EditorManager::defaultTextCodec()); |