diff options
| author | flow <flowlnlnln@gmail.com> | 2022-11-03 16:41:55 -0300 |
|---|---|---|
| committer | flow <flowlnlnln@gmail.com> | 2022-11-04 16:53:24 -0300 |
| commit | 353b51f11ea406dd027096c30ec9626ee4e2c417 (patch) | |
| tree | bbd288e7a6060d96824876d38dd861fe5a3546b4 /launcher/java | |
| parent | 76050880f16bef13ed152f379e72ce52042676a2 (diff) | |
| download | PrismLauncher-353b51f11ea406dd027096c30ec9626ee4e2c417.tar.gz PrismLauncher-353b51f11ea406dd027096c30ec9626ee4e2c417.tar.bz2 PrismLauncher-353b51f11ea406dd027096c30ec9626ee4e2c417.zip | |
refactor: move MMCStrings -> StringUtils
General utilities can go in here >:)
Signed-off-by: flow <flowlnlnln@gmail.com>
Diffstat (limited to 'launcher/java')
| -rw-r--r-- | launcher/java/JavaInstall.cpp | 7 | ||||
| -rw-r--r-- | launcher/java/JavaInstallList.cpp | 1 | ||||
| -rw-r--r-- | launcher/java/JavaVersion.cpp | 7 |
3 files changed, 8 insertions, 7 deletions
diff --git a/launcher/java/JavaInstall.cpp b/launcher/java/JavaInstall.cpp index 5bcf7bcb..d5932bcb 100644 --- a/launcher/java/JavaInstall.cpp +++ b/launcher/java/JavaInstall.cpp @@ -1,9 +1,10 @@ #include "JavaInstall.h" -#include <MMCStrings.h> + +#include "StringUtils.h" bool JavaInstall::operator<(const JavaInstall &rhs) { - auto archCompare = Strings::naturalCompare(arch, rhs.arch, Qt::CaseInsensitive); + auto archCompare = StringUtils::naturalCompare(arch, rhs.arch, Qt::CaseInsensitive); if(archCompare != 0) return archCompare < 0; if(id < rhs.id) @@ -14,7 +15,7 @@ bool JavaInstall::operator<(const JavaInstall &rhs) { return false; } - return Strings::naturalCompare(path, rhs.path, Qt::CaseInsensitive) < 0; + return StringUtils::naturalCompare(path, rhs.path, Qt::CaseInsensitive) < 0; } bool JavaInstall::operator==(const JavaInstall &rhs) diff --git a/launcher/java/JavaInstallList.cpp b/launcher/java/JavaInstallList.cpp index 0249bd22..d2bfde05 100644 --- a/launcher/java/JavaInstallList.cpp +++ b/launcher/java/JavaInstallList.cpp @@ -41,7 +41,6 @@ #include "java/JavaInstallList.h" #include "java/JavaCheckerJob.h" #include "java/JavaUtils.h" -#include "MMCStrings.h" #include "minecraft/VersionFilterData.h" JavaInstallList::JavaInstallList(QObject *parent) : BaseVersionList(parent) diff --git a/launcher/java/JavaVersion.cpp b/launcher/java/JavaVersion.cpp index 179ccd8d..0e4fc1d3 100644 --- a/launcher/java/JavaVersion.cpp +++ b/launcher/java/JavaVersion.cpp @@ -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) |