diff options
| author | Samuel Gaist <samuel.gaist@edeltech.ch> | 2017-01-29 23:52:10 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2017-08-05 16:45:14 +0000 |
| commit | b03706d35f556fbaa91d4e05ee7a337220e174b8 (patch) | |
| tree | 1847707601b8f335b7102947e946363d3ad12365 | |
| parent | 82fbf979033a319beb9d079c92cd9b64b724c00c (diff) | |
Migrate QStandardPaths to use QRegularExpression
This patch updates the code from the unix implementation of
QStandardPaths to use QRegularExpression in place of the deprecated
QRegExp.
Change-Id: I51fa231dcd70ca55d1bfffb31d8f28f964ac44fe
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: David Faure <david.faure@kdab.com>
| -rw-r--r-- | src/corelib/io/qstandardpaths_unix.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/corelib/io/qstandardpaths_unix.cpp b/src/corelib/io/qstandardpaths_unix.cpp index f0ff46fe7f..d06778e2a1 100644 --- a/src/corelib/io/qstandardpaths_unix.cpp +++ b/src/corelib/io/qstandardpaths_unix.cpp @@ -42,6 +42,7 @@ #include <qfile.h> #include <qhash.h> #include <qtextstream.h> +#include <qregularexpression.h> #include <private/qfilesystemengine_p.h> #include <errno.h> #include <stdlib.h> @@ -179,11 +180,12 @@ QString QStandardPaths::writableLocation(StandardLocation type) QHash<QString, QString> lines; QTextStream stream(&file); // Only look for lines like: XDG_DESKTOP_DIR="$HOME/Desktop" - QRegExp exp(QLatin1String("^XDG_(.*)_DIR=(.*)$")); + QRegularExpression exp(QLatin1String("^XDG_(.*)_DIR=(.*)$")); while (!stream.atEnd()) { const QString &line = stream.readLine(); - if (exp.indexIn(line) != -1) { - const QStringList lst = exp.capturedTexts(); + QRegularExpressionMatch match = exp.match(line); + if (match.hasMatch()) { + const QStringList lst = match.capturedTexts(); const QString key = lst.at(1); QString value = lst.at(2); if (value.length() > 2 |