diff options
Diffstat (limited to 'src/libs/kdtools/sysinfo_x11.cpp')
-rw-r--r-- | src/libs/kdtools/sysinfo_x11.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libs/kdtools/sysinfo_x11.cpp b/src/libs/kdtools/sysinfo_x11.cpp index bc55939a6..24ef099ca 100644 --- a/src/libs/kdtools/sysinfo_x11.cpp +++ b/src/libs/kdtools/sysinfo_x11.cpp @@ -40,7 +40,7 @@ #include <QtCore/QTextStream> #include <QtCore/QDir> #include <QtCore/QFileInfo> -#include <QtCore/QRegExp> +#include <QtCore/QRegularExpression> namespace KDUpdater { @@ -60,7 +60,7 @@ quint64 installedMemory() else if (s.isEmpty()) return quint64(); - const QStringList parts = s.split(QLatin1Char(' '), QString::SkipEmptyParts); + const QStringList parts = s.split(QLatin1Char(' '), Qt::SkipEmptyParts); return quint64(parts.at(1).toInt() * 1024LL); } #else @@ -99,7 +99,7 @@ QList<VolumeInfo> mountedVolumes() if (!s.startsWith(QLatin1Char('/')) && !s.startsWith(QLatin1String("tmpfs ") + QDir::tempPath())) continue; - const QStringList parts = s.split(QLatin1Char(' '), QString::SkipEmptyParts); + const QStringList parts = s.split(QLatin1Char(' '), Qt::SkipEmptyParts); VolumeInfo v; v.setMountPath(parts.at(1)); @@ -124,9 +124,9 @@ QList<ProcessInfo> runningProcesses() QList<ProcessInfo> processes; QDir procDir(QLatin1String("/proc")); const QFileInfoList procCont = procDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot | QDir::Readable); - QRegExp validator(QLatin1String("[0-9]+")); - Q_FOREACH (const QFileInfo &info, procCont) { - if (validator.exactMatch(info.fileName())) { + static const QRegularExpression validator(QLatin1String("^[0-9]+$")); + for (const QFileInfo &info : procCont) { + if (validator.match(info.fileName()).hasMatch()) { const QString linkPath = QDir(info.absoluteFilePath()).absoluteFilePath(QLatin1String("exe")); const QFileInfo linkInfo(linkPath); if (linkInfo.exists()) { |