diff options
author | Christian Stenger <christian.stenger@qt.io> | 2020-06-19 14:09:27 +0200 |
---|---|---|
committer | Christian Stenger <christian.stenger@qt.io> | 2020-06-19 12:30:01 +0000 |
commit | e817100b9cddad04c6b65c5d3985f3fe3e54ee06 (patch) | |
tree | 22b9ce2b0658c801973a7ddedd0597bb0cf85995 | |
parent | f9be969c108b3dbc07a357b03e88a84671fd677e (diff) |
Utils: Replace some QRegExp to QRegularExpression
Task-number: QTCREATORBUG-24098
Change-Id: I7d12992506bbe33306c0ab750f73c7db1626abc3
Reviewed-by: hjk <hjk@qt.io>
-rw-r--r-- | src/libs/qmldebug/qmloutputparser.cpp | 9 | ||||
-rw-r--r-- | src/libs/utils/consoleprocess.cpp | 4 | ||||
-rw-r--r-- | src/libs/utils/outputformatter.cpp | 1 | ||||
-rw-r--r-- | src/libs/utils/outputformatter.h | 1 | ||||
-rw-r--r-- | src/libs/utils/persistentsettings.cpp | 11 | ||||
-rw-r--r-- | src/libs/utils/settingsaccessor.cpp | 1 |
6 files changed, 13 insertions, 14 deletions
diff --git a/src/libs/qmldebug/qmloutputparser.cpp b/src/libs/qmldebug/qmloutputparser.cpp index 9e6102598b..4b13cad2cd 100644 --- a/src/libs/qmldebug/qmloutputparser.cpp +++ b/src/libs/qmldebug/qmloutputparser.cpp @@ -25,7 +25,7 @@ #include "qmloutputparser.h" #include "qmldebugconstants.h" -#include <QRegExp> +#include <QRegularExpression> namespace QmlDebug { @@ -78,11 +78,12 @@ void QmlOutputParser::processOutput(const QString &output) if (status.startsWith(waitingForConnection)) { status.remove(0, waitingForConnection.size()); // chop of 'Waiting for connection ' - static QRegExp waitingTcp( + static QRegularExpression waitingTcp( QString::fromLatin1(Constants::STR_ON_PORT_PATTERN)); - if (waitingTcp.indexIn(status) > -1) { + const QRegularExpressionMatch match = waitingTcp.match(status); + if (match.hasMatch()) { bool canConvert; - quint16 port = waitingTcp.cap(1).toUShort(&canConvert); + quint16 port = match.captured(1).toUShort(&canConvert); if (canConvert) emit waitingForConnectionOnPort(Utils::Port(port)); continue; diff --git a/src/libs/utils/consoleprocess.cpp b/src/libs/utils/consoleprocess.cpp index b0b684428a..0edcd13163 100644 --- a/src/libs/utils/consoleprocess.cpp +++ b/src/libs/utils/consoleprocess.cpp @@ -424,13 +424,13 @@ bool ConsoleProcess::start() const QStringList fixedEnvironment = [env] { QStringList envStrings = env; // add PATH if necessary (for DLL loading) - if (envStrings.filter(QRegExp(QLatin1String("^PATH="),Qt::CaseInsensitive)).isEmpty()) { + if (envStrings.filter(QRegularExpression("^PATH=.*", QRegularExpression::CaseInsensitiveOption)).isEmpty()) { QByteArray path = qgetenv("PATH"); if (!path.isEmpty()) envStrings.prepend(QString::fromLatin1("PATH=%1").arg(QString::fromLocal8Bit(path))); } // add systemroot if needed - if (envStrings.filter(QRegExp(QLatin1String("^SystemRoot="),Qt::CaseInsensitive)).isEmpty()) { + if (envStrings.filter(QRegularExpression("^SystemRoot=.*", QRegularExpression::CaseInsensitiveOption)).isEmpty()) { QByteArray systemRoot = qgetenv("SystemRoot"); if (!systemRoot.isEmpty()) envStrings.prepend(QString::fromLatin1("SystemRoot=%1").arg(QString::fromLocal8Bit(systemRoot))); diff --git a/src/libs/utils/outputformatter.cpp b/src/libs/utils/outputformatter.cpp index ac4412c8d3..31ed810012 100644 --- a/src/libs/utils/outputformatter.cpp +++ b/src/libs/utils/outputformatter.cpp @@ -37,7 +37,6 @@ #include <QPair> #include <QPlainTextEdit> #include <QPointer> -#include <QRegExp> #include <QRegularExpressionMatch> #include <QTextCursor> diff --git a/src/libs/utils/outputformatter.h b/src/libs/utils/outputformatter.h index 7d0a4f5428..6cc9ca7b80 100644 --- a/src/libs/utils/outputformatter.h +++ b/src/libs/utils/outputformatter.h @@ -36,7 +36,6 @@ QT_BEGIN_NAMESPACE class QPlainTextEdit; -class QRegExp; class QRegularExpressionMatch; class QTextCharFormat; class QTextCursor; diff --git a/src/libs/utils/persistentsettings.cpp b/src/libs/utils/persistentsettings.cpp index 39418816e0..d17a578292 100644 --- a/src/libs/utils/persistentsettings.cpp +++ b/src/libs/utils/persistentsettings.cpp @@ -33,7 +33,7 @@ #include <QXmlStreamWriter> #include <QDateTime> #include <QTextStream> -#include <QRegExp> +#include <QRegularExpression> #include <QRect> #ifdef QT_GUI_LIB @@ -59,11 +59,12 @@ static QString rectangleToString(const QRect &r) static QRect stringToRectangle(const QString &v) { - static QRegExp pattern(QLatin1String("(\\d+)x(\\d+)([-+]\\d+)([-+]\\d+)")); + static QRegularExpression pattern("^(\\d+)x(\\d+)([-+]\\d+)([-+]\\d+)$"); Q_ASSERT(pattern.isValid()); - return pattern.exactMatch(v) ? - QRect(QPoint(pattern.cap(3).toInt(), pattern.cap(4).toInt()), - QSize(pattern.cap(1).toInt(), pattern.cap(2).toInt())) : + const QRegularExpressionMatch match = pattern.match(v); + return match.hasMatch() ? + QRect(QPoint(match.captured(3).toInt(), match.captured(4).toInt()), + QSize(match.captured(1).toInt(), match.captured(2).toInt())) : QRect(); } diff --git a/src/libs/utils/settingsaccessor.cpp b/src/libs/utils/settingsaccessor.cpp index 6c692ed214..709c5c823b 100644 --- a/src/libs/utils/settingsaccessor.cpp +++ b/src/libs/utils/settingsaccessor.cpp @@ -31,7 +31,6 @@ #include <QApplication> #include <QDebug> #include <QDir> -#include <QRegExp> namespace { |