Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop

1 files changed, 73 insertions, 40 deletions

diff --git a/logic/lists/LwjglVersionList.h b/logic/lists/LwjglVersionList.h
index 99712292..fa57e8eb 100644
--- a/logic/lists/LwjglVersionList.h
+++ b/logic/lists/LwjglVersionList.h
@@ -3,7 +3,7 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
@@ -28,20 +28,30 @@ typedef std::shared_ptr<LWJGLVersion> PtrLWJGLVersion;
 class LWJGLVersion : public QObject
 {
 	Q_OBJECT
-	
-	LWJGLVersion(const QString &name, const QString &url, QObject *parent = 0) :
-		QObject(parent), m_name(name), m_url(url) { }
+
+	LWJGLVersion(const QString &name, const QString &url, QObject *parent = 0)
+		: QObject(parent), m_name(name), m_url(url)
+	{
+	}
+
 public:
-	
+
 	static PtrLWJGLVersion Create(const QString &name, const QString &url, QObject *parent = 0)
 	{
 		return PtrLWJGLVersion(new LWJGLVersion(name, url, parent));
-	};
-	
-	QString name() const { return m_name; }
-	
-	QString url() const { return m_url; }
-	
+	}
+	;
+
+	QString name() const
+	{
+		return m_name;
+	}
+
+	QString url() const
+	{
+		return m_url;
+	}
+
 protected:
 	QString m_name;
 	QString m_url;
@@ -52,64 +62,87 @@ class LWJGLVersionList : public QAbstractListModel
 	Q_OBJECT
 public:
 	explicit LWJGLVersionList(QObject *parent = 0);
-	
-	bool isLoaded() { return m_vlist.length() > 0; }
-	
+
+	bool isLoaded()
+	{
+		return m_vlist.length() > 0;
+	}
+
 	const PtrLWJGLVersion getVersion(const QString &versionName);
-	PtrLWJGLVersion at(int index) { return m_vlist[index]; }
-	const PtrLWJGLVersion at(int index) const { return m_vlist[index]; }
-	
-	int count() const { return m_vlist.length(); }
-	
+	PtrLWJGLVersion at(int index)
+	{
+		return m_vlist[index];
+	}
+	const PtrLWJGLVersion at(int index) const
+	{
+		return m_vlist[index];
+	}
+
+	int count() const
+	{
+		return m_vlist.length();
+	}
+
 	virtual QVariant data(const QModelIndex &index, int role) const;
 	virtual QVariant headerData(int section, Qt::Orientation orientation, int role) const;
-	virtual int rowCount(const QModelIndex &parent) const { return count(); }
+	virtual int rowCount(const QModelIndex &parent) const
+	{
+		return count();
+	}
 	virtual int columnCount(const QModelIndex &parent) const;
-	
+
 	virtual bool isLoading() const;
-	virtual bool errored() const { return m_errored; }
-	
-	virtual QString lastErrorMsg() const { return m_lastErrorMsg; }
-	
-public slots:
+	virtual bool errored() const
+	{
+		return m_errored;
+	}
+
+	virtual QString lastErrorMsg() const
+	{
+		return m_lastErrorMsg;
+	}
+
+public
+slots:
 	/*!
 	 * Loads the version list.
 	 * This is done asynchronously. On success, the loadListFinished() signal will
-	 * be emitted. The list model will be reset as well, resulting in the modelReset() 
-	 * signal being emitted. Note that the model will be reset before loadListFinished() is emitted.
+	 * be emitted. The list model will be reset as well, resulting in the modelReset()
+	 * signal being emitted. Note that the model will be reset before loadListFinished() is
+	 * emitted.
 	 * If loading the list failed, the loadListFailed(QString msg),
 	 * signal will be emitted.
 	 */
 	virtual void loadList();
-	
+
 signals:
 	/*!
 	 * Emitted when the list either starts or finishes loading.
 	 * \param loading Whether or not the list is loading.
 	 */
 	void loadingStateUpdated(bool loading);
-	
+
 	void loadListFinished();
-	
+
 	void loadListFailed(QString msg);
-	
+
 private:
 	QList<PtrLWJGLVersion> m_vlist;
-	
+
 	QNetworkReply *m_netReply;
 	QNetworkReply *reply;
-	
+
 	bool m_loading;
 	bool m_errored;
 	QString m_lastErrorMsg;
-	
+
 	void failed(QString msg);
-	
+
 	void finished();
-	
+
 	void setLoading(bool loading);
-	
-private slots:
+
+private
+slots:
 	virtual void netRequestComplete();
 };
-