aboutsummaryrefslogtreecommitdiff
path: root/launcher
diff options
context:
space:
mode:
authorTrial97 <alexandru.tripon97@gmail.com>2023-07-14 13:31:13 +0300
committerTrial97 <alexandru.tripon97@gmail.com>2023-07-14 13:31:13 +0300
commitfc4a1ef1935059b3c8e4f5d7bdac9fa2311485ac (patch)
tree2e882303b945ca17b7f5391ae4b09a2ed48da691 /launcher
parent3becd4386bd49c9c91a72647de10faa16c6d700a (diff)
downloadPrismLauncher-fc4a1ef1935059b3c8e4f5d7bdac9fa2311485ac.tar.gz
PrismLauncher-fc4a1ef1935059b3c8e4f5d7bdac9fa2311485ac.tar.bz2
PrismLauncher-fc4a1ef1935059b3c8e4f5d7bdac9fa2311485ac.zip
format
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
Diffstat (limited to 'launcher')
-rw-r--r--launcher/BaseVersion.h19
-rw-r--r--launcher/java/JavaInstall.cpp14
-rw-r--r--launcher/java/JavaInstall.h31
3 files changed, 21 insertions, 43 deletions
diff --git a/launcher/BaseVersion.h b/launcher/BaseVersion.h
index ca0e4502..c7cedbe1 100644
--- a/launcher/BaseVersion.h
+++ b/launcher/BaseVersion.h
@@ -15,16 +15,15 @@
#pragma once
-#include <memory>
-#include <QString>
#include <QMetaType>
+#include <QString>
+#include <memory>
/*!
* An abstract base class for versions.
*/
-class BaseVersion
-{
-public:
+class BaseVersion {
+ public:
using Ptr = std::shared_ptr<BaseVersion>;
virtual ~BaseVersion() {}
/*!
@@ -45,14 +44,8 @@ public:
*/
virtual QString typeString() const = 0;
- virtual bool operator<(BaseVersion &a)
- {
- return name() < a.name();
- };
- virtual bool operator>(BaseVersion &a)
- {
- return name() > a.name();
- };
+ virtual bool operator<(BaseVersion& a) { return name() < a.name(); };
+ virtual bool operator>(BaseVersion& a) { return name() > a.name(); };
};
Q_DECLARE_METATYPE(BaseVersion::Ptr)
diff --git a/launcher/java/JavaInstall.cpp b/launcher/java/JavaInstall.cpp
index d5932bcb..f095aa37 100644
--- a/launcher/java/JavaInstall.cpp
+++ b/launcher/java/JavaInstall.cpp
@@ -2,28 +2,26 @@
#include "StringUtils.h"
-bool JavaInstall::operator<(const JavaInstall &rhs)
+bool JavaInstall::operator<(const JavaInstall& rhs)
{
auto archCompare = StringUtils::naturalCompare(arch, rhs.arch, Qt::CaseInsensitive);
- if(archCompare != 0)
+ if (archCompare != 0)
return archCompare < 0;
- if(id < rhs.id)
- {
+ if (id < rhs.id) {
return true;
}
- if(id > rhs.id)
- {
+ if (id > rhs.id) {
return false;
}
return StringUtils::naturalCompare(path, rhs.path, Qt::CaseInsensitive) < 0;
}
-bool JavaInstall::operator==(const JavaInstall &rhs)
+bool JavaInstall::operator==(const JavaInstall& rhs)
{
return arch == rhs.arch && id == rhs.id && path == rhs.path;
}
-bool JavaInstall::operator>(const JavaInstall &rhs)
+bool JavaInstall::operator>(const JavaInstall& rhs)
{
return (!operator<(rhs)) && (!operator==(rhs));
}
diff --git a/launcher/java/JavaInstall.h b/launcher/java/JavaInstall.h
index 64be40d1..2d6e4d53 100644
--- a/launcher/java/JavaInstall.h
+++ b/launcher/java/JavaInstall.h
@@ -3,31 +3,18 @@
#include "BaseVersion.h"
#include "JavaVersion.h"
-struct JavaInstall : public BaseVersion
-{
- JavaInstall(){}
- JavaInstall(QString id, QString arch, QString path)
- : id(id), arch(arch), path(path)
- {
- }
- virtual QString descriptor()
- {
- return id.toString();
- }
+struct JavaInstall : public BaseVersion {
+ JavaInstall() {}
+ JavaInstall(QString id, QString arch, QString path) : id(id), arch(arch), path(path) {}
+ virtual QString descriptor() { return id.toString(); }
- virtual QString name()
- {
- return id.toString();
- }
+ virtual QString name() { return id.toString(); }
- virtual QString typeString() const
- {
- return arch;
- }
+ virtual QString typeString() const { return arch; }
- bool operator<(const JavaInstall & rhs);
- bool operator==(const JavaInstall & rhs);
- bool operator>(const JavaInstall & rhs);
+ bool operator<(const JavaInstall& rhs);
+ bool operator==(const JavaInstall& rhs);
+ bool operator>(const JavaInstall& rhs);
JavaVersion id;
QString arch;