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

VCS: Replace QRegExp by QRegularExpression

Browse Source 
Task-number: QTCREATORBUG-24098
Change-Id: I7c3d8c72ab71b3aa12f0273c45dac9a843024218
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Christian Stenger
2020-07-13 14:31:10 +02:00
parent 228f6d04af
commit c2f51b7797
5 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/cvs/cvsutils.cpp
View File

@@ -27,7 +27,7 @@
#include <utils/stringutils.h>
#include <QRegExp>
#include <QRegularExpression>
#include <QStringList>
namespace Cvs {
@@ -66,15 +66,16 @@ QList<CvsLogEntry> parseLogEntries(const QString &o,
ParseState state = FileState;
const QString workingFilePrefix = QLatin1String("Working file: ");
QRegExp statusPattern = QRegExp(QLatin1String("^date: ([\\d\\-]+) .*commitid: ([^;]+);$"));
QRegExp revisionPattern = QRegExp(QLatin1String("^revision ([\\d\\.]+)$"));
const QRegularExpression statusPattern(QLatin1String("^date: ([\\d\\-]+) .*commitid: ([^;]+);$"));
const QRegularExpression revisionPattern(QLatin1String("^revision ([\\d\\.]+)$"));
const QChar slash = QLatin1Char('/');
Q_ASSERT(statusPattern.isValid() && revisionPattern.isValid());
const QString fileSeparator = QLatin1String("=============================================================================");
// Parse using a state enumeration and regular expressions as not to fall for weird
// commit messages in state 'RevisionState'
foreach (const QString &line, lines) {
QRegularExpressionMatch match;
for (const QString &line : lines) {
switch (state) {
case FileState:
if (line.startsWith(workingFilePrefix)) {
@@ -87,8 +88,9 @@ QList<CvsLogEntry> parseLogEntries(const QString &o,
}
break;
case RevisionState:
if (revisionPattern.exactMatch(line)) {
rc.back().revisions.push_back(CvsRevision(revisionPattern.cap(1)));
match = revisionPattern.match(line);
if (match.hasMatch()) {
rc.back().revisions.push_back(CvsRevision(match.captured(1)));
state = StatusLineState;
} else {
if (line == fileSeparator)
@@ -96,10 +98,11 @@ QList<CvsLogEntry> parseLogEntries(const QString &o,
}
break;
case StatusLineState:
if (statusPattern.exactMatch(line)) {
const QString commitId = statusPattern.cap(2);
match = statusPattern.match(line);
if (match.hasMatch()) {
const QString commitId = match.captured(2);
if (filterCommitId.isEmpty() || filterCommitId == commitId) {
rc.back().revisions.back().date = statusPattern.cap(1);
rc.back().revisions.back().date = match.captured(1);
rc.back().revisions.back().commitId = commitId;
} else {
rc.back().revisions.pop_back();