CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: replace QRegExp with QRegularExpression

Browse Source 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
This commit is contained in:
Sefa Eyeoglu
2022-05-02 19:48:37 +02:00
parent 984692dc62
commit ff2cd50bfa
17 changed files with 48 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
launcher/ui/dialogs/ProfileSetupDialog.cpp
View File

@@ -18,7 +18,7 @@
#include <QPushButton>
#include <QAction>
#include <QRegExpValidator>
#include <QRegularExpressionValidator>
#include <QJsonDocument>
#include <QDebug>
@@ -39,9 +39,9 @@ ProfileSetupDialog::ProfileSetupDialog(MinecraftAccountPtr accountToSetup, QWidg
yellowIcon = APPLICATION->getThemedIcon("status-yellow");
badIcon = APPLICATION->getThemedIcon("status-bad");
QRegExp permittedNames("[a-zA-Z0-9_]{3,16}");
QRegularExpression permittedNames("[a-zA-Z0-9_]{3,16}");
auto nameEdit = ui->nameEdit;
nameEdit->setValidator(new QRegExpValidator(permittedNames));
nameEdit->setValidator(new QRegularExpressionValidator(permittedNames));
nameEdit->setClearButtonEnabled(true);
validityAction = nameEdit->addAction(yellowIcon, QLineEdit::LeadingPosition);
connect(nameEdit, &QLineEdit::textEdited, this, &ProfileSetupDialog::nameEdited);

4
launcher/ui/dialogs/SkinUploadDialog.cpp
View File

@@ -22,10 +22,10 @@ void SkinUploadDialog::on_buttonBox_accepted()
{
QString fileName;
QString input = ui->skinPathTextBox->text();
QRegExp urlPrefixMatcher("^([a-z]+)://.+$");
QRegularExpression urlPrefixMatcher(QRegularExpression::anchoredPattern("^([a-z]+)://.+$"));
bool isLocalFile = false;
// it has an URL prefix -> it is an URL
if(urlPrefixMatcher.exactMatch(input))
if(urlPrefixMatcher.match(input).hasMatch()) // TODO: does this work?
{
QUrl fileURL = input;
if(fileURL.isValid())

2
launcher/ui/dialogs/UpdateDialog.cpp
View File

@@ -58,7 +58,7 @@ QString reprocessMarkdown(QByteArray markdown)
QString output = hoedown.process(markdown);
// HACK: easier than customizing hoedown
output.replace(QRegExp("GH-([0-9]+)"), "<a href=\"https://github.com/PolyMC/PolyMC/issues/\\1\">GH-\\1</a>");
output.replace(QRegularExpression("GH-([0-9]+)"), "<a href=\"https://github.com/PolyMC/PolyMC/issues/\\1\">GH-\\1</a>");
qDebug() << output;
return output;
}

6
launcher/ui/pages/instance/ExternalResourcesPage.cpp
View File

@@ -32,13 +32,13 @@ class SortProxy : public QSortFilterProxyModel {
const auto& mod = model->at(source_row);
if (mod.name().contains(filterRegExp()))
if (mod.name().contains(filterRegularExpression()))
return true;
if (mod.description().contains(filterRegExp()))
if (mod.description().contains(filterRegularExpression()))
return true;
for (auto& author : mod.authors()) {
if (author.contains(filterRegExp())) {
if (author.contains(filterRegularExpression())) {
return true;
}
}

3
launcher/ui/pages/instance/ScreenshotsPage.cpp
View File

@@ -50,6 +50,7 @@
#include <QClipboard>
#include <QKeyEvent>
#include <QMenu>
#include <QRegularExpression>
#include <Application.h>
@@ -154,7 +155,7 @@ public:
if (role == Qt::DisplayRole || role == Qt::EditRole)
{
QVariant result = sourceModel()->data(mapToSource(proxyIndex), role);
return result.toString().remove(QRegExp("\\.png$"));
return result.toString().remove(QRegularExpression("\\.png$"));
}
if (role == Qt::DecorationRole)
{

2
launcher/ui/widgets/PageContainer.cpp
View File

@@ -66,7 +66,7 @@ public:
protected:
bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
{
const QString pattern = filterRegExp().pattern();
const QString pattern = filterRegularExpression().pattern();
const auto model = static_cast<PageModel *>(sourceModel());
const auto page = model->pages().at(sourceRow);
if (!page->shouldDisplay())