diff options
author | Sefa Eyeoglu <contact@scrumplex.net> | 2022-05-02 19:48:37 +0200 |
---|---|---|
committer | Sefa Eyeoglu <contact@scrumplex.net> | 2022-07-10 12:17:52 +0200 |
commit | ff2cd50bfaeaab89ab830f1223c1e3649642dfa3 (patch) | |
tree | 7ba32b95bfe3fbaa18a37d271134b62172990a21 /launcher/minecraft/GradleSpecifier.h | |
parent | 984692dc629ca3712d482b174a67557dd9e635a8 (diff) | |
download | PrismLauncher-ff2cd50bfaeaab89ab830f1223c1e3649642dfa3.tar.gz PrismLauncher-ff2cd50bfaeaab89ab830f1223c1e3649642dfa3.tar.bz2 PrismLauncher-ff2cd50bfaeaab89ab830f1223c1e3649642dfa3.zip |
refactor: replace QRegExp with QRegularExpression
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
Diffstat (limited to 'launcher/minecraft/GradleSpecifier.h')
-rw-r--r-- | launcher/minecraft/GradleSpecifier.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/launcher/minecraft/GradleSpecifier.h b/launcher/minecraft/GradleSpecifier.h index d9bb0207..fbf022af 100644 --- a/launcher/minecraft/GradleSpecifier.h +++ b/launcher/minecraft/GradleSpecifier.h @@ -2,6 +2,7 @@ #include <QString> #include <QStringList> +#include <QRegularExpression> #include "DefaultVariable.h" struct GradleSpecifier @@ -25,20 +26,21 @@ struct GradleSpecifier 4 "jdk15" 5 "jar" */ - QRegExp matcher("([^:@]+):([^:@]+):([^:@]+)" "(?::([^:@]+))?" "(?:@([^:@]+))?"); - m_valid = matcher.exactMatch(value); + QRegularExpression matcher(QRegularExpression::anchoredPattern("([^:@]+):([^:@]+):([^:@]+)" "(?::([^:@]+))?" "(?:@([^:@]+))?")); + QRegularExpressionMatch match = matcher.match(value); + m_valid = match.hasMatch(); if(!m_valid) { m_invalidValue = value; return *this; } - auto elements = matcher.capturedTexts(); - m_groupId = elements[1]; - m_artifactId = elements[2]; - m_version = elements[3]; - m_classifier = elements[4]; - if(!elements[5].isEmpty()) + auto elements = match.captured(); + m_groupId = match.captured(1); + m_artifactId = match.captured(2); + m_version = match.captured(3); + m_classifier = match.captured(4); + if(match.lastCapturedIndex() >= 5) { - m_extension = elements[5]; + m_extension = match.captured(5); } return *this; } |