From 7b96d74d3b197c23324c5a364809a91ea6800e4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Thu, 16 Jan 2014 23:06:07 +0100
Subject: Sort forge versions right. Do not spam the multimc log with mc server
 status stuff.

---
 logic/lists/ForgeVersionList.cpp |  8 ++------
 logic/lists/ForgeVersionList.h   | 21 +++++++++++++++++----
 2 files changed, 19 insertions(+), 10 deletions(-)

(limited to 'logic/lists')

diff --git a/logic/lists/ForgeVersionList.cpp b/logic/lists/ForgeVersionList.cpp
index 56eca744..38e033fa 100644
--- a/logic/lists/ForgeVersionList.cpp
+++ b/logic/lists/ForgeVersionList.cpp
@@ -404,12 +404,8 @@ void ForgeListLoadTask::listDownloaded()
 	{
 		return;
 	}
-
-	qSort(list.begin(), list.end(), [](const BaseVersionPtr & p1, const BaseVersionPtr & p2)
-	{
-		// TODO better comparison (takes major/minor/build number into account)
-		return p1->name() > p2->name();
-	});
+	std::sort(list.begin(), list.end(), [](const BaseVersionPtr & l, const BaseVersionPtr & r)
+	{ return (*l > *r); });
 
 	m_list->updateListData(list);
 
diff --git a/logic/lists/ForgeVersionList.h b/logic/lists/ForgeVersionList.h
index 924084ae..b19d3f56 100644
--- a/logic/lists/ForgeVersionList.h
+++ b/logic/lists/ForgeVersionList.h
@@ -29,25 +29,38 @@ typedef std::shared_ptr<ForgeVersion> ForgeVersionPtr;
 
 struct ForgeVersion : public BaseVersion
 {
-	virtual QString descriptor()
+	virtual QString descriptor() override
 	{
 		return filename;
 	}
 	;
-	virtual QString name()
+	virtual QString name() override
 	{
 		return "Forge " + jobbuildver;
 	}
 	;
-	virtual QString typeString() const
+	virtual QString typeString() const override
 	{
 		if (installer_url.isEmpty())
 			return "Universal";
 		else
 			return "Installer";
 	}
-	;
 
+	virtual bool operator<(BaseVersion &a) override
+	{
+		ForgeVersion *pa = dynamic_cast<ForgeVersion *>(&a);
+		if(!pa)
+			return true;
+		return m_buildnr < pa->m_buildnr;
+	}
+	virtual bool operator>(BaseVersion &a) override
+	{
+		ForgeVersion *pa = dynamic_cast<ForgeVersion *>(&a);
+		if(!pa)
+			return false;
+		return m_buildnr > pa->m_buildnr;
+	}
 	int m_buildnr = 0;
 	QString universal_url;
 	QString changelog_url;
-- 
cgit v1.2.3