From 925bb2ca312f3489a8d9ed48c35bb4f80e9815fa Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Tue, 1 Aug 2023 21:26:29 +0200 Subject: [PATCH] Various Plugins: Simplify return QStringList statements Change-Id: Id014225851e6b9f8436387c681bea42e5de3b797 Reviewed-by: Reviewed-by: Orgad Shaneh Reviewed-by: Qt CI Bot --- src/libs/utils/commandline.cpp | 8 ++++---- src/libs/utils/filesystemmodel.cpp | 2 +- src/libs/utils/pathlisteditor.cpp | 2 +- src/plugins/autotest/boost/boosttestconfiguration.cpp | 2 +- src/plugins/autotoolsprojectmanager/makefileparser.cpp | 6 +++--- src/plugins/beautifier/beautifiertool.cpp | 2 +- src/plugins/clangtools/clangtoolsutils.cpp | 2 +- src/plugins/cppeditor/cppeditorplugin.cpp | 4 ++-- src/plugins/cvs/cvseditor.cpp | 2 +- src/plugins/genericprojectmanager/genericproject.cpp | 2 +- src/plugins/git/branchmodel.cpp | 3 +-- src/plugins/git/giteditor.cpp | 2 +- src/plugins/perforce/perforceeditor.cpp | 2 +- .../components/connectioneditor/bindingmodel.cpp | 6 +++--- .../connectioneditor/dynamicpropertiesmodel.cpp | 4 ++-- .../propertyeditor/propertyeditorcontextobject.cpp | 2 +- .../components/stateseditor/stateseditormodel.cpp | 2 +- .../components/stateseditor/stateseditorview.cpp | 2 +- .../designercore/include/plaintexteditmodifier.h | 2 +- .../qmldesigner/designercore/metainfo/nodemetainfo.cpp | 4 ++-- .../designercore/metainfo/subcomponentmanager.cpp | 2 +- .../designercore/model/basetexteditmodifier.cpp | 2 +- .../designercore/pluginmanager/widgetpluginpath.cpp | 2 +- src/plugins/qmldesigner/documentmanager.cpp | 6 +++--- src/plugins/qtsupport/baseqtversion.cpp | 4 ++-- src/plugins/squish/propertytreeitem.cpp | 2 +- src/plugins/subversion/subversioneditor.cpp | 2 +- src/plugins/vcsbase/vcsbaseclient.cpp | 2 +- src/plugins/vcsbase/vcsbaseeditor.cpp | 2 +- src/plugins/vcsbase/vcsbasesubmiteditor.cpp | 2 +- tests/auto/qml/codemodel/ecmascript7/tst_ecmascript7.cpp | 2 +- 31 files changed, 44 insertions(+), 45 deletions(-) diff --git a/src/libs/utils/commandline.cpp b/src/libs/utils/commandline.cpp index 60b8d72eed2..8e6bc60277e 100644 --- a/src/libs/utils/commandline.cpp +++ b/src/libs/utils/commandline.cpp @@ -182,7 +182,7 @@ static QStringList doSplitArgsWin(const QString &args, ProcessArgs::SplitError * if (inquote) { if (err) *err = ProcessArgs::BadQuoting; - return QStringList(); + return {}; } break; } @@ -265,7 +265,7 @@ static QStringList splitArgsWin(const QString &_args, bool abortOnMeta, err = &perr; QString args = prepareArgsWin(_args, &perr, env, pwd).toWindowsArgs(); if (*err != ProcessArgs::SplitOk) - return QStringList(); + return {}; return doSplitArgsWin(args, err); } else { QString args = _args; @@ -470,12 +470,12 @@ static QStringList splitArgsUnix(const QString &args, bool abortOnMeta, quoteerr: if (err) *err = ProcessArgs::BadQuoting; - return QStringList(); + return {}; metaerr: if (err) *err = ProcessArgs::FoundMeta; - return QStringList(); + return {}; } inline static bool isSpecialCharUnix(ushort c) diff --git a/src/libs/utils/filesystemmodel.cpp b/src/libs/utils/filesystemmodel.cpp index 9a10f3b91fc..a6bce17cabc 100644 --- a/src/libs/utils/filesystemmodel.cpp +++ b/src/libs/utils/filesystemmodel.cpp @@ -2520,7 +2520,7 @@ QStringList FileSystemModelPrivate::unwatchPathsAt(const QModelIndex &index) QTC_CHECK(useFileSystemWatcher()); const FileSystemNode *indexNode = node(index); if (indexNode == nullptr) - return QStringList(); + return {}; const Qt::CaseSensitivity caseSensitivity = indexNode->caseSensitive() ? Qt::CaseSensitive : Qt::CaseInsensitive; const QString path = indexNode->fileInfo().absoluteFilePath(); diff --git a/src/libs/utils/pathlisteditor.cpp b/src/libs/utils/pathlisteditor.cpp index f2349b275fd..383ca88b030 100644 --- a/src/libs/utils/pathlisteditor.cpp +++ b/src/libs/utils/pathlisteditor.cpp @@ -138,7 +138,7 @@ QStringList PathListEditor::pathList() const { const QString text = d->edit->toPlainText().trimmed(); if (text.isEmpty()) - return QStringList(); + return {}; // trim each line QStringList rc = text.split('\n', Qt::SkipEmptyParts); const QStringList::iterator end = rc.end(); diff --git a/src/plugins/autotest/boost/boosttestconfiguration.cpp b/src/plugins/autotest/boost/boosttestconfiguration.cpp index 15cc0d8bbfe..af3f1e9eb18 100644 --- a/src/plugins/autotest/boost/boosttestconfiguration.cpp +++ b/src/plugins/autotest/boost/boosttestconfiguration.cpp @@ -46,7 +46,7 @@ static QStringList interfering(InterferingType type) return QString("BOOST_TEST_" + item).toUpper(); }); } - return QStringList(); + return {}; } static QStringList filterInterfering(const QStringList &provided, QStringList *omitted) diff --git a/src/plugins/autotoolsprojectmanager/makefileparser.cpp b/src/plugins/autotoolsprojectmanager/makefileparser.cpp index e1cac6b1866..8a2f684f877 100644 --- a/src/plugins/autotoolsprojectmanager/makefileparser.cpp +++ b/src/plugins/autotoolsprojectmanager/makefileparser.cpp @@ -300,7 +300,7 @@ QStringList MakefileParser::directorySources(const QString &directory, { if (isCanceled()) { m_success = false; - return QStringList(); + return {}; } emit status(Tr::tr("Parsing directory %1").arg(directory)); @@ -343,7 +343,7 @@ QStringList MakefileParser::targetValues(bool *hasVariables) const int index = m_line.indexOf(QLatin1Char('=')); if (index < 0) { m_success = false; - return QStringList(); + return {}; } m_line.remove(0, index + 1); // remove the 'target = ' prefix @@ -423,7 +423,7 @@ QStringList MakefileParser::parseTermsAfterAssign(const QString &line) { int assignPos = line.indexOf(QLatin1Char('=')) + 1; if (assignPos <= 0 || assignPos >= line.size()) - return QStringList(); + return {}; const QStringList parts = ProcessArgs::splitArgs(line.mid(assignPos), HostOsInfo::hostOs()); QStringList result; diff --git a/src/plugins/beautifier/beautifiertool.cpp b/src/plugins/beautifier/beautifiertool.cpp index 6f5c4731c60..01f470ad7c5 100644 --- a/src/plugins/beautifier/beautifiertool.cpp +++ b/src/plugins/beautifier/beautifiertool.cpp @@ -180,7 +180,7 @@ AbstractSettings::~AbstractSettings() = default; QStringList AbstractSettings::completerWords() { - return QStringList(); + return {}; } QStringList AbstractSettings::styles() const diff --git a/src/plugins/clangtools/clangtoolsutils.cpp b/src/plugins/clangtools/clangtoolsutils.cpp index de3ac2b9cba..effab6f3252 100644 --- a/src/plugins/clangtools/clangtoolsutils.cpp +++ b/src/plugins/clangtools/clangtoolsutils.cpp @@ -280,7 +280,7 @@ ClangDiagnosticConfig diagnosticConfig(const Utils::Id &diagConfigId) static QStringList extraOptions(const QString &envVar) { if (!qtcEnvironmentVariableIsSet(envVar)) - return QStringList(); + return {}; QString arguments = qtcEnvironmentVariable(envVar); return ProcessArgs::splitArgs(arguments, HostOsInfo::hostOs()); } diff --git a/src/plugins/cppeditor/cppeditorplugin.cpp b/src/plugins/cppeditor/cppeditorplugin.cpp index 40f1917a5a9..e47c939d280 100644 --- a/src/plugins/cppeditor/cppeditorplugin.cpp +++ b/src/plugins/cppeditor/cppeditorplugin.cpp @@ -663,7 +663,7 @@ static QStringList findFilesInProject(const QString &name, const Project *projec qDebug() << Q_FUNC_INFO << name << project; if (!project) - return QStringList(); + return {}; QString pattern = QString(1, QLatin1Char('/')); pattern += name; @@ -702,7 +702,7 @@ static QStringList matchingCandidateSuffixes(ProjectFile::Kind kind) case ProjectFile::OpenCLSource: return mimeTypeForName(Constants::CPP_HEADER_MIMETYPE).suffixes(); default: - return QStringList(); + return {}; } } diff --git a/src/plugins/cvs/cvseditor.cpp b/src/plugins/cvs/cvseditor.cpp index 5a62103fd57..0a9298bd47e 100644 --- a/src/plugins/cvs/cvseditor.cpp +++ b/src/plugins/cvs/cvseditor.cpp @@ -101,7 +101,7 @@ VcsBase::BaseAnnotationHighlighter *CvsEditorWidget::createAnnotationHighlighter QStringList CvsEditorWidget::annotationPreviousVersions(const QString &revision) const { if (isFirstRevision(revision)) - return QStringList(); + return {}; return QStringList(previousRevision(revision)); } diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp index d0f21bb0942..6a718e92a44 100644 --- a/src/plugins/genericprojectmanager/genericproject.cpp +++ b/src/plugins/genericprojectmanager/genericproject.cpp @@ -398,7 +398,7 @@ static QStringList readFlags(const QString &filePath) { const QStringList lines = readLines(filePath); if (lines.isEmpty()) - return QStringList(); + return {}; QStringList flags; for (const auto &line : lines) flags.append(ProcessArgs::splitArgs(line, HostOsInfo::hostOs())); diff --git a/src/plugins/git/branchmodel.cpp b/src/plugins/git/branchmodel.cpp index 0702c4a0aac..df38ea9961a 100644 --- a/src/plugins/git/branchmodel.cpp +++ b/src/plugins/git/branchmodel.cpp @@ -543,8 +543,7 @@ QString BranchModel::fullName(const QModelIndex &idx, bool includePrefix) const QStringList BranchModel::localBranchNames() const { if (!d->rootNode || !d->rootNode->count()) - return QStringList(); - + return {}; return d->rootNode->children.at(LocalBranches)->childrenNames() + d->obsoleteLocalBranches; } diff --git a/src/plugins/git/giteditor.cpp b/src/plugins/git/giteditor.cpp index 76df05d53b1..717704ff028 100644 --- a/src/plugins/git/giteditor.cpp +++ b/src/plugins/git/giteditor.cpp @@ -292,7 +292,7 @@ QStringList GitEditorWidget::annotationPreviousVersions(const QString &revision) if (!gitClient().synchronousParentRevisions( sourceWorkingDirectory(), revision, &revisions, &errorMessage)) { VcsOutputWindow::appendSilently(errorMessage); - return QStringList(); + return {}; } return revisions; } diff --git a/src/plugins/perforce/perforceeditor.cpp b/src/plugins/perforce/perforceeditor.cpp index 2483f0dc522..ec418a7cedd 100644 --- a/src/plugins/perforce/perforceeditor.cpp +++ b/src/plugins/perforce/perforceeditor.cpp @@ -70,7 +70,7 @@ QStringList PerforceEditorWidget::annotationPreviousVersions(const QString &v) c bool ok; const int changeList = v.toInt(&ok); if (!ok || changeList < 2) - return QStringList(); + return {}; return QStringList(QString::number(changeList - 1)); } diff --git a/src/plugins/qmldesigner/components/connectioneditor/bindingmodel.cpp b/src/plugins/qmldesigner/components/connectioneditor/bindingmodel.cpp index 2b2025ed83a..a5562059d67 100644 --- a/src/plugins/qmldesigner/components/connectioneditor/bindingmodel.cpp +++ b/src/plugins/qmldesigner/components/connectioneditor/bindingmodel.cpp @@ -134,7 +134,7 @@ QStringList BindingModel::possibleTargetProperties(const BindingProperty &bindin if (!modelNode.isValid()) { qWarning() << " BindingModel::possibleTargetPropertiesForRow invalid model node"; - return QStringList(); + return {}; } NodeMetaInfo metaInfo = modelNode.metaInfo(); @@ -151,7 +151,7 @@ QStringList BindingModel::possibleTargetProperties(const BindingProperty &bindin return writableProperties; } - return QStringList(); + return {}; } QStringList BindingModel::possibleSourceProperties(const BindingProperty &bindingProperty) const @@ -191,7 +191,7 @@ QStringList BindingModel::possibleSourceProperties(const BindingProperty &bindin } qWarning() << " BindingModel::possibleSourcePropertiesForRow invalid model node"; - return QStringList(); + return {}; } NodeMetaInfo metaInfo = modelNode.metaInfo(); diff --git a/src/plugins/qmldesigner/components/connectioneditor/dynamicpropertiesmodel.cpp b/src/plugins/qmldesigner/components/connectioneditor/dynamicpropertiesmodel.cpp index eb0976eaed9..bfd5e16be97 100644 --- a/src/plugins/qmldesigner/components/connectioneditor/dynamicpropertiesmodel.cpp +++ b/src/plugins/qmldesigner/components/connectioneditor/dynamicpropertiesmodel.cpp @@ -463,7 +463,7 @@ QStringList DynamicPropertiesModel::possibleTargetProperties(const BindingProper if (!modelNode.isValid()) { qWarning() << " BindingModel::possibleTargetPropertiesForRow invalid model node"; - return QStringList(); + return {}; } NodeMetaInfo metaInfo = modelNode.metaInfo(); @@ -519,7 +519,7 @@ QStringList DynamicPropertiesModel::possibleSourceProperties(const BindingProper if (!modelNode.isValid()) { qWarning() << " BindingModel::possibleSourcePropertiesForRow invalid model node"; - return QStringList(); + return {}; } NodeMetaInfo metaInfo = modelNode.metaInfo(); diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp index 8c9b19d62ee..a8d7fb5a6fc 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp @@ -131,7 +131,7 @@ QStringList PropertyEditorContextObject::autoComplete(const QString &text, int p return Utils::filtered(m_model->rewriterView()->autoComplete(text, pos, explicitComplete), [filter](const QString &string) { return !filter || (!string.isEmpty() && string.at(0).isUpper()); }); - return QStringList(); + return {}; } void PropertyEditorContextObject::toogleExportAlias() diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditormodel.cpp b/src/plugins/qmldesigner/components/stateseditor/stateseditormodel.cpp index 0b53af121b8..8c3e79e9764 100644 --- a/src/plugins/qmldesigner/components/stateseditor/stateseditormodel.cpp +++ b/src/plugins/qmldesigner/components/stateseditor/stateseditormodel.cpp @@ -218,7 +218,7 @@ QStringList StatesEditorModel::autoComplete(const QString &text, int pos, bool e if (model && model->rewriterView()) return model->rewriterView()->autoComplete(text, pos, explicitComplete); - return QStringList(); + return {}; } QVariant StatesEditorModel::stateModelNode(int internalNodeId) diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp index 03cd658f22a..5df44802e4b 100644 --- a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp +++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp @@ -499,7 +499,7 @@ bool StatesEditorView::hasExtend() const QStringList StatesEditorView::extendedStates() const { if (!model()) - return QStringList(); + return {}; QStringList states; diff --git a/src/plugins/qmldesigner/designercore/include/plaintexteditmodifier.h b/src/plugins/qmldesigner/designercore/include/plaintexteditmodifier.h index 4172e8921ee..843af9f8af0 100644 --- a/src/plugins/qmldesigner/designercore/include/plaintexteditmodifier.h +++ b/src/plugins/qmldesigner/designercore/include/plaintexteditmodifier.h @@ -48,7 +48,7 @@ public: { return false; } QStringList autoComplete(QTextDocument * /*textDocument*/, int /*position*/, bool /*explicitComplete*/) override - { return QStringList(); } + { return {}; } bool moveToComponent(int /* nodeOffset */) override { return false; } diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp index 5121e6a663c..004bad1674e 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp @@ -1167,11 +1167,11 @@ Model *NodeMetaInfoPrivate::model() const QStringList NodeMetaInfoPrivate::keysForEnum(const QString &enumName) const { if (!isValid()) - return QStringList(); + return {}; const CppComponentValue *qmlObjectValue = getNearestCppComponentValue(); if (!qmlObjectValue) - return QStringList(); + return {}; return qmlObjectValue->getEnum(enumName).keys(); } diff --git a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp index 0afd0d735c7..b793cf03c32 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp @@ -384,7 +384,7 @@ QStringList SubComponentManager::importPaths() const if (model()) return model()->importPaths(); - return QStringList(); + return {}; } void SubComponentManager::parseQuick3DAssetsDir(const QString &quick3DAssetsPath) diff --git a/src/plugins/qmldesigner/designercore/model/basetexteditmodifier.cpp b/src/plugins/qmldesigner/designercore/model/basetexteditmodifier.cpp index 69c74ec6cf8..2f4a27e09fd 100644 --- a/src/plugins/qmldesigner/designercore/model/basetexteditmodifier.cpp +++ b/src/plugins/qmldesigner/designercore/model/basetexteditmodifier.cpp @@ -132,5 +132,5 @@ QStringList BaseTextEditModifier::autoComplete(QTextDocument *textDocument, int document->filePath(), explicitComplete ? TextEditor::ExplicitlyInvoked : TextEditor::ActivationCharacter, document->semanticInfo()); - return QStringList(); + return {}; } diff --git a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.cpp b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.cpp index dc96b1a4001..953e4a6bf12 100644 --- a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.cpp +++ b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.cpp @@ -104,7 +104,7 @@ QStringList WidgetPluginPath::libraryFilePaths(const QDir &dir) { const QFileInfoList infoList = dir.entryInfoList(QDir::Files|QDir::Readable|QDir::NoDotAndDotDot); if (infoList.empty()) - return QStringList(); + return {}; // Load symbolic links but make sure all file names are unique as not // to fall for something like 'libplugin.so.1 -> libplugin.so' QStringList result; diff --git a/src/plugins/qmldesigner/documentmanager.cpp b/src/plugins/qmldesigner/documentmanager.cpp index 75ae05de56d..0ce1f5e07fd 100644 --- a/src/plugins/qmldesigner/documentmanager.cpp +++ b/src/plugins/qmldesigner/documentmanager.cpp @@ -361,19 +361,19 @@ QStringList DocumentManager::isoIconsQmakeVariableValue(const QString &proPath) ProjectExplorer::Node *node = ProjectExplorer::ProjectTree::nodeForFile(Utils::FilePath::fromString(proPath)); if (!node) { qCWarning(documentManagerLog) << "No node for .pro:" << proPath; - return QStringList(); + return {}; } ProjectExplorer::Node *parentNode = node->parentFolderNode(); if (!parentNode) { qCWarning(documentManagerLog) << "No parent node for node at" << proPath; - return QStringList(); + return {}; } auto proNode = dynamic_cast(parentNode); if (!proNode) { qCWarning(documentManagerLog) << "Parent node for node at" << proPath << "could not be converted to a QmakeProFileNode"; - return QStringList(); + return {}; } return proNode->variableValue(QmakeProjectManager::Variable::IsoIcons); diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index a5d42a6394d..f84408941a1 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -2116,7 +2116,7 @@ static QByteArray scanQtBinaryForBuildString(const FilePath &library) static QStringList extractFieldsFromBuildString(const QByteArray &buildString) { if (buildString.isEmpty() || buildString.size() > 4096) - return QStringList(); + return {}; const QRegularExpression buildStringMatcher("^Qt " "([\\d\\.a-zA-Z]*) " // Qt version @@ -2132,7 +2132,7 @@ static QStringList extractFieldsFromBuildString(const QByteArray &buildString) const QRegularExpressionMatch match = buildStringMatcher.match(QString::fromUtf8(buildString)); if (!match.hasMatch()) - return QStringList(); + return {}; QStringList result; result.append(match.captured(1)); // qtVersion diff --git a/src/plugins/squish/propertytreeitem.cpp b/src/plugins/squish/propertytreeitem.cpp index 3e16212a2d9..442d7f5b9a0 100644 --- a/src/plugins/squish/propertytreeitem.cpp +++ b/src/plugins/squish/propertytreeitem.cpp @@ -240,7 +240,7 @@ QStringList PropertiesModel::allPropertyNames() const { TreeItem *root = rootItem(); if (!root) - return QStringList(); + return {}; QStringList result; result.reserve(root->childCount()); diff --git a/src/plugins/subversion/subversioneditor.cpp b/src/plugins/subversion/subversioneditor.cpp index cf27b606a2d..c54371c7867 100644 --- a/src/plugins/subversion/subversioneditor.cpp +++ b/src/plugins/subversion/subversioneditor.cpp @@ -85,6 +85,6 @@ QStringList SubversionEditorWidget::annotationPreviousVersions(const QString &v) bool ok; const int revision = v.toInt(&ok); if (!ok || revision < 2) - return QStringList(); + return {}; return QStringList(QString::number(revision - 1)); } diff --git a/src/plugins/vcsbase/vcsbaseclient.cpp b/src/plugins/vcsbase/vcsbaseclient.cpp index 700f32284e5..93374712dd1 100644 --- a/src/plugins/vcsbase/vcsbaseclient.cpp +++ b/src/plugins/vcsbase/vcsbaseclient.cpp @@ -115,7 +115,7 @@ QStringList VcsBaseClientImpl::splitLines(const QString &s) if (output.endsWith(newLine)) output.truncate(output.size() - 1); if (output.isEmpty()) - return QStringList(); + return {}; return output.split(newLine); } diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp index 26c19c7f91e..036ddf12239 100644 --- a/src/plugins/vcsbase/vcsbaseeditor.cpp +++ b/src/plugins/vcsbase/vcsbaseeditor.cpp @@ -1454,7 +1454,7 @@ void VcsBaseEditorWidget::slotAnnotateRevision(const QString &change) QStringList VcsBaseEditorWidget::annotationPreviousVersions(const QString &) const { - return QStringList(); + return {}; } void VcsBaseEditorWidget::slotPaste() diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp index 12d91b7b7a5..c6d8653ec23 100644 --- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp +++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp @@ -385,7 +385,7 @@ SubmitFileModel *VcsBaseSubmitEditor::fileModel() const QStringList VcsBaseSubmitEditor::rowsToFiles(const QList &rows) const { if (rows.empty()) - return QStringList(); + return {}; QStringList rc; const SubmitFileModel *model = fileModel(); diff --git a/tests/auto/qml/codemodel/ecmascript7/tst_ecmascript7.cpp b/tests/auto/qml/codemodel/ecmascript7/tst_ecmascript7.cpp index 003630ab0bf..ac0611aa85c 100644 --- a/tests/auto/qml/codemodel/ecmascript7/tst_ecmascript7.cpp +++ b/tests/auto/qml/codemodel/ecmascript7/tst_ecmascript7.cpp @@ -71,7 +71,7 @@ static QStringList readSkipList(const QDir &dir, const QString &filename) QStringList result; if (!f.open(QIODevice::ReadOnly | QIODevice::Text)) - return QStringList(); + return {}; while (!f.atEnd()) { const QString s = QString::fromUtf8(f.readLine().trimmed());