forked from qt-creator/qt-creator
VCSbase: Remove foreach / Q_FOREACH usage
Task-number: QTCREATORBUG-27464 Change-Id: I1088047513e7660907182e80303607d8c48919f5 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
@@ -62,7 +62,8 @@ static void removeFileRecursion(QFutureInterface<void> &futureInterface,
|
|||||||
return;
|
return;
|
||||||
if (f.isDir()) {
|
if (f.isDir()) {
|
||||||
const QDir dir(f.absoluteFilePath());
|
const QDir dir(f.absoluteFilePath());
|
||||||
foreach (const QFileInfo &fi, dir.entryInfoList(QDir::AllEntries|QDir::NoDotAndDotDot|QDir::Hidden))
|
const QList<QFileInfo> infos = dir.entryInfoList(QDir::AllEntries|QDir::NoDotAndDotDot|QDir::Hidden);
|
||||||
|
for (const QFileInfo &fi : infos)
|
||||||
removeFileRecursion(futureInterface, fi, errorMessage);
|
removeFileRecursion(futureInterface, fi, errorMessage);
|
||||||
QDir parent = f.absoluteDir();
|
QDir parent = f.absoluteDir();
|
||||||
if (!parent.rmdir(f.fileName()))
|
if (!parent.rmdir(f.fileName()))
|
||||||
@@ -86,7 +87,7 @@ static void runCleanFiles(QFutureInterface<void> &futureInterface,
|
|||||||
QString errorMessage;
|
QString errorMessage;
|
||||||
futureInterface.setProgressRange(0, files.size());
|
futureInterface.setProgressRange(0, files.size());
|
||||||
futureInterface.setProgressValue(0);
|
futureInterface.setProgressValue(0);
|
||||||
foreach (const QString &name, files) {
|
for (const QString &name : files) {
|
||||||
removeFileRecursion(futureInterface, QFileInfo(name), &errorMessage);
|
removeFileRecursion(futureInterface, QFileInfo(name), &errorMessage);
|
||||||
if (futureInterface.isCanceled())
|
if (futureInterface.isCanceled())
|
||||||
break;
|
break;
|
||||||
@@ -177,9 +178,9 @@ void CleanDialog::setFileList(const QString &workingDirectory, const QStringList
|
|||||||
if (const int oldRowCount = d->m_filesModel->rowCount())
|
if (const int oldRowCount = d->m_filesModel->rowCount())
|
||||||
d->m_filesModel->removeRows(0, oldRowCount);
|
d->m_filesModel->removeRows(0, oldRowCount);
|
||||||
|
|
||||||
foreach (const QString &fileName, files)
|
for (const QString &fileName : files)
|
||||||
addFile(workingDirectory, fileName, true);
|
addFile(workingDirectory, fileName, true);
|
||||||
foreach (const QString &fileName, ignoredFiles)
|
for (const QString &fileName : ignoredFiles)
|
||||||
addFile(workingDirectory, fileName, false);
|
addFile(workingDirectory, fileName, false);
|
||||||
|
|
||||||
for (int c = 0; c < d->m_filesModel->columnCount(); c++)
|
for (int c = 0; c < d->m_filesModel->columnCount(); c++)
|
||||||
|
@@ -573,7 +573,7 @@ void SubmitEditorWidget::descriptionTextChanged()
|
|||||||
wrapDescription();
|
wrapDescription();
|
||||||
trimDescription();
|
trimDescription();
|
||||||
// append field entries
|
// append field entries
|
||||||
foreach (const SubmitFieldWidget *fw, d->m_fieldWidgets)
|
for (const SubmitFieldWidget *fw : qAsConst(d->m_fieldWidgets))
|
||||||
d->m_description += fw->fieldValues();
|
d->m_description += fw->fieldValues();
|
||||||
updateSubmitAction();
|
updateSubmitAction();
|
||||||
}
|
}
|
||||||
@@ -664,8 +664,8 @@ void SubmitEditorWidget::editorCustomContextMenuRequested(const QPoint &pos)
|
|||||||
{
|
{
|
||||||
QScopedPointer<QMenu> menu(d->m_ui.description->createStandardContextMenu());
|
QScopedPointer<QMenu> menu(d->m_ui.description->createStandardContextMenu());
|
||||||
// Extend
|
// Extend
|
||||||
foreach (const SubmitEditorWidgetPrivate::AdditionalContextMenuAction &a,
|
for (const SubmitEditorWidgetPrivate::AdditionalContextMenuAction &a :
|
||||||
d->descriptionEditContextMenuActions) {
|
qAsConst(d->descriptionEditContextMenuActions)) {
|
||||||
if (a.second) {
|
if (a.second) {
|
||||||
if (a.first >= 0)
|
if (a.first >= 0)
|
||||||
menu->insertAction(menu->actions().at(a.first), a.second);
|
menu->insertAction(menu->actions().at(a.first), a.second);
|
||||||
|
@@ -210,7 +210,7 @@ void SubmitFieldWidget::setHasBrowseButton(bool on)
|
|||||||
if (d->hasBrowseButton == on)
|
if (d->hasBrowseButton == on)
|
||||||
return;
|
return;
|
||||||
d->hasBrowseButton = on;
|
d->hasBrowseButton = on;
|
||||||
foreach (const FieldEntry &fe, d->fieldEntries)
|
for (const FieldEntry &fe : qAsConst(d->fieldEntries))
|
||||||
fe.browseButton->setVisible(on);
|
fe.browseButton->setVisible(on);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -234,7 +234,7 @@ void SubmitFieldWidget::setCompleter(QCompleter *c)
|
|||||||
if (c == d->completer)
|
if (c == d->completer)
|
||||||
return;
|
return;
|
||||||
d->completer = c;
|
d->completer = c;
|
||||||
foreach (const FieldEntry &fe, d->fieldEntries)
|
for (const FieldEntry &fe : qAsConst(d->fieldEntries))
|
||||||
fe.lineEdit->setCompleter(c);
|
fe.lineEdit->setCompleter(c);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -254,7 +254,7 @@ QString SubmitFieldWidget::fieldValues() const
|
|||||||
const QChar newLine = QLatin1Char('\n');
|
const QChar newLine = QLatin1Char('\n');
|
||||||
// Format as "RevBy: value\nSigned-Off: value\n"
|
// Format as "RevBy: value\nSigned-Off: value\n"
|
||||||
QString rc;
|
QString rc;
|
||||||
foreach (const FieldEntry &fe, d->fieldEntries) {
|
for (const FieldEntry &fe : qAsConst(d->fieldEntries)) {
|
||||||
const QString value = fe.lineEdit->text().trimmed();
|
const QString value = fe.lineEdit->text().trimmed();
|
||||||
if (!value.isEmpty()) {
|
if (!value.isEmpty()) {
|
||||||
rc += fe.combo->currentText();
|
rc += fe.combo->currentText();
|
||||||
|
@@ -63,7 +63,8 @@ using namespace Utils;
|
|||||||
|
|
||||||
static Core::IEditor *locateEditor(const char *property, const QString &entry)
|
static Core::IEditor *locateEditor(const char *property, const QString &entry)
|
||||||
{
|
{
|
||||||
foreach (Core::IDocument *document, Core::DocumentModel::openedDocuments())
|
const QList<Core::IDocument *> documents = Core::DocumentModel::openedDocuments();
|
||||||
|
for (Core::IDocument *document : documents)
|
||||||
if (document->property(property).toString() == entry)
|
if (document->property(property).toString() == entry)
|
||||||
return Core::DocumentModel::editorsForDocument(document).constFirst();
|
return Core::DocumentModel::editorsForDocument(document).constFirst();
|
||||||
return nullptr;
|
return nullptr;
|
||||||
@@ -625,7 +626,7 @@ void VcsBaseClient::statusParser(const QString &text)
|
|||||||
|
|
||||||
QStringList rawStatusList = text.split(QLatin1Char('\n'));
|
QStringList rawStatusList = text.split(QLatin1Char('\n'));
|
||||||
|
|
||||||
foreach (const QString &string, rawStatusList) {
|
for (const QString &string : qAsConst(rawStatusList)) {
|
||||||
const VcsBaseClient::StatusItem lineInfo = parseStatusLine(string);
|
const VcsBaseClient::StatusItem lineInfo = parseStatusLine(string);
|
||||||
if (!lineInfo.flags.isEmpty() && !lineInfo.file.isEmpty())
|
if (!lineInfo.flags.isEmpty() && !lineInfo.file.isEmpty())
|
||||||
lineInfoList.append(lineInfo);
|
lineInfoList.append(lineInfo);
|
||||||
|
@@ -308,7 +308,7 @@ void ChangeTextCursorHandler::fillContextMenu(QMenu *menu, EditorContentType typ
|
|||||||
menu->addAction(createAnnotateAction(widget->decorateVersion(m_currentChange), false));
|
menu->addAction(createAnnotateAction(widget->decorateVersion(m_currentChange), false));
|
||||||
const QStringList previousVersions = widget->annotationPreviousVersions(m_currentChange);
|
const QStringList previousVersions = widget->annotationPreviousVersions(m_currentChange);
|
||||||
if (!previousVersions.isEmpty()) {
|
if (!previousVersions.isEmpty()) {
|
||||||
foreach (const QString &pv, previousVersions)
|
for (const QString &pv : previousVersions)
|
||||||
menu->addAction(createAnnotateAction(widget->decorateVersion(pv), true));
|
menu->addAction(createAnnotateAction(widget->decorateVersion(pv), true));
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@@ -592,7 +592,7 @@ VcsBaseEditorWidgetPrivate::VcsBaseEditorWidgetPrivate(VcsBaseEditorWidget *edit
|
|||||||
|
|
||||||
AbstractTextCursorHandler *VcsBaseEditorWidgetPrivate::findTextCursorHandler(const QTextCursor &cursor)
|
AbstractTextCursorHandler *VcsBaseEditorWidgetPrivate::findTextCursorHandler(const QTextCursor &cursor)
|
||||||
{
|
{
|
||||||
foreach (AbstractTextCursorHandler *handler, m_textCursorHandlers) {
|
for (AbstractTextCursorHandler *handler : qAsConst(m_textCursorHandlers)) {
|
||||||
if (handler->findContentsUnderCursor(cursor))
|
if (handler->findContentsUnderCursor(cursor))
|
||||||
return handler;
|
return handler;
|
||||||
}
|
}
|
||||||
@@ -1384,7 +1384,7 @@ QString VcsBaseEditor::getTitleId(const FilePath &workingDirectory,
|
|||||||
const QString &revision)
|
const QString &revision)
|
||||||
{
|
{
|
||||||
QStringList nonEmptyFileNames;
|
QStringList nonEmptyFileNames;
|
||||||
foreach (const QString& fileName, fileNames) {
|
for (const QString& fileName : fileNames) {
|
||||||
if (!fileName.trimmed().isEmpty())
|
if (!fileName.trimmed().isEmpty())
|
||||||
nonEmptyFileNames.append(fileName);
|
nonEmptyFileNames.append(fileName);
|
||||||
}
|
}
|
||||||
@@ -1669,7 +1669,8 @@ void VcsBaseEditor::tagEditor(Core::IEditor *e, const QString &tag)
|
|||||||
|
|
||||||
Core::IEditor *VcsBaseEditor::locateEditorByTag(const QString &tag)
|
Core::IEditor *VcsBaseEditor::locateEditorByTag(const QString &tag)
|
||||||
{
|
{
|
||||||
foreach (Core::IDocument *document, Core::DocumentModel::openedDocuments()) {
|
const QList<Core::IDocument *> documents = Core::DocumentModel::openedDocuments();
|
||||||
|
for (Core::IDocument *document : documents) {
|
||||||
const QVariant tagPropertyValue = document->property(tagPropertyC);
|
const QVariant tagPropertyValue = document->property(tagPropertyC);
|
||||||
if (tagPropertyValue.type() == QVariant::String && tagPropertyValue.toString() == tag)
|
if (tagPropertyValue.type() == QVariant::String && tagPropertyValue.toString() == tag)
|
||||||
return Core::DocumentModel::editorsForDocument(document).constFirst();
|
return Core::DocumentModel::editorsForDocument(document).constFirst();
|
||||||
|
@@ -163,7 +163,7 @@ QStringList VcsBaseEditorConfig::arguments() const
|
|||||||
{
|
{
|
||||||
// Compile effective arguments
|
// Compile effective arguments
|
||||||
QStringList args = baseArguments();
|
QStringList args = baseArguments();
|
||||||
foreach (const OptionMapping &mapping, optionMappings())
|
for (const OptionMapping &mapping : optionMappings())
|
||||||
args += argumentsForOption(mapping);
|
args += argumentsForOption(mapping);
|
||||||
return args;
|
return args;
|
||||||
}
|
}
|
||||||
@@ -332,7 +332,7 @@ QStringList VcsBaseEditorConfig::argumentsForOption(const OptionMapping &mapping
|
|||||||
|
|
||||||
void VcsBaseEditorConfig::updateMappedSettings()
|
void VcsBaseEditorConfig::updateMappedSettings()
|
||||||
{
|
{
|
||||||
foreach (const OptionMapping &optMapping, d->m_optionMappings) {
|
for (const OptionMapping &optMapping : optionMappings()) {
|
||||||
if (d->m_settingMapping.contains(optMapping.object)) {
|
if (d->m_settingMapping.contains(optMapping.object)) {
|
||||||
Internal::SettingMappingData& settingData = d->m_settingMapping[optMapping.object];
|
Internal::SettingMappingData& settingData = d->m_settingMapping[optMapping.object];
|
||||||
switch (settingData.type()) {
|
switch (settingData.type()) {
|
||||||
|
@@ -263,7 +263,7 @@ static inline QStringList fieldTexts(const QString &fileContents)
|
|||||||
{
|
{
|
||||||
QStringList rc;
|
QStringList rc;
|
||||||
const QStringList rawFields = fileContents.trimmed().split(QLatin1Char('\n'));
|
const QStringList rawFields = fileContents.trimmed().split(QLatin1Char('\n'));
|
||||||
foreach (const QString &field, rawFields) {
|
for (const QString &field : rawFields) {
|
||||||
const QString trimmedField = field.trimmed();
|
const QString trimmedField = field.trimmed();
|
||||||
if (!trimmedField.isEmpty())
|
if (!trimmedField.isEmpty())
|
||||||
rc.push_back(trimmedField);
|
rc.push_back(trimmedField);
|
||||||
|
@@ -98,7 +98,8 @@ WizardPage *VcsCommandPageFactory::create(JsonWizard *wizard, Id typeId, const Q
|
|||||||
tmp.value(QLatin1String(VCSCOMMAND_CHECKOUTNAME)).toString(),
|
tmp.value(QLatin1String(VCSCOMMAND_CHECKOUTNAME)).toString(),
|
||||||
args);
|
args);
|
||||||
|
|
||||||
foreach (const QVariant &value, tmp.value(QLatin1String(VCSCOMMAND_JOBS)).toList()) {
|
const QVariantList values = tmp.value(QLatin1String(VCSCOMMAND_JOBS)).toList();
|
||||||
|
for (const QVariant &value : values) {
|
||||||
const QVariantMap job = value.toMap();
|
const QVariantMap job = value.toMap();
|
||||||
const bool skipEmpty = job.value(QLatin1String(JOB_SKIP_EMPTY), true).toBool();
|
const bool skipEmpty = job.value(QLatin1String(JOB_SKIP_EMPTY), true).toBool();
|
||||||
const FilePath workDir = FilePath::fromVariant(job.value(QLatin1String(JOB_WORK_DIRECTORY)));
|
const FilePath workDir = FilePath::fromVariant(job.value(QLatin1String(JOB_WORK_DIRECTORY)));
|
||||||
@@ -183,7 +184,8 @@ bool VcsCommandPageFactory::validateData(Id typeId, const QVariant &data, QStrin
|
|||||||
.arg(QLatin1String(VCSCOMMAND_JOBS));
|
.arg(QLatin1String(VCSCOMMAND_JOBS));
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach (const QVariant &j, jobs.toList()) {
|
const QVariantList jobList = jobs.toList();
|
||||||
|
for (const QVariant &j : jobList) {
|
||||||
if (j.isNull()) {
|
if (j.isNull()) {
|
||||||
em = tr("Job in \"VcsCommand\" page is empty.");
|
em = tr("Job in \"VcsCommand\" page is empty.");
|
||||||
break;
|
break;
|
||||||
@@ -277,7 +279,7 @@ void VcsCommandPage::delayedInitialize()
|
|||||||
setStartedStatus(runMessage);
|
setStartedStatus(runMessage);
|
||||||
|
|
||||||
QStringList extraArgs;
|
QStringList extraArgs;
|
||||||
foreach (const QString &in, m_arguments) {
|
for (const QString &in : qAsConst(m_arguments)) {
|
||||||
const QString tmp = wiz->expander()->expand(in);
|
const QString tmp = wiz->expander()->expand(in);
|
||||||
if (tmp.isEmpty())
|
if (tmp.isEmpty())
|
||||||
continue;
|
continue;
|
||||||
@@ -290,7 +292,7 @@ void VcsCommandPage::delayedInitialize()
|
|||||||
= vc->createInitialCheckoutCommand(repo, FilePath::fromString(base),
|
= vc->createInitialCheckoutCommand(repo, FilePath::fromString(base),
|
||||||
name, extraArgs);
|
name, extraArgs);
|
||||||
|
|
||||||
foreach (const JobData &job, m_additionalJobs) {
|
for (const JobData &job : qAsConst(m_additionalJobs)) {
|
||||||
QTC_ASSERT(!job.job.isEmpty(), continue);
|
QTC_ASSERT(!job.job.isEmpty(), continue);
|
||||||
|
|
||||||
if (!JsonWizard::boolFromVariant(job.condition, wiz->expander()))
|
if (!JsonWizard::boolFromVariant(job.condition, wiz->expander()))
|
||||||
|
Reference in New Issue
Block a user