SCRATCH remove remaining references to MultiMC.h and fix legacy LWJGL

1 files changed, 24 insertions, 18 deletions

diff --git a/logic/LwjglVersionList.h b/logic/LwjglVersionList.h
index 4ddad218..9205b964 100644
--- a/logic/LwjglVersionList.h
+++ b/logic/LwjglVersionList.h
@@ -21,32 +21,35 @@
 #include <QNetworkReply>
 
 #include <memory>
+#include "BaseVersion.h"
+#include "BaseVersionList.h"
 
 class LWJGLVersion;
 typedef std::shared_ptr<LWJGLVersion> PtrLWJGLVersion;
 
-class LWJGLVersion : public QObject
+class LWJGLVersion : public BaseVersion
 {
-	Q_OBJECT
-
-	LWJGLVersion(const QString &name, const QString &url, QObject *parent = 0)
-		: QObject(parent), m_name(name), m_url(url)
+public:
+	LWJGLVersion(const QString &name, const QString &url)
+		: m_name(name), m_url(url)
 	{
 	}
 
-public:
-
-	static PtrLWJGLVersion Create(const QString &name, const QString &url, QObject *parent = 0)
+	virtual QString descriptor()
 	{
-		return PtrLWJGLVersion(new LWJGLVersion(name, url, parent));
+		return m_name;
 	}
-	;
 
-	QString name() const
+	virtual QString name()
 	{
 		return m_name;
 	}
 
+	virtual QString typeString() const
+	{
+		return QObject::tr("Upstream");
+	}
+
 	QString url() const
 	{
 		return m_url;
@@ -57,7 +60,7 @@ protected:
 	QString m_url;
 };
 
-class LWJGLVersionList : public QAbstractListModel
+class LWJGLVersionList : public BaseVersionList
 {
 	Q_OBJECT
 public:
@@ -67,17 +70,20 @@ public:
 	{
 		return m_vlist.length() > 0;
 	}
-
-	const PtrLWJGLVersion getVersion(const QString &versionName);
-	PtrLWJGLVersion at(int index)
+	virtual const BaseVersionPtr at(int i) const override
 	{
-		return m_vlist[index];
+		return m_vlist[i];
 	}
-	const PtrLWJGLVersion at(int index) const
+
+	virtual Task* getLoadTask()
 	{
-		return m_vlist[index];
+		return nullptr;
 	}
 
+	virtual void sort() {};
+
+	virtual void updateListData(QList< BaseVersionPtr > versions) {};
+
 	int count() const
 	{
 		return m_vlist.length();