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

chore: reformat

Browse Source 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
This commit is contained in:
Sefa Eyeoglu
2023-08-02 18:35:35 +02:00
parent ce2ca13815
commit 1d468ac35a
594 changed files with 16040 additions and 16536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
launcher/java/JavaVersion.cpp
View File

@ -5,27 +5,22 @@
#include <QRegularExpression>
#include <QString>
JavaVersion & JavaVersion::operator=(const QString & javaVersionString)
JavaVersion& JavaVersion::operator=(const QString& javaVersionString)
{
m_string = javaVersionString;
auto getCapturedInteger = [](const QRegularExpressionMatch & match, const QString &what) -> int
{
auto getCapturedInteger = [](const QRegularExpressionMatch& match, const QString& what) -> int {
auto str = match.captured(what);
if(str.isEmpty())
{
if (str.isEmpty()) {
return 0;
}
return str.toInt();
};
QRegularExpression pattern;
if(javaVersionString.startsWith("1."))
{
pattern = QRegularExpression ("1[.](?<major>[0-9]+)([.](?<minor>[0-9]+))?(_(?<security>[0-9]+)?)?(-(?<prerelease>[a-zA-Z0-9]+))?");
}
else
{
if (javaVersionString.startsWith("1.")) {
pattern = QRegularExpression("1[.](?<major>[0-9]+)([.](?<minor>[0-9]+))?(_(?<security>[0-9]+)?)?(-(?<prerelease>[a-zA-Z0-9]+))?");
} else {
pattern = QRegularExpression("(?<major>[0-9]+)([.](?<minor>[0-9]+))?([.](?<security>[0-9]+))?(-(?<prerelease>[a-zA-Z0-9]+))?");
}
@ -38,7 +33,7 @@ JavaVersion & JavaVersion::operator=(const QString & javaVersionString)
return *this;
}
JavaVersion::JavaVersion(const QString &rhs)
JavaVersion::JavaVersion(const QString& rhs)
{
operator=(rhs);
}
@ -50,73 +45,65 @@ QString JavaVersion::toString() const
bool JavaVersion::requiresPermGen()
{
if(m_parseable)
{
if (m_parseable) {
return m_major < 8;
}
return true;
}
bool JavaVersion::operator<(const JavaVersion &rhs)
bool JavaVersion::operator<(const JavaVersion& rhs)
{
if(m_parseable && rhs.m_parseable)
{
if (m_parseable && rhs.m_parseable) {
auto major = m_major;
auto rmajor = rhs.m_major;
// HACK: discourage using java 9
if(major > 8)
if (major > 8)
major = -major;
if(rmajor > 8)
if (rmajor > 8)
rmajor = -rmajor;
if(major < rmajor)
if (major < rmajor)
return true;
if(major > rmajor)
if (major > rmajor)
return false;
if(m_minor < rhs.m_minor)
if (m_minor < rhs.m_minor)
return true;
if(m_minor > rhs.m_minor)
if (m_minor > rhs.m_minor)
return false;
if(m_security < rhs.m_security)
if (m_security < rhs.m_security)
return true;
if(m_security > rhs.m_security)
if (m_security > rhs.m_security)
return false;
// everything else being equal, consider prerelease status
bool thisPre = !m_prerelease.isEmpty();
bool rhsPre = !rhs.m_prerelease.isEmpty();
if(thisPre && !rhsPre)
{
if (thisPre && !rhsPre) {
// this is a prerelease and the other one isn't -> lesser
return true;
}
else if(!thisPre && rhsPre)
{
} else if (!thisPre && rhsPre) {
// this isn't a prerelease and the other one is -> greater
return false;
}
else if(thisPre && rhsPre)
{
} else if (thisPre && rhsPre) {
// both are prereleases - use natural compare...
return StringUtils::naturalCompare(m_prerelease, rhs.m_prerelease, Qt::CaseSensitive) < 0;
}
// neither is prerelease, so they are the same -> this cannot be less than rhs
return false;
}
else return StringUtils::naturalCompare(m_string, rhs.m_string, Qt::CaseSensitive) < 0;
} else
return StringUtils::naturalCompare(m_string, rhs.m_string, Qt::CaseSensitive) < 0;
}
bool JavaVersion::operator==(const JavaVersion &rhs)
bool JavaVersion::operator==(const JavaVersion& rhs)
{
if(m_parseable && rhs.m_parseable)
{
if (m_parseable && rhs.m_parseable) {
return m_major == rhs.m_major && m_minor == rhs.m_minor && m_security == rhs.m_security && m_prerelease == rhs.m_prerelease;
}
return m_string == rhs.m_string;
}
bool JavaVersion::operator>(const JavaVersion &rhs)
bool JavaVersion::operator>(const JavaVersion& rhs)
{
return (!operator<(rhs)) && (!operator==(rhs));
}