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

PE: Replace QRegExp by QRegularExpression

Browse Source 
Task-number: QTCREATORBUG-24098
Change-Id: I2d83026b7733d83a68c1ddcca6b409d3c3125fb5
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Christian Stenger
2020-07-14 12:02:18 +02:00
parent 9783761df3
commit c4cb5d4039
6 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/projectexplorer/addrunconfigdialog.cpp
View File

@@ -39,7 +39,6 @@
#include <QLabel> #include <QLabel>
#include <QLineEdit> #include <QLineEdit>
#include <QPushButton> #include <QPushButton>
#include <QRegExp>
#include <QSortFilterProxyModel> #include <QSortFilterProxyModel>
#include <QVBoxLayout> #include <QVBoxLayout>

4
src/plugins/projectexplorer/allprojectsfind.cpp
View File

@@ -36,11 +36,9 @@
#include <utils/filesearch.h> #include <utils/filesearch.h>
#include <utils/algorithm.h> #include <utils/algorithm.h>
#include <QSettings>
#include <QRegExp>
#include <QGridLayout> #include <QGridLayout>
#include <QLabel> #include <QLabel>
#include <QSettings>
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace ProjectExplorer::Internal; using namespace ProjectExplorer::Internal;

1
src/plugins/projectexplorer/customwizard/customwizardpage.cpp
View File

@@ -31,7 +31,6 @@
#include <utils/textfieldcheckbox.h> #include <utils/textfieldcheckbox.h>
#include <utils/textfieldcombobox.h> #include <utils/textfieldcombobox.h>
#include <QRegExp>
#include <QDebug> #include <QDebug>
#include <QDir> #include <QDir>
#include <QDate> #include <QDate>

2
src/plugins/projectexplorer/osparser.h
View File

@@ -29,8 +29,6 @@
#include <projectexplorer/task.h> #include <projectexplorer/task.h>
#include <QRegExp>
namespace ProjectExplorer { namespace ProjectExplorer {
class PROJECTEXPLORER_EXPORT OsParser : public ProjectExplorer::OutputTaskParser class PROJECTEXPLORER_EXPORT OsParser : public ProjectExplorer::OutputTaskParser

19
src/plugins/projectexplorer/xcodebuildparser.cpp
View File

@@ -42,13 +42,13 @@ static const char buildRe[] = "=== BUILD (AGGREGATE )?TARGET (.*) OF PROJECT (.*
static const char signatureChangeEndsWithPattern[] = ": replacing existing signature"; static const char signatureChangeEndsWithPattern[] = ": replacing existing signature";
XcodebuildParser::XcodebuildParser() XcodebuildParser::XcodebuildParser()
: m_failureRe(QLatin1String(failureRe))
, m_successRe(QLatin1String(successRe))
, m_buildRe(QLatin1String(buildRe))
{ {
setObjectName(QLatin1String("XcodeParser")); setObjectName(QLatin1String("XcodeParser"));
m_failureRe.setPattern(QLatin1String(failureRe));
QTC_CHECK(m_failureRe.isValid()); QTC_CHECK(m_failureRe.isValid());
m_successRe.setPattern(QLatin1String(successRe));
QTC_CHECK(m_successRe.isValid()); QTC_CHECK(m_successRe.isValid());
m_buildRe.setPattern(QLatin1String(buildRe));
QTC_CHECK(m_buildRe.isValid()); QTC_CHECK(m_buildRe.isValid());
} }
@@ -56,15 +56,17 @@ OutputLineParser::Result XcodebuildParser::handleLine(const QString &line, Outpu
{ {
const QString lne = rightTrimmed(line); const QString lne = rightTrimmed(line);
if (type == StdOutFormat) { if (type == StdOutFormat) {
if (m_buildRe.indexIn(lne) > -1) { QRegularExpressionMatch match = m_buildRe.match(line);
if (match.hasMatch()) {
m_xcodeBuildParserState = InXcodebuild; m_xcodeBuildParserState = InXcodebuild;
m_lastTarget = m_buildRe.cap(2); m_lastTarget = match.captured(2);
m_lastProject = m_buildRe.cap(3); m_lastProject = match.captured(3);
return Status::Done; return Status::Done;
} }
if (m_xcodeBuildParserState == InXcodebuild if (m_xcodeBuildParserState == InXcodebuild
|| m_xcodeBuildParserState == UnknownXcodebuildState) { || m_xcodeBuildParserState == UnknownXcodebuildState) {
if (m_successRe.indexIn(lne) > -1) { match = m_successRe.match(lne);
if (match.hasMatch()) {
m_xcodeBuildParserState = OutsideXcodebuild; m_xcodeBuildParserState = OutsideXcodebuild;
return Status::Done; return Status::Done;
} }
@@ -83,7 +85,8 @@ OutputLineParser::Result XcodebuildParser::handleLine(const QString &line, Outpu
} }
return Status::NotHandled; return Status::NotHandled;
} }
if (m_failureRe.indexIn(lne) > -1) { const QRegularExpressionMatch match = m_failureRe.match(lne);
if (match.hasMatch()) {
++m_fatalErrorCount; ++m_fatalErrorCount;
m_xcodeBuildParserState = UnknownXcodebuildState; m_xcodeBuildParserState = UnknownXcodebuildState;
// unfortunately the m_lastTarget, m_lastProject might not be in sync // unfortunately the m_lastTarget, m_lastProject might not be in sync

8
src/plugins/projectexplorer/xcodebuildparser.h
View File

@@ -29,7 +29,7 @@
#include "ioutputparser.h" #include "ioutputparser.h"
#include "devicesupport/idevice.h" #include "devicesupport/idevice.h"
#include <QRegExp> #include <QRegularExpression>
#include <QStringList> #include <QStringList>
namespace ProjectExplorer { namespace ProjectExplorer {
@@ -52,9 +52,9 @@ private:
bool hasFatalErrors() const override { return m_fatalErrorCount > 0; } bool hasFatalErrors() const override { return m_fatalErrorCount > 0; }
int m_fatalErrorCount = 0; int m_fatalErrorCount = 0;
QRegExp m_failureRe; const QRegularExpression m_failureRe;
QRegExp m_successRe; const QRegularExpression m_successRe;
QRegExp m_buildRe; const QRegularExpression m_buildRe;
XcodebuildStatus m_xcodeBuildParserState = OutsideXcodebuild; XcodebuildStatus m_xcodeBuildParserState = OutsideXcodebuild;
QString m_lastTarget; QString m_lastTarget;
QString m_lastProject; QString m_lastProject;