piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 22:29:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

DolphinQt: Migrate QRegExp over to QRegularExpression

Browse Source 
Qt 5.0 introduced QRegularExpression to replace QRegExp. In Qt 6.0,
QRegExp is removed entirely in favor of it.
This commit is contained in:
Lioncash
2021-01-13 04:06:05 -05:00
parent 765a1b3c09
commit 46ca371ef3
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/DolphinQt/GameList/GameListModel.cpp
View File

@ -7,6 +7,7 @@
#include <QDir>
#include <QFileInfo>
#include <QPixmap>
#include <QRegularExpression>
#include "Core/ConfigManager.h"
@ -96,7 +97,8 @@ QVariant GameListModel::data(const QModelIndex& index, int role) const
const int disc_nr = game.GetDiscNumber() + 1;
if (disc_nr > 1)
{
if (!name.contains(QRegExp(QStringLiteral("disc ?%1").arg(disc_nr), Qt::CaseInsensitive)))
if (!name.contains(QRegularExpression(QStringLiteral("disc ?%1").arg(disc_nr),
QRegularExpression::CaseInsensitiveOption)))
{
name.append(tr(" (Disc %1)").arg(disc_nr));
}
@ -107,11 +109,14 @@ QVariant GameListModel::data(const QModelIndex& index, int role) const
{
constexpr int MAX_NUMBER_LENGTH = 10;
QRegExp rx(QStringLiteral("\\d+"));
const QRegularExpression rx(QStringLiteral("\\d+"));
QRegularExpressionMatch match;
int pos = 0;
while ((pos = rx.indexIn(name, pos)) != -1)
while ((match = rx.match(name, pos)).hasMatch())
{
name.replace(pos, rx.matchedLength(), rx.cap().rightJustified(MAX_NUMBER_LENGTH));
pos = match.capturedStart();
name.replace(pos, match.capturedLength(),
match.captured().rightJustified(MAX_NUMBER_LENGTH));
pos += MAX_NUMBER_LENGTH;
}
}