diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-03-28 14:56:56 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-04-13 07:41:20 +0000 |
| commit | e32da422e35fc41a9e892e5a04a88a0959dd0c88 (patch) | |
| tree | e44ebf7d0f24d0a936c37cdbc4e9eb45d5a5d51a /src/shared | |
| parent | 8f9b747f030bb41556831a23ec2a8e7e76fb7dc0 (diff) | |
Qt Designer: Port to QRegularExpression
Change-Id: I56f3270ed2307d779d73e04802761e1c0d724fa1
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/deviceskin/deviceskin.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/shared/deviceskin/deviceskin.cpp b/src/shared/deviceskin/deviceskin.cpp index 603834dc6..b8649b9b3 100644 --- a/src/shared/deviceskin/deviceskin.cpp +++ b/src/shared/deviceskin/deviceskin.cpp @@ -50,7 +50,7 @@ #include <QtGui/QImage> #include <QtCore/QTimer> #include <QtCore/QDir> -#include <QtCore/QRegExp> +#include <QtCore/QRegularExpression> #include <QtGui/QMouseEvent> #include <QtCore/QDebug> @@ -285,12 +285,14 @@ bool DeviceSkinParameters::read(QTextStream &ts, ReadMode rm, QString *errorMess ts.readLine(); // eol joystick = -1; const QString Joystick = QLatin1String("Joystick"); + const QRegularExpression splitRe(QLatin1String("[ \t][ \t]*")); + Q_ASSERT(splitRe.isValid()); while (i < nareas && !ts.atEnd() ) { buttonAreas.push_back(DeviceSkinButtonArea()); DeviceSkinButtonArea &area = buttonAreas.back(); const QString line = ts.readLine(); if ( !line.isEmpty() && line[0] != QLatin1Char('#') ) { - const QStringList tok = line.split(QRegExp(QLatin1String("[ \t][ \t]*"))); + const QStringList tok = line.split(splitRe); if ( tok.count()<6 ) { *errorMessage = DeviceSkin::tr("Syntax error in area definition: %1").arg(line); return false; |