feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

VCSbase: Remove foreach / Q_FOREACH usage

Browse Source 
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:
Artem Sokolovskii
2022-05-19 16:04:26 +02:00
parent 2c24dc03ac
commit 646254f460
8 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/vcsbase/cleandialog.cpp
View File

@@ -62,7 +62,8 @@ static void removeFileRecursion(QFutureInterface<void> &futureInterface,
return;
if (f.isDir()) {
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);
QDir parent = f.absoluteDir();
if (!parent.rmdir(f.fileName()))
@@ -86,7 +87,7 @@ static void runCleanFiles(QFutureInterface<void> &futureInterface,
QString errorMessage;
futureInterface.setProgressRange(0, files.size());
futureInterface.setProgressValue(0);
foreach (const QString &name, files) {
for (const QString &name : files) {
removeFileRecursion(futureInterface, QFileInfo(name), &errorMessage);
if (futureInterface.isCanceled())
break;
@@ -177,9 +178,9 @@ void CleanDialog::setFileList(const QString &workingDirectory, const QStringList
if (const int oldRowCount = d->m_filesModel->rowCount())
d->m_filesModel->removeRows(0, oldRowCount);
foreach (const QString &fileName, files)
for (const QString &fileName : files)
addFile(workingDirectory, fileName, true);
foreach (const QString &fileName, ignoredFiles)
for (const QString &fileName : ignoredFiles)
addFile(workingDirectory, fileName, false);
for (int c = 0; c < d->m_filesModel->columnCount(); c++)

6
src/plugins/vcsbase/submiteditorwidget.cpp
View File

@@ -573,7 +573,7 @@ void SubmitEditorWidget::descriptionTextChanged()
wrapDescription();
trimDescription();
// append field entries
foreach (const SubmitFieldWidget *fw, d->m_fieldWidgets)
for (const SubmitFieldWidget *fw : qAsConst(d->m_fieldWidgets))
d->m_description += fw->fieldValues();
updateSubmitAction();
}
@@ -664,8 +664,8 @@ void SubmitEditorWidget::editorCustomContextMenuRequested(const QPoint &pos)
{
QScopedPointer<QMenu> menu(d->m_ui.description->createStandardContextMenu());
// Extend
foreach (const SubmitEditorWidgetPrivate::AdditionalContextMenuAction &a,
d->descriptionEditContextMenuActions) {
for (const SubmitEditorWidgetPrivate::AdditionalContextMenuAction &a :
qAsConst(d->descriptionEditContextMenuActions)) {
if (a.second) {
if (a.first >= 0)
menu->insertAction(menu->actions().at(a.first), a.second);

6
src/plugins/vcsbase/submitfieldwidget.cpp
View File

@@ -210,7 +210,7 @@ void SubmitFieldWidget::setHasBrowseButton(bool on)
if (d->hasBrowseButton == on)
return;
d->hasBrowseButton = on;
foreach (const FieldEntry &fe, d->fieldEntries)
for (const FieldEntry &fe : qAsConst(d->fieldEntries))
fe.browseButton->setVisible(on);
}
@@ -234,7 +234,7 @@ void SubmitFieldWidget::setCompleter(QCompleter *c)
if (c == d->completer)
return;
d->completer = c;
foreach (const FieldEntry &fe, d->fieldEntries)
for (const FieldEntry &fe : qAsConst(d->fieldEntries))
fe.lineEdit->setCompleter(c);
}
@@ -254,7 +254,7 @@ QString SubmitFieldWidget::fieldValues() const
const QChar newLine = QLatin1Char('\n');
// Format as "RevBy: value\nSigned-Off: value\n"
QString rc;
foreach (const FieldEntry &fe, d->fieldEntries) {
for (const FieldEntry &fe : qAsConst(d->fieldEntries)) {
const QString value = fe.lineEdit->text().trimmed();
if (!value.isEmpty()) {
rc += fe.combo->currentText();

5
src/plugins/vcsbase/vcsbaseclient.cpp
View File

@@ -63,7 +63,8 @@ using namespace Utils;
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)
return Core::DocumentModel::editorsForDocument(document).constFirst();
return nullptr;
@@ -625,7 +626,7 @@ void VcsBaseClient::statusParser(const QString &text)
QStringList rawStatusList = text.split(QLatin1Char('\n'));
foreach (const QString &string, rawStatusList) {
for (const QString &string : qAsConst(rawStatusList)) {
const VcsBaseClient::StatusItem lineInfo = parseStatusLine(string);
if (!lineInfo.flags.isEmpty() && !lineInfo.file.isEmpty())
lineInfoList.append(lineInfo);

9
src/plugins/vcsbase/vcsbaseeditor.cpp
View File

@@ -308,7 +308,7 @@ void ChangeTextCursorHandler::fillContextMenu(QMenu *menu, EditorContentType typ
menu->addAction(createAnnotateAction(widget->decorateVersion(m_currentChange), false));
const QStringList previousVersions = widget->annotationPreviousVersions(m_currentChange);
if (!previousVersions.isEmpty()) {
foreach (const QString &pv, previousVersions)
for (const QString &pv : previousVersions)
menu->addAction(createAnnotateAction(widget->decorateVersion(pv), true));
}
break;
@@ -592,7 +592,7 @@ VcsBaseEditorWidgetPrivate::VcsBaseEditorWidgetPrivate(VcsBaseEditorWidget *edit
AbstractTextCursorHandler *VcsBaseEditorWidgetPrivate::findTextCursorHandler(const QTextCursor &cursor)
{
foreach (AbstractTextCursorHandler *handler, m_textCursorHandlers) {
for (AbstractTextCursorHandler *handler : qAsConst(m_textCursorHandlers)) {
if (handler->findContentsUnderCursor(cursor))
return handler;
}
@@ -1384,7 +1384,7 @@ QString VcsBaseEditor::getTitleId(const FilePath &workingDirectory,
const QString &revision)
{
QStringList nonEmptyFileNames;
foreach (const QString& fileName, fileNames) {
for (const QString& fileName : fileNames) {
if (!fileName.trimmed().isEmpty())
nonEmptyFileNames.append(fileName);
}
@@ -1669,7 +1669,8 @@ void VcsBaseEditor::tagEditor(Core::IEditor *e, 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);
if (tagPropertyValue.type() == QVariant::String && tagPropertyValue.toString() == tag)
return Core::DocumentModel::editorsForDocument(document).constFirst();

4
src/plugins/vcsbase/vcsbaseeditorconfig.cpp
View File

@@ -163,7 +163,7 @@ QStringList VcsBaseEditorConfig::arguments() const
{
// Compile effective arguments
QStringList args = baseArguments();
foreach (const OptionMapping &mapping, optionMappings())
for (const OptionMapping &mapping : optionMappings())
args += argumentsForOption(mapping);
return args;
}
@@ -332,7 +332,7 @@ QStringList VcsBaseEditorConfig::argumentsForOption(const OptionMapping &mapping
void VcsBaseEditorConfig::updateMappedSettings()
{
foreach (const OptionMapping &optMapping, d->m_optionMappings) {
for (const OptionMapping &optMapping : optionMappings()) {
if (d->m_settingMapping.contains(optMapping.object)) {
Internal::SettingMappingData& settingData = d->m_settingMapping[optMapping.object];
switch (settingData.type()) {

2
src/plugins/vcsbase/vcsbasesubmiteditor.cpp
View File

@@ -263,7 +263,7 @@ static inline QStringList fieldTexts(const QString &fileContents)
{
QStringList rc;
const QStringList rawFields = fileContents.trimmed().split(QLatin1Char('\n'));
foreach (const QString &field, rawFields) {
for (const QString &field : rawFields) {
const QString trimmedField = field.trimmed();
if (!trimmedField.isEmpty())
rc.push_back(trimmedField);

10
src/plugins/vcsbase/wizard/vcscommandpage.cpp
View File

@@ -98,7 +98,8 @@ WizardPage *VcsCommandPageFactory::create(JsonWizard *wizard, Id typeId, const Q
tmp.value(QLatin1String(VCSCOMMAND_CHECKOUTNAME)).toString(),
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 bool skipEmpty = job.value(QLatin1String(JOB_SKIP_EMPTY), true).toBool();
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));
}
foreach (const QVariant &j, jobs.toList()) {
const QVariantList jobList = jobs.toList();
for (const QVariant &j : jobList) {
if (j.isNull()) {
em = tr("Job in \"VcsCommand\" page is empty.");
break;
@@ -277,7 +279,7 @@ void VcsCommandPage::delayedInitialize()
setStartedStatus(runMessage);
QStringList extraArgs;
foreach (const QString &in, m_arguments) {
for (const QString &in : qAsConst(m_arguments)) {
const QString tmp = wiz->expander()->expand(in);
if (tmp.isEmpty())
continue;
@@ -290,7 +292,7 @@ void VcsCommandPage::delayedInitialize()
= vc->createInitialCheckoutCommand(repo, FilePath::fromString(base),
name, extraArgs);
foreach (const JobData &job, m_additionalJobs) {
for (const JobData &job : qAsConst(m_additionalJobs)) {
QTC_ASSERT(!job.job.isEmpty(), continue);
if (!JsonWizard::boolFromVariant(job.condition, wiz->expander()))