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

Utils: Replace some QRegExp to QRegularExpression

Browse Source 
Task-number: QTCREATORBUG-24098
Change-Id: I7d12992506bbe33306c0ab750f73c7db1626abc3
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Stenger
2020-06-19 14:09:27 +02:00
parent f9be969c10
commit e817100b9c
6 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/libs/utils/persistentsettings.cpp
View File

@@ -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();
}