diff options
author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2023-08-01 21:19:48 +0200 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2023-08-02 05:38:14 +0000 |
commit | eb2b4b6cf3e6f202846ac56377765eaa66932148 (patch) | |
tree | dc413d51c9857598fff9409547652a1c7514f9a8 /src | |
parent | 404bf9547f9981f90bd86f48fe7e16c63ed57bdb (diff) |
Various Plugins: Simplify return QList statements
Change-Id: I36633128e061d0544e4752a65804b460371283f7
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src')
29 files changed, 49 insertions, 51 deletions
diff --git a/src/libs/advanceddockingsystem/dockmanager.cpp b/src/libs/advanceddockingsystem/dockmanager.cpp index 482fd98a7b..73b475ee5a 100644 --- a/src/libs/advanceddockingsystem/dockmanager.cpp +++ b/src/libs/advanceddockingsystem/dockmanager.cpp @@ -737,7 +737,7 @@ QList<int> DockManager::splitterSizes(DockAreaWidget *containedArea) const return splitter->sizes(); } - return QList<int>(); + return {}; } void DockManager::setSplitterSizes(DockAreaWidget *containedArea, const QList<int> &sizes) diff --git a/src/libs/aggregation/aggregate.h b/src/libs/aggregation/aggregate.h index 4934191d44..0e210451e7 100644 --- a/src/libs/aggregation/aggregate.h +++ b/src/libs/aggregation/aggregate.h @@ -83,14 +83,14 @@ template <typename T> T *query(QObject *obj) template <typename T> QList<T *> query_all(Aggregate *obj) { if (!obj) - return QList<T *>(); + return {}; return obj->template components<T>(); } template <typename T> QList<T *> query_all(QObject *obj) { if (!obj) - return QList<T *>(); + return {}; QReadLocker locker(&Aggregate::lock()); Aggregate *parentAggregation = Aggregate::parentAggregate(obj); QList<T *> results; diff --git a/src/libs/cplusplus/ResolveExpression.cpp b/src/libs/cplusplus/ResolveExpression.cpp index 1ac35319bd..a120d5b736 100644 --- a/src/libs/cplusplus/ResolveExpression.cpp +++ b/src/libs/cplusplus/ResolveExpression.cpp @@ -231,7 +231,7 @@ QList<LookupItem> ResolveExpression::reference(ExpressionAST *ast, Scope *scope) QList<LookupItem> ResolveExpression::resolve(ExpressionAST *ast, Scope *scope, bool ref) { if (! scope) - return QList<LookupItem>(); + return {}; std::swap(_scope, scope); std::swap(_reference, ref); diff --git a/src/libs/glsl/glslsymbol.cpp b/src/libs/glsl/glslsymbol.cpp index 9b2630872c..fb1324aacf 100644 --- a/src/libs/glsl/glslsymbol.cpp +++ b/src/libs/glsl/glslsymbol.cpp @@ -52,5 +52,5 @@ Symbol *Scope::lookup(const QString &name) const QList<Symbol *> Scope::members() const { - return QList<Symbol *>(); + return {}; } diff --git a/src/libs/modelinglib/qmt/model_controller/modelcontroller.cpp b/src/libs/modelinglib/qmt/model_controller/modelcontroller.cpp index 3e38aabdf3..b363decd68 100644 --- a/src/libs/modelinglib/qmt/model_controller/modelcontroller.cpp +++ b/src/libs/modelinglib/qmt/model_controller/modelcontroller.cpp @@ -878,7 +878,7 @@ void ModelController::moveRelation(MObject *newOwner, MRelation *relation) QList<MRelation *> ModelController::findRelationsOfObject(const MObject *object) const { - QMT_ASSERT(object, return QList<MRelation *>()); + QMT_ASSERT(object, return {}); return m_objectRelationsMap.values(object->uid()); } diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/classmembersedit.cpp b/src/libs/modelinglib/qmt/model_widgets_ui/classmembersedit.cpp index d9146c038f..3f14eb93e5 100644 --- a/src/libs/modelinglib/qmt/model_widgets_ui/classmembersedit.cpp +++ b/src/libs/modelinglib/qmt/model_widgets_ui/classmembersedit.cpp @@ -429,7 +429,7 @@ QString ClassMembersEdit::build(const QList<MClassMember> &members) QList<MClassMember> ClassMembersEdit::parse(const QString &text, bool *ok) { - QMT_ASSERT(ok, return QList<MClassMember>()); + QMT_ASSERT(ok, {}); *ok = true; QList<MClassMember> members; diff --git a/src/libs/qmljs/jsoncheck.cpp b/src/libs/qmljs/jsoncheck.cpp index b7ce1443fb..366c150c95 100644 --- a/src/libs/qmljs/jsoncheck.cpp +++ b/src/libs/qmljs/jsoncheck.cpp @@ -29,7 +29,7 @@ JsonCheck::~JsonCheck() QList<Message> JsonCheck::operator ()(JsonSchema *schema) { - QTC_ASSERT(schema, return QList<Message>()); + QTC_ASSERT(schema, return {}); m_schema = schema; diff --git a/src/libs/qmljs/qmljsdialect.cpp b/src/libs/qmljs/qmljsdialect.cpp index 58b9771bcd..387c06a3ab 100644 --- a/src/libs/qmljs/qmljsdialect.cpp +++ b/src/libs/qmljs/qmljsdialect.cpp @@ -192,7 +192,7 @@ QList<Dialect> Dialect::companionLanguages() const << Dialect::QmlQtQuick2Ui << Dialect::Qml; break; case Dialect::NoLanguage: - return QList<Dialect>(); // return at least itself? + return {}; // return at least itself? } if (*this != Dialect::AnyLanguage) langs << Dialect::AnyLanguage; diff --git a/src/libs/utils/differ.cpp b/src/libs/utils/differ.cpp index 2d27de3f80..bc7dda6f30 100644 --- a/src/libs/utils/differ.cpp +++ b/src/libs/utils/differ.cpp @@ -578,7 +578,7 @@ static QList<Diff> decodeExpandedWhitespace(const QList<Diff> &input, const int replacementSize = it.value().first; const int reversePosition = diffCount + counter - it.key(); if (reversePosition < replacementSize) - return QList<Diff>(); // replacement exceeds one Diff + return {}; // replacement exceeds one Diff const QString replacement = it.value().second; const int updatedDiffCount = diff.text.size(); diff.text.replace(updatedDiffCount - reversePosition, @@ -977,7 +977,7 @@ Differ::DiffMode Differ::diffMode() const QList<Diff> Differ::preprocess1AndDiff(const QString &text1, const QString &text2) { if (text1.isNull() && text2.isNull()) - return QList<Diff>(); + return {}; if (text1 == text2) { QList<Diff> diffList; @@ -1074,7 +1074,7 @@ QList<Diff> Differ::diffMyers(const QString &text1, const QString &text2) if (m_future && m_future->isCanceled()) { delete [] forwardV; delete [] reverseV; - return QList<Diff>(); + return {}; } // going forward for (int k = qMax(-d, kMinForward + qAbs(d + kMinForward) % 2); diff --git a/src/libs/utils/wizard.cpp b/src/libs/utils/wizard.cpp index ce37d80705..d80ef32c52 100644 --- a/src/libs/utils/wizard.cpp +++ b/src/libs/utils/wizard.cpp @@ -630,7 +630,7 @@ QList<WizardProgressItem *> WizardProgressPrivate::singlePathBetween(WizardProgr if (!item) item = m_startItem; if (!item) - return QList<WizardProgressItem *>(); + return {}; // Optimization. It is workaround for case A->B, B->C, A->C where "from" is A and "to" is C. // When we had X->A in addition and "from" was X and "to" was C, this would not work @@ -666,7 +666,7 @@ QList<WizardProgressItem *> WizardProgressPrivate::singlePathBetween(WizardProgr while (itItem != itEnd) { path.prepend(itItem.key()); if (itItem.value().count() != 1) - return QList<WizardProgressItem *>(); + return {}; it = itItem.value().constBegin().key(); if (it == item) return path; diff --git a/src/plugins/autotest/testtreeitem.cpp b/src/plugins/autotest/testtreeitem.cpp index 69481b60ca..adfacf7731 100644 --- a/src/plugins/autotest/testtreeitem.cpp +++ b/src/plugins/autotest/testtreeitem.cpp @@ -331,7 +331,7 @@ ITestConfiguration *TestTreeItem::asConfiguration(TestRunMode mode) const QList<ITestConfiguration *> TestTreeItem::getTestConfigurationsForFile(const FilePath &) const { - return QList<ITestConfiguration *>(); + return {}; } bool TestTreeItem::isGroupNodeFor(const TestTreeItem *other) const diff --git a/src/plugins/coreplugin/editormanager/documentmodel.cpp b/src/plugins/coreplugin/editormanager/documentmodel.cpp index 090c7601e1..e8183401bf 100644 --- a/src/plugins/coreplugin/editormanager/documentmodel.cpp +++ b/src/plugins/coreplugin/editormanager/documentmodel.cpp @@ -590,7 +590,7 @@ QList<IEditor *> DocumentModel::editorsForFilePath(const Utils::FilePath &filePa IDocument *document = documentForFilePath(filePath); if (document) return editorsForDocument(document); - return QList<IEditor *>(); + return {}; } DocumentModel::Entry *DocumentModel::entryAtRow(int row) diff --git a/src/plugins/coreplugin/sidebar.cpp b/src/plugins/coreplugin/sidebar.cpp index c7a9b92264..e1cf32777b 100644 --- a/src/plugins/coreplugin/sidebar.cpp +++ b/src/plugins/coreplugin/sidebar.cpp @@ -42,7 +42,7 @@ QString SideBarItem::title() const QList<QToolButton *> SideBarItem::createToolBarWidgets() { - return QList<QToolButton *>(); + return {}; } struct SideBarPrivate { diff --git a/src/plugins/cppeditor/cppoutline.cpp b/src/plugins/cppeditor/cppoutline.cpp index 0d8883f631..bbb641dc95 100644 --- a/src/plugins/cppeditor/cppoutline.cpp +++ b/src/plugins/cppeditor/cppoutline.cpp @@ -112,7 +112,7 @@ CppOutlineWidget::CppOutlineWidget(CppEditorWidget *editor) : QList<QAction*> CppOutlineWidget::filterMenuActions() const { - return QList<QAction*>(); + return {}; } void CppOutlineWidget::setCursorSynchronization(bool syncWithCursor) diff --git a/src/plugins/cppeditor/cppquickfix_test.cpp b/src/plugins/cppeditor/cppquickfix_test.cpp index 18da315a76..3f292769f1 100644 --- a/src/plugins/cppeditor/cppquickfix_test.cpp +++ b/src/plugins/cppeditor/cppquickfix_test.cpp @@ -57,8 +57,7 @@ public: QList<TestDocumentPtr> singleDocument(const QByteArray &original, const QByteArray &expected) { - return QList<TestDocumentPtr>() - << CppTestDocument::create("file.cpp", original, expected); + return {CppTestDocument::create("file.cpp", original, expected)}; } BaseQuickFixTestCase::BaseQuickFixTestCase(const QList<TestDocumentPtr> &testDocuments, diff --git a/src/plugins/cppeditor/cpptoolstestcase.cpp b/src/plugins/cppeditor/cpptoolstestcase.cpp index 63949229ab..420e551847 100644 --- a/src/plugins/cppeditor/cpptoolstestcase.cpp +++ b/src/plugins/cppeditor/cpptoolstestcase.cpp @@ -332,7 +332,7 @@ QList<CPlusPlus::Document::Ptr> TestCase::waitForFilesInGlobalSnapshot(const Fil break; } if (t.elapsed() > timeOutInMs) - return QList<CPlusPlus::Document::Ptr>(); + return {}; QCoreApplication::processEvents(); } } diff --git a/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp b/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp index 0432985eaf..8ee45c8e79 100644 --- a/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp +++ b/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp @@ -174,7 +174,7 @@ private: QList<TestDocumentPtr> singleDocument(const QByteArray &source) { - return QList<TestDocumentPtr>() << CppTestDocument::create(source, "file.cpp"); + return {CppTestDocument::create(source, "file.cpp")}; } /** diff --git a/src/plugins/debugger/analyzer/detailederrorview.cpp b/src/plugins/debugger/analyzer/detailederrorview.cpp index 6817ef75f3..06941ac114 100644 --- a/src/plugins/debugger/analyzer/detailederrorview.cpp +++ b/src/plugins/debugger/analyzer/detailederrorview.cpp @@ -134,7 +134,7 @@ QList<QAction *> DetailedErrorView::commonActions() const QList<QAction *> DetailedErrorView::customActions() const { - return QList<QAction *>(); + return {}; } int DetailedErrorView::currentRow() const diff --git a/src/plugins/projectexplorer/appoutputpane.cpp b/src/plugins/projectexplorer/appoutputpane.cpp index 2255d96b5e..849c34e35c 100644 --- a/src/plugins/projectexplorer/appoutputpane.cpp +++ b/src/plugins/projectexplorer/appoutputpane.cpp @@ -299,7 +299,7 @@ QWidget *AppOutputPane::outputWidget(QWidget *) return m_tabWidget; } -QList<QWidget*> AppOutputPane::toolBarWidgets() const +QList<QWidget *> AppOutputPane::toolBarWidgets() const { return QList<QWidget *>{m_reRunButton, m_stopButton, m_attachButton, m_settingsButton, m_formatterWidget} + IOutputPane::toolBarWidgets(); diff --git a/src/plugins/projectexplorer/kitinformation.cpp b/src/plugins/projectexplorer/kitinformation.cpp index ea900407bf..2b881a4716 100644 --- a/src/plugins/projectexplorer/kitinformation.cpp +++ b/src/plugins/projectexplorer/kitinformation.cpp @@ -607,7 +607,7 @@ ToolChain *ToolChainKitAspect::cxxToolChain(const Kit *k) QList<ToolChain *> ToolChainKitAspect::toolChains(const Kit *k) { - QTC_ASSERT(k, return QList<ToolChain *>()); + QTC_ASSERT(k, return {}); const QVariantMap value = k->value(ToolChainKitAspect::id()).toMap(); const QList<ToolChain *> tcList diff --git a/src/plugins/qmakeprojectmanager/customwidgetwizard/plugingenerator.cpp b/src/plugins/qmakeprojectmanager/customwidgetwizard/plugingenerator.cpp index 565766dff4..0a36120a64 100644 --- a/src/plugins/qmakeprojectmanager/customwidgetwizard/plugingenerator.cpp +++ b/src/plugins/qmakeprojectmanager/customwidgetwizard/plugingenerator.cpp @@ -55,8 +55,8 @@ static QString qt5PluginMetaData(const QString &interfaceName) + interfaceName + QLatin1String("\")"); } -QList<Core::GeneratedFile> PluginGenerator::generatePlugin(const GenerationParameters& p, const PluginOptions &options, - QString *errorMessage) +QList<Core::GeneratedFile> PluginGenerator::generatePlugin( + const GenerationParameters& p, const PluginOptions &options, QString *errorMessage) { const QChar slash = QLatin1Char('/'); const QChar blank = QLatin1Char(' '); @@ -93,7 +93,7 @@ QList<Core::GeneratedFile> PluginGenerator::generatePlugin(const GenerationPara qt5PluginMetaData(QLatin1String("QDesignerCustomWidgetInterface")) : QString()); const QString pluginHeaderContents = processTemplate(p.templatePath + QLatin1String("/tpl_single.h"), sm, errorMessage); if (pluginHeaderContents.isEmpty()) - return QList<Core::GeneratedFile>(); + return {}; Core::GeneratedFile pluginHeader(baseDir / wo.pluginHeaderFile); pluginHeader.setContents(CppEditor::AbstractEditorSupport::licenseTemplate( project, FilePath::fromString(wo.pluginHeaderFile), @@ -121,7 +121,7 @@ QList<Core::GeneratedFile> PluginGenerator::generatePlugin(const GenerationPara const QString pluginSourceContents = processTemplate(p.templatePath + QLatin1String("/tpl_single.cpp"), sm, errorMessage); if (pluginSourceContents.isEmpty()) - return QList<Core::GeneratedFile>(); + return {}; Core::GeneratedFile pluginSource(baseDir / wo.pluginSourceFile); pluginSource.setContents(CppEditor::AbstractEditorSupport::licenseTemplate( project, @@ -157,7 +157,7 @@ QList<Core::GeneratedFile> PluginGenerator::generatePlugin(const GenerationPara if (pc.library != wo.widgetLibrary) { *errorMessage = Tr::tr("Creating multiple widget libraries (%1, %2) in one project (%3) is not supported.") .arg(pc.library, wo.widgetLibrary, wo.widgetProjectFile); - return QList<Core::GeneratedFile>(); + return {}; } } pc.headers += blank + wo.widgetHeaderFile; @@ -169,7 +169,7 @@ QList<Core::GeneratedFile> PluginGenerator::generatePlugin(const GenerationPara sm.insert(QLatin1String("WIDGET_CLASS"), wo.widgetClassName); const QString widgetHeaderContents = processTemplate(p.templatePath + QLatin1String("/tpl_widget.h"), sm, errorMessage); if (widgetHeaderContents.isEmpty()) - return QList<Core::GeneratedFile>(); + return {}; Core::GeneratedFile widgetHeader(baseDir / wo.widgetHeaderFile); widgetHeader.setContents(CppEditor::AbstractEditorSupport::licenseTemplate( project, @@ -182,7 +182,7 @@ QList<Core::GeneratedFile> PluginGenerator::generatePlugin(const GenerationPara sm.insert(QLatin1String("WIDGET_HEADER"), wo.widgetHeaderFile); const QString widgetSourceContents = processTemplate(p.templatePath + QLatin1String("/tpl_widget.cpp"), sm, errorMessage); if (widgetSourceContents.isEmpty()) - return QList<Core::GeneratedFile>(); + return {}; Core::GeneratedFile widgetSource(baseDir / wo.widgetSourceFile); widgetSource.setContents(CppEditor::AbstractEditorSupport::licenseTemplate( project, @@ -206,7 +206,7 @@ QList<Core::GeneratedFile> PluginGenerator::generatePlugin(const GenerationPara sm.insert(QLatin1String("WIDGET_LIBRARY"), pc.library); const QString widgetPriContents = processTemplate(pc.tmpl, sm, errorMessage); if (widgetPriContents.isEmpty()) - return QList<Core::GeneratedFile>(); + return {}; Core::GeneratedFile widgetPri(baseDir / it.key()); widgetPri.setContents(widgetPriContents); rc.push_back(widgetPri); @@ -220,7 +220,7 @@ QList<Core::GeneratedFile> PluginGenerator::generatePlugin(const GenerationPara sm.insert(QLatin1String("COLLECTION_PLUGIN_METADATA"), qt5PluginMetaData(QLatin1String("QDesignerCustomWidgetCollectionInterface"))); const QString collectionHeaderContents = processTemplate(p.templatePath + QLatin1String("/tpl_collection.h"), sm, errorMessage); if (collectionHeaderContents.isEmpty()) - return QList<Core::GeneratedFile>(); + return {}; Core::GeneratedFile collectionHeader(baseDir / options.collectionHeaderFile); collectionHeader.setContents(CppEditor::AbstractEditorSupport::licenseTemplate( project, @@ -238,7 +238,7 @@ QList<Core::GeneratedFile> PluginGenerator::generatePlugin(const GenerationPara sm.insert(QLatin1String("PLUGIN_ADDITIONS"), pluginAdditions); const QString collectionSourceFileContents = processTemplate(p.templatePath + QLatin1String("/tpl_collection.cpp"), sm, errorMessage); if (collectionSourceFileContents.isEmpty()) - return QList<Core::GeneratedFile>(); + return {}; Core::GeneratedFile collectionSource(baseDir / options.collectionSourceFile); collectionSource.setContents(CppEditor::AbstractEditorSupport::licenseTemplate( project, @@ -263,7 +263,7 @@ QList<Core::GeneratedFile> PluginGenerator::generatePlugin(const GenerationPara newIcon, errorMessage); if (iconFile.filePath().isEmpty()) - return QList<Core::GeneratedFile>(); + return {}; rc.push_back(iconFile); icon = qfi.fileName(); } @@ -274,7 +274,7 @@ QList<Core::GeneratedFile> PluginGenerator::generatePlugin(const GenerationPara sm.insert(QLatin1String("ICON_FILES"), iconFiles); const QString resourceFileContents = processTemplate(p.templatePath + QLatin1String("/tpl_resources.qrc"), sm, errorMessage); if (resourceFileContents.isEmpty()) - return QList<Core::GeneratedFile>(); + return {}; Core::GeneratedFile resourceFile(baseDir / options.resourceFile); resourceFile.setContents(resourceFileContents); rc.push_back(resourceFile); @@ -289,7 +289,7 @@ QList<Core::GeneratedFile> PluginGenerator::generatePlugin(const GenerationPara sm.insert(QLatin1String("INCLUSIONS"), QStringList(Utils::toList(widgetProjects)).join(QLatin1Char('\n'))); const QString proFileContents = processTemplate(p.templatePath + QLatin1String("/tpl_plugin.pro"), sm, errorMessage); if (proFileContents.isEmpty()) - return QList<Core::GeneratedFile>(); + return {}; Core::GeneratedFile proFile(baseDir.pathAppended(p.fileName + ".pro")); proFile.setContents(proFileContents); proFile.setAttributes(Core::GeneratedFile::OpenProjectAttribute); diff --git a/src/plugins/qmldesigner/components/formeditor/movetool.cpp b/src/plugins/qmldesigner/components/formeditor/movetool.cpp index 76b8f9a5f6..0d486b0f4f 100644 --- a/src/plugins/qmldesigner/components/formeditor/movetool.cpp +++ b/src/plugins/qmldesigner/components/formeditor/movetool.cpp @@ -355,10 +355,9 @@ QList<FormEditorItem*> MoveTool::movingItems(const QList<FormEditorItem*> &selec if (ancestorItem != nullptr && ancestorItem->qmlItemNode().isRootNode()) { // view()->changeToSelectionTool(); - return QList<FormEditorItem*>(); + return {}; } - if (ancestorItem != nullptr && ancestorItem->parentItem() != nullptr) { QList<FormEditorItem*> ancestorItemList; ancestorItemList.append(ancestorItem); @@ -367,7 +366,7 @@ QList<FormEditorItem*> MoveTool::movingItems(const QList<FormEditorItem*> &selec if (!haveSameParent(filteredItemList)) { // view()->changeToSelectionTool(); - return QList<FormEditorItem*>(); + return {}; } return filteredItemList; diff --git a/src/plugins/qmldesigner/components/timelineeditor/preseteditor.cpp b/src/plugins/qmldesigner/components/timelineeditor/preseteditor.cpp index 0dd61b61eb..0f12c6ce2d 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/preseteditor.cpp +++ b/src/plugins/qmldesigner/components/timelineeditor/preseteditor.cpp @@ -434,7 +434,7 @@ QList<NamedEasingCurve> PresetList::storedCurves() const QVariant presetSettings = settings.value(Internal::settingsKey); if (!presetSettings.isValid()) - return QList<NamedEasingCurve>(); + return {}; QList<QVariant> presets = presetSettings.toList(); diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelineview.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelineview.cpp index b68dc98eaf..9cc45d1f33 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/timelineview.cpp +++ b/src/plugins/qmldesigner/components/timelineeditor/timelineview.cpp @@ -482,7 +482,7 @@ QList<QmlTimeline> TimelineView::getTimelines() const QList<ModelNode> TimelineView::getAnimations(const QmlTimeline &timeline) { if (!timeline.isValid()) - return QList<ModelNode>(); + return {}; if (isAttached()) { return Utils::filtered(timeline.modelNode().directSubModelNodes(), diff --git a/src/plugins/qmldesigner/designercore/model/nodelistproperty.cpp b/src/plugins/qmldesigner/designercore/model/nodelistproperty.cpp index 0822786467..4f8e84e8a4 100644 --- a/src/plugins/qmldesigner/designercore/model/nodelistproperty.cpp +++ b/src/plugins/qmldesigner/designercore/model/nodelistproperty.cpp @@ -68,13 +68,13 @@ QList<ModelNode> NodeListProperty::toModelNodeList() const if (internalNodeListProperty()) return internalNodesToModelNodes(m_internalNodeListProperty->nodeList(), model(), view()); - return QList<ModelNode>(); + return {}; } QList<QmlObjectNode> NodeListProperty::toQmlObjectNodeList() const { if (model()->nodeInstanceView()) - return QList<QmlObjectNode>(); + return {}; QList<QmlObjectNode> qmlObjectNodeList; diff --git a/src/plugins/squish/squishoutputpane.cpp b/src/plugins/squish/squishoutputpane.cpp index 8c8047f47f..da0c8792c4 100644 --- a/src/plugins/squish/squishoutputpane.cpp +++ b/src/plugins/squish/squishoutputpane.cpp @@ -115,7 +115,7 @@ QWidget *SquishOutputPane::outputWidget(QWidget *parent) QList<QWidget *> SquishOutputPane::toolBarWidgets() const { - return QList<QWidget *>() << m_filterButton << m_expandAll << m_collapseAll; + return {m_filterButton, m_expandAll, m_collapseAll}; } QString SquishOutputPane::displayName() const diff --git a/src/plugins/todo/lineparser.cpp b/src/plugins/todo/lineparser.cpp index 2dace7a4df..334bccfae0 100644 --- a/src/plugins/todo/lineparser.cpp +++ b/src/plugins/todo/lineparser.cpp @@ -79,7 +79,7 @@ QList<LineParser::KeywordEntry> LineParser::keywordEntriesFromCandidates( { // Ensure something is found if (candidates.isEmpty()) - return QList<KeywordEntry>(); + return {}; // Convert candidates to entries std::vector<KeywordEntry> tmp; diff --git a/src/tools/qml2puppet/qml2puppet/instances/objectnodeinstance.cpp b/src/tools/qml2puppet/qml2puppet/instances/objectnodeinstance.cpp index 373bd6dbef..74a45b92b6 100644 --- a/src/tools/qml2puppet/qml2puppet/instances/objectnodeinstance.cpp +++ b/src/tools/qml2puppet/qml2puppet/instances/objectnodeinstance.cpp @@ -708,12 +708,12 @@ QString ObjectNodeInstance::instanceType(const PropertyName &name) const QList<ServerNodeInstance> ObjectNodeInstance::childItems() const { - return QList<ServerNodeInstance>(); + return {}; } QList<QQuickItem *> ObjectNodeInstance::allItemsRecursive() const { - return QList<QQuickItem *>(); + return {}; } QList<ServerNodeInstance> ObjectNodeInstance::stateInstances() const @@ -728,7 +728,7 @@ QList<ServerNodeInstance> ObjectNodeInstance::stateInstances() const return instanceList; } - return QList<ServerNodeInstance>(); + return {}; } void ObjectNodeInstance::setNodeSource(const QString & /*source*/) diff --git a/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceserver.cpp b/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceserver.cpp index e520079a5d..813e40f4a3 100644 --- a/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceserver.cpp +++ b/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceserver.cpp @@ -202,7 +202,7 @@ const QList<QQuickItem*> Qt5NodeInstanceServer::allItems() const if (rootNodeInstance().isValid()) return rootNodeInstance().allItemsRecursive(); - return QList<QQuickItem*>(); + return {}; } bool Qt5NodeInstanceServer::rootIsRenderable3DObject() const |