Merge pull request #1362 from Trial97/fix_warning

3 files changed, 81 insertions, 46 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..cfa47140 100644
--- a/launcher/java/JavaInstall.cpp
+++ b/launcher/java/JavaInstall.cpp
@@ -1,29 +1,64 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 #include "JavaInstall.h"
 
+#include "BaseVersion.h"
 #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));
 }
+
+bool JavaInstall::operator<(BaseVersion& a)
+{
+    try {
+        return operator<(dynamic_cast<JavaInstall&>(a));
+    } catch (const std::bad_cast& e) {
+        return BaseVersion::operator<(a);
+    }
+}
+
+bool JavaInstall::operator>(BaseVersion& a)
+{
+    try {
+        return operator>(dynamic_cast<JavaInstall&>(a));
+    } catch (const std::bad_cast& e) {
+        return BaseVersion::operator>(a);
+    }
+}
diff --git a/launcher/java/JavaInstall.h b/launcher/java/JavaInstall.h
index 64be40d1..30815b5a 100644
--- a/launcher/java/JavaInstall.h
+++ b/launcher/java/JavaInstall.h
@@ -1,33 +1,40 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 #pragma once
 
 #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();
-    }
-
-    virtual QString name()
-    {
-        return id.toString();
-    }
-
-    virtual QString typeString() const
-    {
-        return arch;
-    }
-
-    bool operator<(const JavaInstall & rhs);
-    bool operator==(const JavaInstall & rhs);
-    bool operator>(const JavaInstall & rhs);
+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 typeString() const { return arch; }
+
+    virtual bool operator<(BaseVersion& a) override;
+    virtual bool operator>(BaseVersion& a) override;
+    bool operator<(const JavaInstall& rhs);
+    bool operator==(const JavaInstall& rhs);
+    bool operator>(const JavaInstall& rhs);
 
     JavaVersion id;
     QString arch;