diff --git a/src/solid/devices/backends/fstab/fstabhandling.cpp b/src/solid/devices/backends/fstab/fstabhandling.cpp --- a/src/solid/devices/backends/fstab/fstabhandling.cpp +++ b/src/solid/devices/backends/fstab/fstabhandling.cpp @@ -24,6 +24,7 @@ #include #include #include +#include #include #include @@ -284,7 +285,9 @@ const QObject *receiver, std::function callback) { QStringList env = QProcess::systemEnvironment(); - env.replaceInStrings(QRegExp("^PATH=(.*)", Qt::CaseInsensitive), "PATH=/sbin:/bin:/usr/sbin/:/usr/bin"); + env.replaceInStrings( + QRegularExpression(QStringLiteral("^PATH=(.*)"), QRegularExpression::CaseInsensitiveOption), + QStringLiteral("PATH=/sbin:/bin:/usr/sbin/:/usr/bin")); QProcess *process = new QProcess(); diff --git a/src/solid/devices/backends/hal/halfstabhandling.cpp b/src/solid/devices/backends/hal/halfstabhandling.cpp --- a/src/solid/devices/backends/hal/halfstabhandling.cpp +++ b/src/solid/devices/backends/hal/halfstabhandling.cpp @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -178,7 +179,9 @@ QObject *obj, const char *slot) { QStringList env = QProcess::systemEnvironment(); - env.replaceInStrings(QRegExp("^PATH=(.*)", Qt::CaseInsensitive), "PATH=/sbin:/bin:/usr/sbin/:/usr/bin"); + env.replaceInStrings( + QRegularExpression(QStringLiteral("^PATH=(.*)"), QRegularExpression::CaseInsensitiveOption), + QStringLiteral("PATH=/sbin:/bin:/usr/sbin/:/usr/bin")); QProcess *process = new QProcess(obj); diff --git a/src/solid/devices/backends/udev/cpuinfo.cpp b/src/solid/devices/backends/udev/cpuinfo.cpp --- a/src/solid/devices/backends/udev/cpuinfo.cpp +++ b/src/solid/devices/backends/udev/cpuinfo.cpp @@ -21,7 +21,7 @@ #include "cpuinfo.h" #include -#include +#include #include namespace Solid @@ -81,18 +81,20 @@ QString CpuInfo::extractCpuInfoLine(int processorNumber, const QString ®ExpStr) { - const QRegExp processorRegExp("processor\\s+:\\s+(\\d+)"); - const QRegExp regExp(regExpStr); + const QRegularExpression processorRegExp( + QRegularExpression::anchoredPattern(QStringLiteral("processor\\s+:\\s+(\\d+)"))); + const QRegularExpression regExp(QRegularExpression::anchoredPattern(regExpStr)); int line = 0; while (line < cpuInfo.size()) { - if (processorRegExp.exactMatch(cpuInfo.at(line))) { - int recordProcNum = processorRegExp.capturedTexts()[1].toInt(); + QRegularExpressionMatch match; + if ((match = processorRegExp.match(cpuInfo.at(line))).hasMatch()) { + int recordProcNum = match.captured(1).toInt(); if (recordProcNum == processorNumber) { ++line; while (line < cpuInfo.size()) { - if (regExp.exactMatch(cpuInfo.at(line))) { - return regExp.capturedTexts()[1]; + if ((match = regExp.match(cpuInfo.at(line))).hasMatch()) { + return match.captured(1); } ++line; } @@ -106,11 +108,12 @@ QString CpuInfo::extractInfoLine(const QString ®ExpStr) { - const QRegExp regExp(regExpStr); + const QRegularExpression regExp(QRegularExpression::anchoredPattern(regExpStr)); foreach (const QString &line, cpuInfo) { - if (regExp.exactMatch(line)) { - return regExp.capturedTexts()[1]; + QRegularExpressionMatch match = regExp.match(line); + if (match.hasMatch()) { + return match.captured(1); } } return QString();