yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[kwineffects] Port GLPlatform to QRegularExpression

Browse source 
Test Plan: kwinglplatformtest still passes.

Reviewers: #kwin, apol

Reviewed By: apol

Subscribers: apol, kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D28320
This commit is contained in:
Vlad Zahorodnii 2020-03-26 22:33:41 +02:00
parent c9c6fa818d
commit 9755ef20e5
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
libkwineffects/kwinglplatform.cpp
View file

@ -24,7 +24,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "kwinglutils_funcs.h"
#include <epoxy/gl.h>
#include <QRegExp>
#include <QRegularExpression>
#include <QStringList>
#include <QDebug>
#include <QOpenGLContext>
@ -94,14 +94,13 @@ static qint64 getKernelVersion()
}
// Extracts the portion of a string that matches a regular expression
static QString extract(const QString &string, const QString &match, int offset = 0)
static QString extract(const QString &text, const QString &pattern)
{
QString result;
QRegExp rx(match);
int pos = rx.indexIn(string, offset);
if (pos != -1)
result = string.mid(pos, rx.matchedLength());
return result;
const QRegularExpression regexp(pattern);
const QRegularExpressionMatch match = regexp.match(text);
if (!match.hasMatch())
return QString();
return match.captured();
}
static ChipClass detectRadeonClass(const QByteArray &chipset)