Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions gui/checkthread.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ void CheckThread::run()

void CheckThread::runAddonsAndTools(const Settings& settings, const FileSettings *fileSettings, const QString &fileName)
{
for (const QString& addon : mAddonsAndTools) {
for (const QString& addon : utils::as_const(mAddonsAndTools)) {
if (addon == CLANG_ANALYZER || addon == CLANG_TIDY) {
if (!fileSettings)
continue;
Expand Down Expand Up @@ -303,7 +303,7 @@ void CheckThread::runAddonsAndTools(const Settings& settings, const FileSettings
{
const QString cmd(clangTidyCmd());
QString debug(cmd.contains(" ") ? ('\"' + cmd + '\"') : cmd);
for (const QString& arg : args) {
for (const QString& arg : utils::as_const(args)) {
if (arg.contains(" "))
debug += " \"" + arg + '\"';
else
Expand Down
5 changes: 3 additions & 2 deletions gui/codeeditor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include "codeeditor.h"

#include "codeeditorstyle.h"
#include "utils.h"

#include <QChar>
#include <QColor>
Expand Down Expand Up @@ -133,7 +134,7 @@ Highlighter::Highlighter(QTextDocument *parent,
<< "volatile"
<< "wchar_t"
<< "while";
for (const QString &pattern : keywordPatterns) {
for (const QString &pattern : utils::as_const(keywordPatterns)) {
rule.pattern = QRegularExpression("\\b" + pattern + "\\b");
rule.format = mKeywordFormat;
rule.ruleRole = RuleRole::Keyword;
Expand Down Expand Up @@ -216,7 +217,7 @@ void Highlighter::setStyle(const CodeEditorStyle &newStyle)

void Highlighter::highlightBlock(const QString &text)
{
for (const HighlightingRule &rule : mHighlightingRulesWithSymbols) {
for (const HighlightingRule &rule : utils::as_const(mHighlightingRulesWithSymbols)) {
QRegularExpressionMatchIterator matchIterator = rule.pattern.globalMatch(text);
while (matchIterator.hasNext()) {
QRegularExpressionMatch match = matchIterator.next();
Expand Down
3 changes: 2 additions & 1 deletion gui/compliancereportdialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include "filesettings.h"
#include "importproject.h"
#include "projectfile.h"
#include "utils.h"

#include <algorithm>
#include <iterator>
Expand Down Expand Up @@ -191,7 +192,7 @@ void ComplianceReportDialog::save()
QSet<QString> allFiles;
for (const QString &sourcefile: fileList.getFileList())
addHeaders(sourcefile, allFiles);
for (const QString& fileName: allFiles) {
for (const QString& fileName: utils::as_const(allFiles)) {
QFile f(fileName);
if (f.open(QFile::ReadOnly)) {
QCryptographicHash hash(QCryptographicHash::Algorithm::Md5);
Expand Down
3 changes: 2 additions & 1 deletion gui/helpdialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include "helpdialog.h"

#include "common.h"
#include "utils.h"

#include "ui_helpdialog.h"

Expand Down Expand Up @@ -65,7 +66,7 @@ static QString getHelpFile()
paths << (filesdir + "/help")
<< filesdir;
#endif
for (const QString &p: paths) {
for (const QString &p: utils::as_const(paths)) {
QString filename = p + "/online-help.qhc";
if (QFileInfo::exists(filename))
return filename;
Expand Down
4 changes: 2 additions & 2 deletions gui/librarydialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -292,11 +292,11 @@ void LibraryDialog::filterFunctions(const QString& filter)
QList<QListWidgetItem *> allItems = mUi->functions->findItems(QString(), Qt::MatchContains);

if (filter.isEmpty()) {
for (QListWidgetItem *item : allItems) {
for (QListWidgetItem *item : utils::as_const(allItems)) {
item->setHidden(false);
}
} else {
for (QListWidgetItem *item : allItems) {
for (QListWidgetItem *item : utils::as_const(allItems)) {
item->setHidden(!item->text().startsWith(filter));
}
}
Expand Down
12 changes: 6 additions & 6 deletions gui/projectfile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -892,7 +892,7 @@ bool ProjectFile::write(const QString &filename)

if (!mIncludeDirs.isEmpty()) {
xmlWriter.writeStartElement(CppcheckXml::IncludeDirElementName);
for (const QString& incdir : mIncludeDirs) {
for (const QString& incdir : utils::as_const(mIncludeDirs)) {
xmlWriter.writeStartElement(CppcheckXml::DirElementName);
xmlWriter.writeAttribute(CppcheckXml::DirNameAttrib, incdir);
xmlWriter.writeEndElement();
Expand All @@ -902,7 +902,7 @@ bool ProjectFile::write(const QString &filename)

if (!mDefines.isEmpty()) {
xmlWriter.writeStartElement(CppcheckXml::DefinesElementName);
for (const QString& define : mDefines) {
for (const QString& define : utils::as_const(mDefines)) {
xmlWriter.writeStartElement(CppcheckXml::DefineName);
xmlWriter.writeAttribute(CppcheckXml::DefineNameAttrib, define);
xmlWriter.writeEndElement();
Expand All @@ -924,7 +924,7 @@ bool ProjectFile::write(const QString &filename)

if (!mPaths.isEmpty()) {
xmlWriter.writeStartElement(CppcheckXml::PathsElementName);
for (const QString& path : mPaths) {
for (const QString& path : utils::as_const(mPaths)) {
xmlWriter.writeStartElement(CppcheckXml::PathName);
xmlWriter.writeAttribute(CppcheckXml::PathNameAttrib, path);
xmlWriter.writeEndElement();
Expand All @@ -934,7 +934,7 @@ bool ProjectFile::write(const QString &filename)

if (!mExcludedPaths.isEmpty()) {
xmlWriter.writeStartElement(CppcheckXml::ExcludeElementName);
for (const QString& path : mExcludedPaths) {
for (const QString& path : utils::as_const(mExcludedPaths)) {
xmlWriter.writeStartElement(CppcheckXml::ExcludePathName);
xmlWriter.writeAttribute(CppcheckXml::ExcludePathNameAttrib, path);
xmlWriter.writeEndElement();
Expand All @@ -949,7 +949,7 @@ bool ProjectFile::write(const QString &filename)

if (!mSuppressions.isEmpty()) {
xmlWriter.writeStartElement(CppcheckXml::SuppressionsElementName);
for (const SuppressionList::Suppression &suppression : mSuppressions) {
for (const SuppressionList::Suppression &suppression : utils::as_const(mSuppressions)) {
xmlWriter.writeStartElement(CppcheckXml::SuppressionElementName);
if (!suppression.fileName.empty())
xmlWriter.writeAttribute("fileName", QString::fromStdString(suppression.fileName));
Expand Down Expand Up @@ -1169,7 +1169,7 @@ QString ProjectFile::getAddonFilePath(QString filesDir, const QString &addon)
#endif
;

for (const QString& path : searchPaths) {
for (const QString& path : utils::as_const(searchPaths)) {
QString f = path + addon + ".py";
if (QFile(f).exists())
return f;
Expand Down
2 changes: 1 addition & 1 deletion gui/projectfiledialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ ProjectFileDialog::ProjectFileDialog(ProjectFile *projectFile, bool premium, QWi
}
libs.sort();
mUI->mLibraries->clear();
for (const QString &lib : libs) {
for (const QString &lib : utils::as_const(libs)) {
auto* item = new QListWidgetItem(lib, mUI->mLibraries);
item->setFlags(item->flags() | Qt::ItemIsUserCheckable); // set checkable flag
item->setCheckState(Qt::Unchecked); // AND initialize check state
Expand Down
2 changes: 1 addition & 1 deletion gui/resultsview.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ void ResultsView::readErrorsXml(const QString &filename)
msgBox.exec();
}

for (const ErrorItem& item : errors) {
for (const ErrorItem& item : utils::as_const(errors)) {
handleCriticalError(item);
mUI->mTree->addErrorItem(item);
}
Expand Down
4 changes: 3 additions & 1 deletion gui/threaddetails.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#include "threaddetails.h"
#include "utils.h"

#include "ui_threaddetails.h"

#include <QMutexLocker>
Expand Down Expand Up @@ -43,7 +45,7 @@ void ThreadDetails::updateUI() {
QString text("Thread\tStart time\tFile/Progress\n");
{
QMutexLocker locker(&mMutex);
for (const auto& td: mThreadDetails) {
for (const auto& td: utils::as_const(mThreadDetails)) {
auto& timeProgress = mProgress[td.file];
if (timeProgress.first.isEmpty() && !timeProgress.second.isEmpty())
timeProgress.first = QTime::currentTime().toString(Qt::TextDate);
Expand Down
5 changes: 3 additions & 2 deletions gui/threadhandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include "filesettings.h"
#include "resultsview.h"
#include "settings.h"
#include "utils.h"

#include <algorithm>
#include <string>
Expand Down Expand Up @@ -161,7 +162,7 @@ void ThreadHandler::createThreads(const int count)

void ThreadHandler::removeThreads()
{
for (CheckThread* thread : mThreads) {
for (CheckThread* thread : utils::as_const(mThreads)) {
if (thread->isRunning()) {
thread->stop();
thread->wait();
Expand Down Expand Up @@ -216,7 +217,7 @@ void ThreadHandler::stop()
mCheckStartTime = QDateTime();
mAnalyseWholeProgram = false;
mCtuInfo.clear();
for (CheckThread* thread : mThreads) {
for (CheckThread* thread : utils::as_const(mThreads)) {
thread->stop();
}
}
Expand Down
Loading