Merge pull request #397 from flowln/windows_mod_updater_fixes_maybe

Fixes https://github.com/PrismLauncher/PrismLauncher/issues/226
This commit is contained in:
Sefa Eyeoglu 2022-11-10 14:34:15 +01:00
parent 79617d0c50
commit 0120d170b7
No known key found for this signature in database
GPG key ID: C10411294912A422
21 changed files with 102 additions and 90 deletions

View file

@ -1,5 +1,6 @@
#include "JavaVersion.h"
#include <MMCStrings.h>
#include "StringUtils.h"
#include <QRegularExpression>
#include <QString>
@ -98,12 +99,12 @@ bool JavaVersion::operator<(const JavaVersion &rhs)
else if(thisPre && rhsPre)
{
// both are prereleases - use natural compare...
return Strings::naturalCompare(m_prerelease, rhs.m_prerelease, Qt::CaseSensitive) < 0;
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 Strings::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)