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

Utils: Replace foreach with range-based for

Browse Source 
Change-Id: I9aeea9c029ffc56cbadc04edd20e9b35b154f986
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Orgad Shaneh
2020-06-13 23:39:57 +03:00
committed by Orgad Shaneh
parent afd6eeed3f
commit 51453936cc
34 changed files with 104 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libs/utils/basetreeview.cpp
View File

@@ -208,8 +208,9 @@ public:
+ 2 * fm.horizontalAdvance(QLatin1Char('m'));
considerItems(column, q->indexAt(QPoint(1, 1)), &minimum, false);
QVariant extraIndices = m->data(QModelIndex(), BaseTreeView::ExtraIndicesForColumnWidth);
foreach (const QModelIndex &a, extraIndices.value<QModelIndexList>())
const QVariant extraIndices = m->data(QModelIndex(), BaseTreeView::ExtraIndicesForColumnWidth);
const QList<QModelIndex> values = extraIndices.value<QModelIndexList>();
for (const QModelIndex &a : values)
considerItems(column, a, &minimum, true);
return minimum;

8
src/libs/utils/buildablehelperlibrary.cpp
View File

@@ -195,7 +195,7 @@ bool BuildableHelperLibrary::copyFiles(const QString &sourcePath,
*errorMessage = QCoreApplication::translate("ProjectExplorer::DebuggingHelperLibrary", "The target directory %1 could not be created.").arg(targetDirectory);
return false;
}
foreach (const QString &file, files) {
for (const QString &file : files) {
const QString source = sourcePath + file;
const QString dest = targetDirectory + file;
const QFileInfo destInfo(dest);
@@ -347,7 +347,7 @@ bool BuildableHelperLibrary::getHelperFileInfoFor(const QStringList &validBinary
if (!info)
return false;
foreach (const QString &binaryFilename, validBinaryFilenames) {
for (const QString &binaryFilename : validBinaryFilenames) {
info->setFile(directory + binaryFilename);
if (info->exists())
return true;
@@ -365,7 +365,7 @@ QString BuildableHelperLibrary::byInstallDataHelper(const QString &sourcePath,
// find the latest change to the sources
QDateTime sourcesModified;
if (!acceptOutdatedHelper) {
foreach (const QString &sourceFileName, sourceFileNames) {
for (const QString &sourceFileName : sourceFileNames) {
const QDateTime fileModified = QFileInfo(sourcePath + sourceFileName).lastModified();
if (fileModified.isValid() && (!sourcesModified.isValid() || fileModified > sourcesModified))
sourcesModified = fileModified;
@@ -383,7 +383,7 @@ QString BuildableHelperLibrary::byInstallDataHelper(const QString &sourcePath,
QString newestHelper;
QDateTime newestHelperModified = sourcesModified; // prevent using one that's older than the sources
QFileInfo fileInfo;
foreach (const QString &installDirectory, installDirectories) {
for (const QString &installDirectory : installDirectories) {
if (getHelperFileInfoFor(validBinaryFilenames, installDirectory, &fileInfo)) {
if (!newestHelperModified.isValid()
|| (fileInfo.lastModified() > newestHelperModified)) {

6
src/libs/utils/checkablemessagebox.cpp
View File

@@ -281,7 +281,8 @@ QPushButton *CheckableMessageBox::addButton(const QString &text, QDialogButtonBo
QDialogButtonBox::StandardButton CheckableMessageBox::defaultButton() const
{
foreach (QAbstractButton *b, d->buttonBox->buttons())
const QList<QAbstractButton *> buttons = d->buttonBox->buttons();
for (QAbstractButton *b : buttons)
if (auto *pb = qobject_cast<QPushButton *>(b))
if (pb->isDefault())
return d->buttonBox->standardButton(pb);
@@ -464,7 +465,8 @@ bool CheckableMessageBox::hasSuppressedQuestions(QSettings *settings)
QTC_ASSERT(settings, return false);
bool hasSuppressed = false;
settings->beginGroup(QLatin1String(kDoNotAskAgainKey));
foreach (const QString &subKey, settings->childKeys()) {
const QStringList childKeys = settings->childKeys();
for (const QString &subKey : childKeys) {
if (settings->value(subKey, false).toBool()) {
hasSuppressed = true;
break;

2
src/libs/utils/codegeneration.cpp
View File

@@ -86,7 +86,7 @@ static void qtSection(const QStringList &qtIncludes, QTextStream &str)
{
QStringList sorted = qtIncludes;
Utils::sort(sorted);
foreach (const QString &inc, sorted) {
for (const QString &inc : qAsConst(sorted)) {
if (!inc.isEmpty())
str << QStringLiteral("#include <%1>\n").arg(inc);
}

2
src/libs/utils/consoleprocess.cpp
View File

@@ -301,7 +301,7 @@ static QString quoteWinArgument(const QString &arg)
QString createWinCommandline(const QString &program, const QStringList &args)
{
QString programName = quoteWinCommand(program);
foreach (const QString &arg, args) {
for (const QString &arg : args) {
programName += QLatin1Char(' ');
programName += quoteWinArgument(arg);
}

6
src/libs/utils/fancymainwindow.cpp
View File

@@ -475,9 +475,9 @@ void FancyMainWindow::saveSettings(QSettings *settings) const
void FancyMainWindow::restoreSettings(const QSettings *settings)
{
QHash<QString, QVariant> hash;
foreach (const QString &key, settings->childKeys()) {
const QStringList childKeys = settings->childKeys();
for (const QString &key : childKeys)
hash.insert(key, settings->value(key));
}
restoreSettings(hash);
}
@@ -552,7 +552,7 @@ void FancyMainWindow::addDockActionsToMenu(QMenu *menu)
QTC_ASSERT(action2, return false);
return stripAccelerator(action1->text()).toLower() < stripAccelerator(action2->text()).toLower();
});
foreach (QAction *action, actions)
for (QAction *action : qAsConst(actions))
menu->addAction(action);
menu->addAction(&d->m_showCentralWidget);
menu->addAction(&d->m_menuSeparator1);

2
src/libs/utils/fileinprojectfinder.cpp
View File

@@ -386,7 +386,7 @@ FileInProjectFinder::CacheEntry FileInProjectFinder::findInSearchPath(
QStringList FileInProjectFinder::filesWithSameFileName(const QString &fileName) const
{
QStringList result;
foreach (const FilePath &f, m_projectFiles) {
for (const FilePath &f : m_projectFiles) {
if (f.fileName() == fileName)
result << f.toString();
}

2
src/libs/utils/filenamevalidatinglineedit.cpp
View File

@@ -167,7 +167,7 @@ bool FileNameValidatingLineEdit::validateFileNameExtension(const QString &fileNa
{
// file extension
if (!requiredExtensions.isEmpty()) {
foreach (const QString &requiredExtension, requiredExtensions) {
for (const QString &requiredExtension : requiredExtensions) {
QString extension = QLatin1Char('.') + requiredExtension;
if (fileName.endsWith(extension, Qt::CaseSensitive) && extension.count() < fileName.count())
return true;

8
src/libs/utils/filesystemwatcher.cpp
View File

@@ -282,7 +282,7 @@ void FileSystemWatcher::addFiles(const QStringList &files, WatchMode wm)
<< " limit currently: " << (d->m_files.size() + d->m_directories.size())
<< " of " << d->m_staticData->maxFileOpen;
QStringList toAdd;
foreach (const QString &file, files) {
for (const QString &file : files) {
if (watchesFile(file)) {
qWarning("FileSystemWatcher: File %s is already being watched", qPrintable(file));
continue;
@@ -324,7 +324,7 @@ void FileSystemWatcher::removeFiles(const QStringList &files)
if (debug)
qDebug() << this << d->m_id << "removeFiles " << files;
QStringList toRemove;
foreach (const QString &file, files) {
for (const QString &file : files) {
WatchEntryMapIterator it = d->m_files.find(file);
if (it == d->m_files.end()) {
qWarning("FileSystemWatcher: File %s is not watched.", qPrintable(file));
@@ -372,7 +372,7 @@ void FileSystemWatcher::addDirectories(const QStringList &directories, WatchMode
<< " limit currently: " << (d->m_files.size() + d->m_directories.size())
<< " of " << d->m_staticData->maxFileOpen;
QStringList toAdd;
foreach (const QString &directory, directories) {
for (const QString &directory : directories) {
if (watchesDirectory(directory)) {
qWarning("FileSystemWatcher: Directory %s is already being watched.", qPrintable(directory));
continue;
@@ -408,7 +408,7 @@ void FileSystemWatcher::removeDirectories(const QStringList &directories)
qDebug() << this << d->m_id << "removeDirectories" << directories;
QStringList toRemove;
foreach (const QString &directory, directories) {
for (const QString &directory : directories) {
WatchEntryMapIterator it = d->m_directories.find(directory);
if (it == d->m_directories.end()) {
qWarning("FileSystemWatcher: Directory %s is not watched.", qPrintable(directory));

12
src/libs/utils/fileutils.cpp
View File

@@ -160,9 +160,9 @@ bool FileUtils::removeRecursively(const FilePath &filePath, QString *error)
return false;
}
QStringList fileNames = dir.entryList(QDir::Files | QDir::Hidden
| QDir::System | QDir::Dirs | QDir::NoDotAndDotDot);
foreach (const QString &fileName, fileNames) {
const QStringList fileNames = dir.entryList(
QDir::Files | QDir::Hidden | QDir::System | QDir::Dirs | QDir::NoDotAndDotDot);
for (const QString &fileName : fileNames) {
if (!removeRecursively(filePath / fileName, error))
return false;
}
@@ -219,9 +219,9 @@ bool FileUtils::copyRecursively(const FilePath &srcFilePath, const FilePath &tgt
}
}
QDir sourceDir(srcFilePath.toString());
QStringList fileNames = sourceDir.entryList(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot
| QDir::Hidden | QDir::System);
foreach (const QString &fileName, fileNames) {
const QStringList fileNames = sourceDir.entryList(
QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot | QDir::Hidden | QDir::System);
for (const QString &fileName : fileNames) {
const FilePath newSrcFilePath = srcFilePath / fileName;
const FilePath newTgtFilePath = tgtFilePath / fileName;
if (!copyRecursively(newSrcFilePath, newTgtFilePath, error, copyHelper))

6
src/libs/utils/flowlayout.cpp
View File

@@ -117,8 +117,7 @@ QSize FlowLayout::sizeHint() const
QSize FlowLayout::minimumSize() const
{
QSize size;
QLayoutItem *item;
foreach (item, itemList)
for (QLayoutItem *item : itemList)
size = size.expandedTo(item->minimumSize());
int left, top, right, bottom;
@@ -136,8 +135,7 @@ int FlowLayout::doLayout(const QRect &rect, bool testOnly) const
int y = effectiveRect.y();
int lineHeight = 0;
QLayoutItem *item;
foreach (item, itemList) {
for (QLayoutItem *item : itemList) {
QWidget *wid = item->widget();
int spaceX = horizontalSpacing();
if (spaceX == -1)

17
src/libs/utils/json.cpp
View File

@@ -36,7 +36,7 @@ using namespace Utils;
JsonMemoryPool::~JsonMemoryPool()
{
foreach (char *obj, _objs) {
for (char *obj : qAsConst(_objs)) {
reinterpret_cast<JsonValue *>(obj)->~JsonValue();
delete[] obj;
}
@@ -92,7 +92,8 @@ JsonValue *JsonValue::build(const QVariant &variant, JsonMemoryPool *pool)
case QVariant::List: {
auto newValue = new (pool) JsonArrayValue;
foreach (const QVariant &element, variant.toList())
const QList<QVariant> list = variant.toList();
for (const QVariant &element : list)
newValue->addElement(build(element, pool));
return newValue;
}
@@ -204,7 +205,8 @@ QStringList JsonSchema::validTypes(JsonObjectValue *v)
return validTypes(ov);
if (JsonArrayValue *av = getArrayValue(kType(), v)) {
foreach (JsonValue *v, av->elements()) {
const QList<JsonValue *> elements = av->elements();
for (JsonValue *v : elements) {
if (JsonStringValue *sv = v->toString())
all.append(sv->value());
else if (JsonObjectValue *ov = v->toObject())
@@ -665,19 +667,20 @@ JsonDoubleValue *JsonSchema::getDoubleValue(const QString &name, JsonObjectValue
JsonSchemaManager::JsonSchemaManager(const QStringList &searchPaths)
: m_searchPaths(searchPaths)
{
foreach (const QString &path, m_searchPaths) {
for (const QString &path : searchPaths) {
QDir dir(path);
if (!dir.exists())
continue;
dir.setNameFilters(QStringList(QLatin1String("*.json")));
foreach (const QFileInfo &fi, dir.entryInfoList())
const QList<QFileInfo> entries = dir.entryInfoList();
for (const QFileInfo &fi : entries)
m_schemas.insert(fi.baseName(), JsonSchemaData(fi.absoluteFilePath()));
}
}
JsonSchemaManager::~JsonSchemaManager()
{
foreach (const JsonSchemaData &schemaData, m_schemas)
for (const JsonSchemaData &schemaData : qAsConst(m_schemas))
delete schemaData.m_schema;
}
@@ -701,7 +704,7 @@ JsonSchema *JsonSchemaManager::schemaByName(const QString &baseName) const
{
QHash<QString, JsonSchemaData>::iterator it = m_schemas.find(baseName);
if (it == m_schemas.end()) {
foreach (const QString &path, m_searchPaths) {
for (const QString &path : m_searchPaths) {
QFileInfo candidate(path + baseName + ".json");
if (candidate.exists()) {
m_schemas.insert(baseName, candidate.absoluteFilePath());

2
src/libs/utils/listutils.h
View File

@@ -33,7 +33,7 @@ template <class T1, class T2>
QList<T1> qwConvertList(const QList<T2> &list)
{
QList<T1> convertedList;
foreach (T2 listEntry, list) {
for (T2 listEntry : list) {
convertedList << qobject_cast<T1>(listEntry);
}
return convertedList;

4
src/libs/utils/mapreduce.h
View File

@@ -149,7 +149,7 @@ protected:
return;
const double progressPerMap = MAX_PROGRESS / double(m_size);
double progress = m_successfullyFinishedMapCount * progressPerMap;
foreach (const QFutureWatcher<MapResult> *watcher, m_mapWatcher) {
for (const QFutureWatcher<MapResult> *watcher : qAsConst(m_mapWatcher)) {
if (watcher->progressMinimum() != watcher->progressMaximum()) {
const double range = watcher->progressMaximum() - watcher->progressMinimum();
progress += (watcher->progressValue() - watcher->progressMinimum()) / range * progressPerMap;
@@ -160,7 +160,7 @@ protected:
void cancelAll()
{
foreach (QFutureWatcher<MapResult> *watcher, m_mapWatcher)
for (QFutureWatcher<MapResult> *watcher : qAsConst(m_mapWatcher))
watcher->cancel();
}

15
src/libs/utils/mimetypes/mimedatabase.cpp
View File

@@ -207,7 +207,7 @@ MimeType MimeDatabasePrivate::mimeTypeForFileNameAndData(const QString &fileName
return candidateByData;
}
// If there is a glob match that is a sub class of sniffedMime, use it
foreach (const QString &m, candidatesByName) {
for (const QString &m : qAsConst(candidatesByName)) {
if (inherits(m, sniffedMime)) {
// We have magic + pattern pointing to this, so it's a pretty good match
*accuracyPtr = 100;
@@ -247,7 +247,8 @@ bool MimeDatabasePrivate::inherits(const QString &mime, const QString &parent)
const QString current = toCheck.pop();
if (current == resolvedParent)
return true;
foreach (const QString &par, provider()->parents(current)) {
const QStringList parents = provider()->parents(current);
for (const QString &par : parents) {
int seenSize = seen.size();
seen.insert(par);
if (seen.size() != seenSize) // haven't seen before, so add
@@ -348,13 +349,14 @@ QString Utils::allFiltersString(QString *allFilesFilter)
{
MimeDatabase mdb;
QSet<QString> uniqueFilters;
foreach (const MimeType &mt, mdb.allMimeTypes()) {
const QList<MimeType> allMimeTypes = mdb.allMimeTypes();
for (const MimeType &mt : allMimeTypes) {
const QString &filterString = mt.filterString();
if (!filterString.isEmpty())
uniqueFilters.insert(mt.filterString());
}
QStringList filters;
foreach (const QString &filter, uniqueFilters)
for (const QString &filter : uniqueFilters)
filters.append(filter);
filters.sort();
const QString allFiles = allFilesFilterString();
@@ -384,7 +386,8 @@ QStringList Utils::allGlobPatterns()
MimeDatabase mdb;
QStringList patterns;
foreach (const MimeType &mt, mdb.allMimeTypes())
const QList<MimeType> allMimeTypes = mdb.allMimeTypes();
for (const MimeType &mt : allMimeTypes)
patterns.append(mt.globPatterns());
return patterns;
}
@@ -522,7 +525,7 @@ QList<MimeType> MimeDatabase::mimeTypesForFileName(const QString &fileName) cons
QStringList matches = d->mimeTypeForFileName(fileName);
QList<MimeType> mimes;
matches.sort(); // Make it deterministic
foreach (const QString &mime, matches)
for (const QString &mime : qAsConst(matches))
mimes.append(d->mimeTypeForName(mime));
return mimes;
}

9
src/libs/utils/mimetypes/mimeglobpattern.cpp
View File

@@ -191,11 +191,7 @@ void MimeAllGlobPatterns::removeMimeType(const QString &mimeType)
void MimeGlobPatternList::match(MimeGlobMatchResult &result,
const QString &fileName) const
{
MimeGlobPatternList::const_iterator it = this->constBegin();
const MimeGlobPatternList::const_iterator endIt = this->constEnd();
for (; it != endIt; ++it) {
const MimeGlobPattern &glob = *it;
for (const MimeGlobPattern &glob : *this) {
if (glob.matchFileName(fileName))
result.addMatch(glob.mimeType(), glob.weight(), glob.pattern());
}
@@ -217,9 +213,8 @@ QStringList MimeAllGlobPatterns::matchingGlobs(const QString &fileName, QString
// (toLower because fast patterns are always case-insensitive and saved as lowercase)
const QStringList matchingMimeTypes = m_fastPatterns.value(simpleExtension);
foreach (const QString &mime, matchingMimeTypes) {
for (const QString &mime : matchingMimeTypes)
result.addMatch(mime, 50, QLatin1String("*.") + simpleExtension);
}
// Can't return yet; *.tar.bz2 has to win over *.bz2, so we need the low-weight mimetypes anyway,
// at least those with weight 50.
}

2
src/libs/utils/mimetypes/mimemagicrulematcher.cpp
View File

@@ -88,7 +88,7 @@ QList<MimeMagicRule> MimeMagicRuleMatcher::magicRules() const
// Check for a match on contents of a file
bool MimeMagicRuleMatcher::matches(const QByteArray &data) const
{
foreach (const MimeMagicRule &magicRule, m_list) {
for (const MimeMagicRule &magicRule : m_list) {
if (magicRule.matches(data))
return true;
}

26
src/libs/utils/mimetypes/mimeprovider.cpp
View File

@@ -243,7 +243,7 @@ bool MimeProviderBase::shouldCheck()
// // Then check if new cache files appeared
// const QStringList cacheFileNames = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QLatin1String("mime/mime.cache"));
// if (cacheFileNames != m_cacheFileNames) {
// foreach (const QString &cacheFileName, cacheFileNames) {
// for (const QString &cacheFileName : cacheFileNames) {
// CacheFile *cacheFile = m_cacheFiles.findCacheFile(cacheFileName);
// if (!cacheFile) {
// //qDebug() << "new file:" << cacheFileName;
@@ -288,7 +288,7 @@ bool MimeProviderBase::shouldCheck()
// const QString lowerFileName = fileName.toLower();
// MimeGlobMatchResult result;
// // TODO this parses in the order (local, global). Check that it handles "NOGLOBS" correctly.
// foreach (CacheFile *cacheFile, m_cacheFiles) {
// for (CacheFile *cacheFile : qAsConst(m_cacheFiles)) {
// matchGlobList(result, cacheFile, cacheFile->getUint32(PosLiteralListOffset), fileName);
// matchGlobList(result, cacheFile, cacheFile->getUint32(PosGlobListOffset), fileName);
// const int reverseSuffixTreeOffset = cacheFile->getUint32(PosReverseSuffixTreeOffset);
@@ -400,7 +400,7 @@ bool MimeProviderBase::shouldCheck()
//MimeType MimeBinaryProvider::findByMagic(const QByteArray &data, int *accuracyPtr)
//{
// checkCache();
// foreach (CacheFile *cacheFile, m_cacheFiles) {
// for (CacheFile *cacheFile : qAsConst(m_cacheFiles)) {
// const int magicListOffset = cacheFile->getUint32(PosMagicListOffset);
// const int numMatches = cacheFile->getUint32(magicListOffset);
// //const int maxExtent = cacheFile->getUint32(magicListOffset + 4);
@@ -428,7 +428,7 @@ bool MimeProviderBase::shouldCheck()
// checkCache();
// const QByteArray mimeStr = mime.toLatin1();
// QStringList result;
// foreach (CacheFile *cacheFile, m_cacheFiles) {
// for (CacheFile *cacheFile : qAsConst(m_cacheFiles)) {
// const int parentListOffset = cacheFile->getUint32(PosParentListOffset);
// const int numEntries = cacheFile->getUint32(parentListOffset);
@@ -468,7 +468,7 @@ bool MimeProviderBase::shouldCheck()
//{
// checkCache();
// const QByteArray input = name.toLatin1();
// foreach (CacheFile *cacheFile, m_cacheFiles) {
// for (CacheFile *cacheFile : qAsConst(m_cacheFiles)) {
// const int aliasListOffset = cacheFile->getUint32(PosAliasListOffset);
// const int numEntries = cacheFile->getUint32(aliasListOffset);
// int begin = 0;
@@ -499,7 +499,7 @@ bool MimeProviderBase::shouldCheck()
// checkCache();
// QStringList result;
// const QByteArray input = name.toLatin1();
// foreach (CacheFile *cacheFile, m_cacheFiles) {
// for (CacheFile *cacheFile : qAsConst(m_cacheFiles)) {
// const int aliasListOffset = cacheFile->getUint32(PosAliasListOffset);
// const int numEntries = cacheFile->getUint32(aliasListOffset);
// for (int pos = 0; pos < numEntries; ++pos) {
@@ -525,7 +525,7 @@ bool MimeProviderBase::shouldCheck()
// // Unfortunately mime.cache doesn't have a full list of all mimetypes.
// // So we have to parse the plain-text files called "types".
// const QStringList typesFilenames = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QLatin1String("mime/types"));
// foreach (const QString &typeFilename, typesFilenames) {
// for (const QString &typeFilename : typesFilenames) {
// QFile file(typeFilename);
// if (file.open(QIODevice::ReadOnly)) {
// while (!file.atEnd()) {
@@ -677,7 +677,7 @@ bool MimeProviderBase::shouldCheck()
//{
// checkCache();
// const QByteArray inputMime = data.name.toLatin1();
// foreach (CacheFile *cacheFile, m_cacheFiles) {
// for (CacheFile *cacheFile : qAsConst(m_cacheFiles)) {
// const QString icon = iconForMime(cacheFile, PosIconsListOffset, inputMime);
// if (!icon.isEmpty()) {
// data.iconName = icon;
@@ -690,7 +690,7 @@ bool MimeProviderBase::shouldCheck()
//{
// checkCache();
// const QByteArray inputMime = data.name.toLatin1();
// foreach (CacheFile *cacheFile, m_cacheFiles) {
// for (CacheFile *cacheFile : qAsConst(m_cacheFiles)) {
// const QString icon = iconForMime(cacheFile, PosGenericIconsListOffset, inputMime);
// if (!icon.isEmpty()) {
// data.genericIconName = icon;
@@ -732,7 +732,7 @@ MimeType MimeXMLProvider::findByMagic(const QByteArray &data, int *accuracyPtr)
QString candidate;
foreach (const MimeMagicRuleMatcher &matcher, m_magicMatchers) {
for (const MimeMagicRuleMatcher &matcher : qAsConst(m_magicMatchers)) {
if (matcher.matches(data)) {
const int priority = matcher.priority();
if (priority > *accuracyPtr) {
@@ -747,7 +747,7 @@ MimeType MimeXMLProvider::findByMagic(const QByteArray &data, int *accuracyPtr)
QMap<int, QList<MimeMagicRule> > MimeXMLProvider::magicRulesForMimeType(const MimeType &mimeType)
{
QMap<int, QList<MimeMagicRule> > result;
foreach (const MimeMagicRuleMatcher &matcher, m_magicMatchers) {
for (const MimeMagicRuleMatcher &matcher : qAsConst(m_magicMatchers)) {
if (mimeType.matchesName(matcher.mimetype()))
result[matcher.priority()].append(matcher.magicRules());
}
@@ -759,7 +759,7 @@ void MimeXMLProvider::setGlobPatternsForMimeType(const MimeType &mimeType, const
// remove all previous globs
m_mimeTypeGlobs.removeMimeType(mimeType.name());
// add new patterns as case-insensitive default-weight patterns
foreach (const QString &pattern, patterns)
for (const QString &pattern : patterns)
addGlobPattern(MimeGlobPattern(pattern, mimeType.name()));
mimeType.d->globPatterns = patterns;
}
@@ -811,7 +811,7 @@ void MimeXMLProvider::ensureLoaded()
}
}
foreach (const QString &file, allFiles)
for (const QString &file : qAsConst(allFiles))
load(file);
}
}

9
src/libs/utils/mimetypes/mimetype.cpp
View File

@@ -308,17 +308,16 @@ QStringList MimeType::parentMimeTypes() const
static void collectParentMimeTypes(const QString &mime, QStringList &allParents)
{
QStringList parents = MimeDatabasePrivate::instance()->provider()->parents(mime);
foreach (const QString &parent, parents) {
const QStringList parents = MimeDatabasePrivate::instance()->provider()->parents(mime);
for (const QString &parent : parents) {
// I would use QSet, but since order matters I better not
if (!allParents.contains(parent))
allParents.append(parent);
}
// We want a breadth-first search, so that the least-specific parent (octet-stream) is last
// This means iterating twice, unfortunately.
foreach (const QString &parent, parents) {
for (const QString &parent : parents)
collectParentMimeTypes(parent, allParents);
}
}
/*!
@@ -364,7 +363,7 @@ QStringList MimeType::suffixes() const
MimeDatabasePrivate::instance()->provider()->loadMimeTypePrivate(*d);
QStringList result;
foreach (const QString &pattern, d->globPatterns) {
for (const QString &pattern : d->globPatterns) {
const QString suffix = suffixFromPattern(pattern);
if (!suffix.isEmpty())
result.append(suffix);

2
src/libs/utils/namevaluemodel.cpp
View File

@@ -48,7 +48,7 @@ public:
m_resultNameValueDictionary.modify(m_items);
// Add removed variables again and mark them as "<UNSET>" so
// that the user can actually see those removals:
foreach (const NameValueItem &item, m_items) {
for (const NameValueItem &item : qAsConst(m_items)) {
if (item.operation == NameValueItem::Unset)
m_resultNameValueDictionary.set(item.name, NameValueModel::tr("<UNSET>"));
}

6
src/libs/utils/persistentsettings.cpp
View File

@@ -374,15 +374,17 @@ static void writeVariantValue(QXmlStreamWriter &w, const Context &ctx,
{
switch (static_cast<int>(variant.type())) {
case static_cast<int>(QVariant::StringList):
case static_cast<int>(QVariant::List):
case static_cast<int>(QVariant::List): {
w.writeStartElement(ctx.valueListElement);
w.writeAttribute(ctx.typeAttribute, QLatin1String(QVariant::typeToName(QVariant::List)));
if (!key.isEmpty())
w.writeAttribute(ctx.keyAttribute, key);
foreach (const QVariant &var, variant.toList())
const QList<QVariant> list = variant.toList();
for (const QVariant &var : list)
writeVariantValue(w, ctx, var);
w.writeEndElement();
break;
}
case static_cast<int>(QVariant::Map): {
w.writeStartElement(ctx.valueMapElement);
w.writeAttribute(ctx.typeAttribute, QLatin1String(QVariant::typeToName(QVariant::Map)));

6
src/libs/utils/portlist.cpp
View File

@@ -164,7 +164,7 @@ bool PortList::hasMore() const { return !d->ranges.isEmpty(); }
bool PortList::contains(Port port) const
{
foreach (const Internal::Range &r, d->ranges) {
for (const Internal::Range &r : d->ranges) {
if (port >= r.first && port <= r.second)
return true;
}
@@ -174,7 +174,7 @@ bool PortList::contains(Port port) const
int PortList::count() const
{
int n = 0;
foreach (const Internal::Range &r, d->ranges)
for (const Internal::Range &r : d->ranges)
n += r.second.number() - r.first.number() + 1;
return n;
}
@@ -194,7 +194,7 @@ Port PortList::getNext()
QString PortList::toString() const
{
QString stringRep;
foreach (const Internal::Range &range, d->ranges) {
for (const Internal::Range &range : d->ranges) {
stringRep += QString::number(range.first.number());
if (range.second != range.first)
stringRep += QLatin1Char('-') + QString::number(range.second.number());

4
src/libs/utils/qtcprocess.cpp
View File

@@ -626,7 +626,7 @@ void QtcProcess::addArg(QString *args, const QString &arg, OsType osType)
QString QtcProcess::joinArgs(const QStringList &args, OsType osType)
{
QString ret;
foreach (const QString &arg, args)
for (const QString &arg : args)
addArg(&ret, arg, osType);
return ret;
}
@@ -642,7 +642,7 @@ void QtcProcess::addArgs(QString *args, const QString &inArgs)
void QtcProcess::addArgs(QString *args, const QStringList &inArgs)
{
foreach (const QString &arg, inArgs)
for (const QString &arg : inArgs)
addArg(args, arg);
}

7
src/libs/utils/savedaction.cpp
View File

@@ -333,7 +333,8 @@ void SavedAction::actionTriggered(bool)
setValue(isChecked());
if (actionGroup() && actionGroup()->isExclusive()) {
// FIXME: should be taken care of more directly
foreach (QAction *act, actionGroup()->actions())
const QList<QAction *> actions = actionGroup()->actions();
for (QAction *act : actions)
if (auto dact = qobject_cast<SavedAction *>(act))
dact->setValue(bool(act == this));
}
@@ -360,13 +361,13 @@ void SavedActionSet::insert(SavedAction *action, QWidget *widget)
void SavedActionSet::apply(QSettings *settings)
{
foreach (SavedAction *action, m_list)
for (SavedAction *action : qAsConst(m_list))
action->apply(settings);
}
void SavedActionSet::finish()
{
foreach (SavedAction *action, m_list)
for (SavedAction *action : qAsConst(m_list))
action->disconnectWidget();
}

2
src/libs/utils/settingsaccessor.cpp
View File

@@ -406,7 +406,7 @@ QString VersionUpgrader::backupExtension() const
*/
QVariantMap VersionUpgrader::renameKeys(const QList<Change> &changes, QVariantMap map) const
{
foreach (const Change &change, changes) {
for (const Change &change : changes) {
QVariantMap::iterator oldSetting = map.find(change.first);
if (oldSetting != map.end()) {
map.insert(change.second, oldSetting.value());

4
src/libs/utils/settingsutils.h
View File

@@ -39,8 +39,8 @@ void fromSettings(const QString &postFix,
SettingsClassT *obj)
{
QVariantMap map;
const QStringList &keys = s->allKeys();
foreach (const QString &key, keys)
const QStringList keys = s->allKeys();
for (const QString &key : keys)
map.insert(key, s->value(key));
QString group = postFix;

2
src/libs/utils/stringutils.cpp
View File

@@ -261,7 +261,7 @@ QTCREATOR_UTILS_EXPORT bool readMultiLineString(const QJsonValue &value, QString
} else if (value.isArray()) {
QJsonArray array = value.toArray();
QStringList lines;
foreach (const QJsonValue &v, array) {
for (const QJsonValue &v : array) {
if (!v.isString())
return false;
lines.append(v.toString());

3
src/libs/utils/styledbar.cpp
View File

@@ -53,7 +53,8 @@ void StyledBar::setLightColored(bool lightColored)
if (isLightColored() == lightColored)
return;
setProperty("lightColored", lightColored);
foreach (QWidget *childWidget, findChildren<QWidget *>())
const QList<QWidget *> children = findChildren<QWidget *>();
for (QWidget *childWidget : children)
childWidget->style()->polish(childWidget);
}

3
src/libs/utils/stylehelper.cpp
View File

@@ -187,7 +187,8 @@ void StyleHelper::setBaseColor(const QColor &newcolor)
if (color.isValid() && color != m_baseColor) {
m_baseColor = color;
foreach (QWidget *w, QApplication::topLevelWidgets())
const QList<QWidget *> widgets = QApplication::topLevelWidgets();
for (QWidget *w : widgets)
w->update();
}
}

3
src/libs/utils/textfileformat.cpp
View File

@@ -41,7 +41,8 @@ QDebug operator<<(QDebug d, const TextFileFormat &format)
nsp << "TextFileFormat: ";
if (format.codec) {
nsp << format.codec->name();
foreach (const QByteArray &alias, format.codec->aliases())
const QList<QByteArray> aliases = format.codec->aliases();
for (const QByteArray &alias : aliases)
nsp << ' ' << alias;
} else {
nsp << "NULL";

3
src/libs/utils/theme/theme.cpp
View File

@@ -181,7 +181,8 @@ void Theme::readSettings(QSettings &settings)
}
{
settings.beginGroup(QLatin1String("Palette"));
foreach (const QString &key, settings.allKeys())
const QStringList allKeys = settings.allKeys();
for (const QString &key : allKeys)
d->palette[key] = readNamedColor(settings.value(key).toString()).first;
settings.endGroup();
}

2
src/libs/utils/uncommentselection.cpp
View File

@@ -209,7 +209,7 @@ void Utils::unCommentSelection(QPlainTextEdit *edit, const CommentDefinition &de
}
} else {
const QString text = block.text();
foreach (QChar c, text) {
for (QChar c : text) {
if (!c.isSpace()) {
if (definition.isAfterWhiteSpaces)
cursor.setPosition(block.position() + text.indexOf(c));

6
src/libs/utils/wizard.cpp
View File

@@ -385,9 +385,9 @@ QSet<QString> Wizard::fieldNames() const
QHash<QString, QVariant> Wizard::variables() const
{
QHash<QString, QVariant> result;
foreach (const QString &f, fieldNames()) {
const QSet<QString> fields = fieldNames();
for (const QString &f : fields)
result.insert(f, field(f));
}
return result;
}
@@ -410,7 +410,7 @@ void Wizard::showVariables()
QHash<QString, QVariant> vars = variables();
QList<QString> keys = vars.keys();
sort(keys);
foreach (const QString &key, keys) {
for (const QString &key : qAsConst(keys)) {
const QVariant &v = vars.value(key);
result += QLatin1String(" <tr><td>")
+ key + QLatin1String("</td><td>")

3
src/libs/utils/wizard.h
View File

@@ -55,7 +55,8 @@ public:
template<class T> T *find() const
{
foreach (int id, pageIds()) {
const QList<int> pages = pageIds();
for (int id : pages) {
if (T *result = qobject_cast<T *>(page(id)))
return result;
}