Various Plugins: Simplify return QStringList statements

Change-Id: Id014225851e6b9f8436387c681bea42e5de3b797
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Jarek Kobus
2023-08-01 21:26:29 +02:00
parent eb2b4b6cf3
commit 925bb2ca31
31 changed files with 44 additions and 45 deletions

View File

@@ -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)

View File

@@ -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();

View File

@@ -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();

View File

@@ -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)

View File

@@ -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;

View File

@@ -180,7 +180,7 @@ AbstractSettings::~AbstractSettings() = default;
QStringList AbstractSettings::completerWords()
{
return QStringList();
return {};
}
QStringList AbstractSettings::styles() const

View File

@@ -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());
}

View File

@@ -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 {};
}
}

View File

@@ -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));
}

View File

@@ -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()));

View File

@@ -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;
}

View File

@@ -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;
}

View File

@@ -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));
}

View File

@@ -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();

View File

@@ -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();

View File

@@ -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()

View File

@@ -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)

View File

@@ -499,7 +499,7 @@ bool StatesEditorView::hasExtend() const
QStringList StatesEditorView::extendedStates() const
{
if (!model())
return QStringList();
return {};
QStringList states;

View File

@@ -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; }

View File

@@ -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();
}

View File

@@ -384,7 +384,7 @@ QStringList SubComponentManager::importPaths() const
if (model())
return model()->importPaths();
return QStringList();
return {};
}
void SubComponentManager::parseQuick3DAssetsDir(const QString &quick3DAssetsPath)

View File

@@ -132,5 +132,5 @@ QStringList BaseTextEditModifier::autoComplete(QTextDocument *textDocument, int
document->filePath(),
explicitComplete ? TextEditor::ExplicitlyInvoked : TextEditor::ActivationCharacter,
document->semanticInfo());
return QStringList();
return {};
}

View File

@@ -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;

View File

@@ -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<QmakeProjectManager::QmakeProFileNode*>(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);

View File

@@ -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

View File

@@ -240,7 +240,7 @@ QStringList PropertiesModel::allPropertyNames() const
{
TreeItem *root = rootItem();
if (!root)
return QStringList();
return {};
QStringList result;
result.reserve(root->childCount());

View File

@@ -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));
}

View File

@@ -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);
}

View File

@@ -1454,7 +1454,7 @@ void VcsBaseEditorWidget::slotAnnotateRevision(const QString &change)
QStringList VcsBaseEditorWidget::annotationPreviousVersions(const QString &) const
{
return QStringList();
return {};
}
void VcsBaseEditorWidget::slotPaste()

View File

@@ -385,7 +385,7 @@ SubmitFileModel *VcsBaseSubmitEditor::fileModel() const
QStringList VcsBaseSubmitEditor::rowsToFiles(const QList<int> &rows) const
{
if (rows.empty())
return QStringList();
return {};
QStringList rc;
const SubmitFileModel *model = fileModel();

View File

@@ -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());