walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

some minor QRegularExpression usage optimizations and cleanups (#3999)

This commit is contained in:
Oliver Stöneberg 2022-04-11 19:15:42 +02:00 committed by GitHub
parent 375df3a6af
commit 902f46bae5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gui/checkthread.cpp
View File

@ -307,8 +307,8 @@ void CheckThread::parseClangErrors(const QString &tool, const QString &file0, QS
{ {
QList<ErrorItem> errorItems; QList<ErrorItem> errorItems;
ErrorItem errorItem; ErrorItem errorItem;
const QRegularExpression r1("^(.+):([0-9]+):([0-9]+): (note|warning|error|fatal error): (.*)$"); static const QRegularExpression r1("^(.+):([0-9]+):([0-9]+): (note|warning|error|fatal error): (.*)$");
const QRegularExpression r2("^(.*)\\[([a-zA-Z0-9\\-_\\.]+)\\]$"); static const QRegularExpression r2("^(.*)\\[([a-zA-Z0-9\\-_\\.]+)\\]$");
QTextStream in(&err, QIODevice::ReadOnly); QTextStream in(&err, QIODevice::ReadOnly);
while (!in.atEnd()) { while (!in.atEnd()) {
QString line = in.readLine(); QString line = in.readLine();

2
gui/libraryaddfunctiondialog.cpp
View File

@ -28,7 +28,7 @@ LibraryAddFunctionDialog::LibraryAddFunctionDialog(QWidget *parent) :
mUi(new Ui::LibraryAddFunctionDialog) mUi(new Ui::LibraryAddFunctionDialog)
{ {
mUi->setupUi(this); mUi->setupUi(this);
const QRegularExpression rx(NAMES); static const QRegularExpression rx(NAMES);
QValidator *validator = new QRegularExpressionValidator(rx, this); QValidator *validator = new QRegularExpressionValidator(rx, this);
mUi->functionName->setValidator(validator); mUi->functionName->setValidator(validator);
} }

11
gui/mainwindow.cpp
View File

@ -262,9 +262,9 @@ void MainWindow::handleCLIParams(const QStringList &params)
} else { } else {
loadResults(logFile); loadResults(logFile);
} }
} else if ((index = params.indexOf(QRegularExpression(".*\\.cppcheck$", QRegularExpression::CaseInsensitiveOption), 0)) >= 0 && index < params.length() && QFile(params[index]).exists()) { } else if ((index = params.indexOf(QRegularExpression(".*\\.cppcheck$", QRegularExpression::CaseInsensitiveOption))) >= 0 && index < params.length() && QFile(params[index]).exists()) {
loadProjectFile(params[index]); loadProjectFile(params[index]);
} else if ((index = params.indexOf(QRegularExpression(".*\\.xml$", QRegularExpression::CaseInsensitiveOption), 0)) >= 0 && index < params.length() && QFile(params[index]).exists()) { } else if ((index = params.indexOf(QRegularExpression(".*\\.xml$", QRegularExpression::CaseInsensitiveOption))) >= 0 && index < params.length() && QFile(params[index]).exists()) {
loadResults(params[index],QDir::currentPath()); loadResults(params[index],QDir::currentPath());
} else } else
doAnalyzeFiles(params); doAnalyzeFiles(params);
@ -1142,8 +1142,11 @@ void MainWindow::clearResults()
if (mProjectFile && !mProjectFile->getBuildDir().isEmpty()) { if (mProjectFile && !mProjectFile->getBuildDir().isEmpty()) {
QDir dir(QFileInfo(mProjectFile->getFilename()).absolutePath() + '/' + mProjectFile->getBuildDir()); QDir dir(QFileInfo(mProjectFile->getFilename()).absolutePath() + '/' + mProjectFile->getBuildDir());
for (const QString& f: dir.entryList(QDir::Files)) { for (const QString& f: dir.entryList(QDir::Files)) {
if (!f.endsWith("files.txt") && !QRegularExpression("^.*.s[0-9]+$").match(f).hasMatch()) if (!f.endsWith("files.txt")) {
dir.remove(f); static const QRegularExpression rx("^.*.s[0-9]+$");
if (!rx.match(f).hasMatch())
dir.remove(f);
}
} }
} }
mUI->mResults->clear(true); mUI->mResults->clear(true);

2
gui/statsdialog.cpp
View File

@ -406,7 +406,7 @@ QLineSeries *StatsDialog::numberOfReports(const QString &fileName, const QString
QTextStream in(&f); QTextStream in(&f);
while (!in.atEnd()) { while (!in.atEnd()) {
QString line = in.readLine(); QString line = in.readLine();
const QRegularExpression rxdate("^\\[(\\d\\d)\\.(\\d\\d)\\.(\\d\\d\\d\\d)\\]$"); static const QRegularExpression rxdate("^\\[(\\d\\d)\\.(\\d\\d)\\.(\\d\\d\\d\\d)\\]$");
const QRegularExpressionMatch matchRes = rxdate.match(line); const QRegularExpressionMatch matchRes = rxdate.match(line);
if (matchRes.hasMatch()) { if (matchRes.hasMatch()) {
int y = matchRes.captured(3).toInt(); int y = matchRes.captured(3).toInt();

5
tools/triage/mainwindow.cpp
View File

@ -111,7 +111,10 @@ void MainWindow::load(QTextStream &textStream)
if (!errorMessage.isEmpty()) if (!errorMessage.isEmpty())
mAllErrors << errorMessage; mAllErrors << errorMessage;
errorMessage.clear(); errorMessage.clear();
} else if (!url.isEmpty() && QRegularExpression("^.*: (error|warning|style|note):.*$").match(line).hasMatch()) { } else if (!url.isEmpty()) {
static const QRegularExpression severityRe("^.*: (error|warning|style|note):.*$");
if (severityRe.match(line).hasMatch())
continue;
const QRegularExpressionMatch matchRes = mVersionRe.match(line); const QRegularExpressionMatch matchRes = mVersionRe.match(line);
if (matchRes.hasMatch()) { if (matchRes.hasMatch()) {
const QString version = matchRes.captured(1); const QString version = matchRes.captured(1);