From 82712e12f857b9c1d69d29e7582533c7cb75af6e Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Wed, 2 Aug 2023 08:01:11 +0200 Subject: [PATCH] Various Plugins: Simplify return QStringList statements Amends 925bb2ca312f3489a8d9ed48c35bb4f80e9815fa Change-Id: I57bee33cb7acd0ab1cdcfb6897a4847b912b4c97 Reviewed-by: Reviewed-by: Qt CI Bot Reviewed-by: Orgad Shaneh --- src/libs/qmljs/qmljsfindexportedcpptypes.cpp | 2 +- src/libs/utils/dropsupport.cpp | 2 +- src/libs/utils/json.cpp | 2 +- src/libs/utils/mimetypes2/mimedatabase.cpp | 2 +- src/plugins/android/androiddeviceinfo.cpp | 4 ++-- src/plugins/autotest/qtest/qttest_utils.cpp | 6 +++--- src/plugins/coreplugin/dialogs/externaltoolconfig.cpp | 2 +- src/plugins/ios/iosdsymbuildstep.cpp | 8 ++++---- src/plugins/qmakeprojectmanager/qmakenodes.cpp | 2 +- src/plugins/qmakeprojectmanager/qmakestep.cpp | 2 +- src/plugins/qmlprofiler/qmlprofilerstatisticsmodel.cpp | 6 +----- src/plugins/qtsupport/baseqtversion.cpp | 2 +- src/plugins/qtsupport/qscxmlcgenerator.cpp | 5 ++--- src/plugins/squish/objectsmaptreeitem.cpp | 2 +- 14 files changed, 21 insertions(+), 26 deletions(-) diff --git a/src/libs/qmljs/qmljsfindexportedcpptypes.cpp b/src/libs/qmljs/qmljsfindexportedcpptypes.cpp index 6b2c10b21a8..36125539776 100644 --- a/src/libs/qmljs/qmljsfindexportedcpptypes.cpp +++ b/src/libs/qmljs/qmljsfindexportedcpptypes.cpp @@ -827,7 +827,7 @@ FindExportedCppTypes::FindExportedCppTypes(const CPlusPlus::Snapshot &snapshot) QStringList FindExportedCppTypes::operator()(const CPlusPlus::Document::Ptr &document) { - QTC_ASSERT(!document.isNull(), return QStringList()); + QTC_ASSERT(!document.isNull(), return {}); m_contextProperties.clear(); m_exportedTypes.clear(); diff --git a/src/libs/utils/dropsupport.cpp b/src/libs/utils/dropsupport.cpp index 5fa9289a2ab..7416edf9c37 100644 --- a/src/libs/utils/dropsupport.cpp +++ b/src/libs/utils/dropsupport.cpp @@ -63,7 +63,7 @@ DropSupport::DropSupport(QWidget *parentWidget, const DropFilterFunction &filter QStringList DropSupport::mimeTypesForFilePaths() { - return QStringList("text/uri-list"); + return {"text/uri-list"}; } bool DropSupport::isFileDrop(QDropEvent *event) diff --git a/src/libs/utils/json.cpp b/src/libs/utils/json.cpp index 5afd4a685b7..d0f2518af32 100644 --- a/src/libs/utils/json.cpp +++ b/src/libs/utils/json.cpp @@ -252,7 +252,7 @@ QStringList JsonSchema::properties(JsonObjectValue *v) const QStringList JsonSchema::properties() const { - QTC_ASSERT(acceptsType(JsonValue::kindToString(JsonValue::Object)), return QStringList()); + QTC_ASSERT(acceptsType(JsonValue::kindToString(JsonValue::Object)), return {}); return properties(currentValue()); } diff --git a/src/libs/utils/mimetypes2/mimedatabase.cpp b/src/libs/utils/mimetypes2/mimedatabase.cpp index b703421d96f..cba76f733ae 100644 --- a/src/libs/utils/mimetypes2/mimedatabase.cpp +++ b/src/libs/utils/mimetypes2/mimedatabase.cpp @@ -223,7 +223,7 @@ MimeType MimeDatabasePrivate::mimeTypeForName(const QString &nameOrAlias) QStringList MimeDatabasePrivate::mimeTypeForFileName(const QString &fileName) { if (fileName.endsWith(QLatin1Char('/'))) - return QStringList() << QLatin1String("inode/directory"); + return {"inode/directory"}; const MimeGlobMatchResult result = findByFileName(fileName); QStringList matchingMimeTypes = result.m_matchingMimeTypes; diff --git a/src/plugins/android/androiddeviceinfo.cpp b/src/plugins/android/androiddeviceinfo.cpp index 4d34d7a57c9..3c00547d062 100644 --- a/src/plugins/android/androiddeviceinfo.cpp +++ b/src/plugins/android/androiddeviceinfo.cpp @@ -12,8 +12,8 @@ namespace Android { QStringList AndroidDeviceInfo::adbSelector(const QString &serialNumber) { if (serialNumber.startsWith(QLatin1String("????"))) - return QStringList("-d"); - return QStringList({"-s", serialNumber}); + return {"-d"}; + return {"-s", serialNumber}; } bool AndroidDeviceInfo::operator<(const AndroidDeviceInfo &other) const diff --git a/src/plugins/autotest/qtest/qttest_utils.cpp b/src/plugins/autotest/qtest/qttest_utils.cpp index e40f50448c3..3717a563862 100644 --- a/src/plugins/autotest/qtest/qttest_utils.cpp +++ b/src/plugins/autotest/qtest/qttest_utils.cpp @@ -99,13 +99,13 @@ QStringList filterInterfering(const QStringList &provided, QStringList *omitted, if (knownAllowedOptionsWithParameter.contains(currentOpt)) { allowed.append(currentOpt); ++it; - QTC_ASSERT(it != end, return QStringList()); + QTC_ASSERT(it != end, return {}); allowed.append(*it); } else if (knownInterferingOptionWithParameter.contains(currentOpt)) { if (omitted) { omitted->append(currentOpt); ++it; - QTC_ASSERT(it != end, return QStringList()); + QTC_ASSERT(it != end, return {}); omitted->append(*it); } } else if (knownInterferingSingleOptions.contains(currentOpt)) { @@ -115,7 +115,7 @@ QStringList filterInterfering(const QStringList &provided, QStringList *omitted, if (knownAllowedQuickOptionsWithParameter.contains(currentOpt)) { allowed.append(currentOpt); ++it; - QTC_ASSERT(it != end, return QStringList()); + QTC_ASSERT(it != end, return {}); allowed.append(*it); } else if (knownAllowedSingleQuickOptions.contains(currentOpt)) { allowed.append(currentOpt); diff --git a/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp b/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp index 59237aad79a..6883e930a5c 100644 --- a/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp +++ b/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp @@ -192,7 +192,7 @@ bool ExternalToolModel::dropMimeData(const QMimeData *data, QStringList ExternalToolModel::mimeTypes() const { - return QStringList("application/qtcreator-externaltool-config"); + return {"application/qtcreator-externaltool-config"}; } QModelIndex ExternalToolModel::index(int row, int column, const QModelIndex &parent) const diff --git a/src/plugins/ios/iosdsymbuildstep.cpp b/src/plugins/ios/iosdsymbuildstep.cpp index 2808cca8a2d..b7eb1f6abc1 100644 --- a/src/plugins/ios/iosdsymbuildstep.cpp +++ b/src/plugins/ios/iosdsymbuildstep.cpp @@ -129,11 +129,11 @@ FilePath IosDsymBuildStep::defaultCommand() const QStringList IosDsymBuildStep::defaultCleanCmdList() const { auto runConf = qobject_cast(target()->activeRunConfiguration()); - QTC_ASSERT(runConf, return QStringList("echo")); + QTC_ASSERT(runConf, return {"echo"}); QString dsymPath = runConf->bundleDirectory().toUserOutput(); dsymPath.chop(4); dsymPath.append(".dSYM"); - return QStringList({"rm", "-rf", dsymPath}); + return {"rm", "-rf", dsymPath}; } QStringList IosDsymBuildStep::defaultCmdList() const @@ -144,11 +144,11 @@ QStringList IosDsymBuildStep::defaultCmdList() const if (dsymUtilPath.exists()) dsymutilCmd = dsymUtilPath.toUserOutput(); auto runConf = qobject_cast(target()->activeRunConfiguration()); - QTC_ASSERT(runConf, return QStringList("echo")); + QTC_ASSERT(runConf, return {"echo"}); QString dsymPath = runConf->bundleDirectory().toUserOutput(); dsymPath.chop(4); dsymPath.append(".dSYM"); - return QStringList({dsymutilCmd, "-o", dsymPath, runConf->localExecutable().toUserOutput()}); + return {dsymutilCmd, "-o", dsymPath, runConf->localExecutable().toUserOutput()}; } FilePath IosDsymBuildStep::command() const diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.cpp b/src/plugins/qmakeprojectmanager/qmakenodes.cpp index 144a9cc0c9f..c83808e2d5f 100644 --- a/src/plugins/qmakeprojectmanager/qmakenodes.cpp +++ b/src/plugins/qmakeprojectmanager/qmakenodes.cpp @@ -167,7 +167,7 @@ bool QmakePriFileNode::removeSubProject(const FilePath &proFilePath) QStringList QmakePriFileNode::subProjectFileNamePatterns() const { - return QStringList("*.pro"); + return {"*.pro"}; } bool QmakeBuildSystem::addFiles(Node *context, const FilePaths &filePaths, FilePaths *notAdded) diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp index cae48809b7a..a4a56b51963 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.cpp +++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp @@ -381,7 +381,7 @@ QStringList QMakeStep::parserArguments() // NOTE: extra parser args placed before the other args intentionally QStringList result = m_extraParserArgs; QtVersion *qt = QtKitAspect::qtVersion(kit()); - QTC_ASSERT(qt, return QStringList()); + QTC_ASSERT(qt, return {}); for (ProcessArgs::ConstArgIterator ait(allArguments(qt, ArgumentFlag::Expand)); ait.next(); ) { if (ait.isSimple()) result << ait.value(); diff --git a/src/plugins/qmlprofiler/qmlprofilerstatisticsmodel.cpp b/src/plugins/qmlprofiler/qmlprofilerstatisticsmodel.cpp index 6b8a2020c97..92126d42e34 100644 --- a/src/plugins/qmlprofiler/qmlprofilerstatisticsmodel.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerstatisticsmodel.cpp @@ -121,11 +121,7 @@ QStringList QmlProfilerStatisticsModel::details(int typeIndex) const data = data.left(maxColumnWidth - 1) + ellipsisChar; } - return QStringList({ - displayName, - data, - QString::number(durationPercent(typeIndex), 'f', 2) + QLatin1Char('%') - }); + return {displayName, data, QString::number(durationPercent(typeIndex), 'f', 2) + '%'}; } QString QmlProfilerStatisticsModel::summary(const QVector &typeIds) const diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index f84408941a1..15a891dc110 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -2143,7 +2143,7 @@ static QStringList extractFieldsFromBuildString(const QByteArray &buildString) result.append(abiInfo.takeFirst()); // cpu const QString endian = abiInfo.takeFirst(); - QTC_ASSERT(endian.endsWith("_endian"), return QStringList()); + QTC_ASSERT(endian.endsWith("_endian"), return {}); result.append(endian.left(endian.size() - 7)); // without the "_endian" result.append(abiInfo.takeFirst()); // pointer diff --git a/src/plugins/qtsupport/qscxmlcgenerator.cpp b/src/plugins/qtsupport/qscxmlcgenerator.cpp index 7cb67f6171e..b0d41d9ba7a 100644 --- a/src/plugins/qtsupport/qscxmlcgenerator.cpp +++ b/src/plugins/qtsupport/qscxmlcgenerator.cpp @@ -68,10 +68,9 @@ Utils::FilePath QScxmlcGenerator::command() const QStringList QScxmlcGenerator::arguments() const { - QTC_ASSERT(!m_header.isEmpty(), return QStringList()); + QTC_ASSERT(!m_header.isEmpty(), return {}); - return QStringList({QLatin1String("--header"), m_header, QLatin1String("--impl"), m_impl, - tmpFile().fileName()}); + return {"--header", m_header, "--impl", m_impl, tmpFile().fileName()}; } Utils::FilePath QScxmlcGenerator::workingDirectory() const diff --git a/src/plugins/squish/objectsmaptreeitem.cpp b/src/plugins/squish/objectsmaptreeitem.cpp index 1fec8eafc34..1fd39366cde 100644 --- a/src/plugins/squish/objectsmaptreeitem.cpp +++ b/src/plugins/squish/objectsmaptreeitem.cpp @@ -346,7 +346,7 @@ void ObjectsMapModel::removeSymbolicName(const QModelIndex &idx) QStringList ObjectsMapModel::allSymbolicNames() const { TreeItem *root = rootItem(); - QTC_ASSERT(root, return QStringList()); + QTC_ASSERT(root, return {}); QMap objects; forAllItems([&objects](ObjectsMapTreeItem *item) {