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

fix: proper null padded version comparison

Browse Source 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
This commit is contained in:
Rachel Powers
2023-01-18 10:11:53 -07:00
committed by Edgars Cīrulis
parent 9934537e19
commit 7ed993b54e
2 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
launcher/Version.h
View File

@ -69,6 +69,7 @@ private:
explicit Section(const QString &fullString)
{
m_fullString = fullString;
m_isNull = true;
int cutoff = m_fullString.size();
for(int i = 0; i < m_fullString.size(); i++)
{
@ -86,6 +87,7 @@ private:
if(numPart.size())
{
numValid = true;
m_isNull = false;
m_numPart = numPart.toInt();
}
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
@ -95,6 +97,7 @@ private:
#endif
if(stringPart.size())
{
m_isNull = false;
m_stringPart = stringPart.toString();
}
}
@ -103,9 +106,17 @@ private:
int m_numPart = 0;
QString m_stringPart;
QString m_fullString;
bool m_isNull;
inline bool operator!=(const Section &other) const
{
if (m_isNull && other.numValid) {
return 0 != other.m_numPart;
} else if (numValid && other.m_isNull) {
return m_numPart != 0;
} else if (m_isNull || other.m_isNull) {
return false;
}
if(numValid && other.numValid)
{
return m_numPart != other.m_numPart || m_stringPart != other.m_stringPart;
@ -116,7 +127,14 @@ private:
}
}
inline bool operator<(const Section &other) const
{
{
if (m_isNull && other.numValid) {
return 0 < other.m_numPart;
} else if (numValid && other.m_isNull) {
return m_numPart < 0;
} else if (m_isNull || other.m_isNull) {
return true;
}
if(numValid && other.numValid)
{
if(m_numPart < other.m_numPart)
@ -132,6 +150,13 @@ private:
}
inline bool operator>(const Section &other) const
{
if (m_isNull && other.numValid) {
return 0 > other.m_numPart;
} else if (numValid && other.m_isNull) {
return m_numPart > 0;
} else if (m_isNull || other.m_isNull) {
return false;
}
if(numValid && other.numValid)
{
if(m_numPart > other.m_numPart)