From f83119ce7ec3d11a903901b8eff762d2b0a9f635 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Sun, 6 Oct 2013 01:13:40 +0200
Subject: Added file logger

---
 logic/lists/LwjglVersionList.cpp | 62 +++++++++++++++++++---------------------
 1 file changed, 30 insertions(+), 32 deletions(-)

(limited to 'logic/lists/LwjglVersionList.cpp')

diff --git a/logic/lists/LwjglVersionList.cpp b/logic/lists/LwjglVersionList.cpp
index b3e2dab4..6bf401ec 100644
--- a/logic/lists/LwjglVersionList.cpp
+++ b/logic/lists/LwjglVersionList.cpp
@@ -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
@@ -17,15 +17,14 @@
 #include "MultiMC.h"
 
 #include <QtNetwork>
-
 #include <QtXml>
-
 #include <QRegExp>
 
+#include <logger/QsLog.h>
+
 #define RSS_URL "http://sourceforge.net/api/file/index/project-id/58488/mtime/desc/rss"
 
-LWJGLVersionList::LWJGLVersionList(QObject *parent) :
-	QAbstractListModel(parent)
+LWJGLVersionList::LWJGLVersionList(QObject *parent) : QAbstractListModel(parent)
 {
 	setLoading(false);
 }
@@ -34,20 +33,20 @@ QVariant LWJGLVersionList::data(const QModelIndex &index, int role) const
 {
 	if (!index.isValid())
 		return QVariant();
-	
+
 	if (index.row() > count())
 		return QVariant();
-	
+
 	const PtrLWJGLVersion version = at(index.row());
-	
+
 	switch (role)
 	{
 	case Qt::DisplayRole:
 		return version->name();
-		
+
 	case Qt::ToolTipRole:
 		return version->url();
-		
+
 	default:
 		return QVariant();
 	}
@@ -59,10 +58,10 @@ QVariant LWJGLVersionList::headerData(int section, Qt::Orientation orientation,
 	{
 	case Qt::DisplayRole:
 		return "Version";
-		
+
 	case Qt::ToolTipRole:
 		return "LWJGL version name.";
-		
+
 	default:
 		return QVariant();
 	}
@@ -81,7 +80,7 @@ bool LWJGLVersionList::isLoading() const
 void LWJGLVersionList::loadList()
 {
 	Q_ASSERT_X(!m_loading, "loadList", "list is already loading (m_loading is true)");
-	
+
 	setLoading(true);
 	auto worker = MMC->qnam();
 	reply = worker->get(QNetworkRequest(QUrl(RSS_URL)));
@@ -102,68 +101,68 @@ void LWJGLVersionList::netRequestComplete()
 	if (reply->error() == QNetworkReply::NoError)
 	{
 		QRegExp lwjglRegex("lwjgl-(([0-9]\\.?)+)\\.zip");
-		Q_ASSERT_X(lwjglRegex.isValid(), "load LWJGL list", 
-				   "LWJGL regex is invalid");
-		
+		Q_ASSERT_X(lwjglRegex.isValid(), "load LWJGL list", "LWJGL regex is invalid");
+
 		QDomDocument doc;
-		
+
 		QString xmlErrorMsg;
 		int errorLine;
 		if (!doc.setContent(reply->readAll(), false, &xmlErrorMsg, &errorLine))
 		{
-			failed("Failed to load LWJGL list. XML error: " + xmlErrorMsg + " at line " + QString::number(errorLine));
+			failed("Failed to load LWJGL list. XML error: " + xmlErrorMsg + " at line " +
+				   QString::number(errorLine));
 			setLoading(false);
 			return;
 		}
-		
+
 		QDomNodeList items = doc.elementsByTagName("item");
-		
+
 		QList<PtrLWJGLVersion> tempList;
-		
+
 		for (int i = 0; i < items.length(); i++)
 		{
 			Q_ASSERT_X(items.at(i).isElement(), "load LWJGL list",
 					   "XML element isn't an element... wat?");
-			
+
 			QDomElement linkElement = getDomElementByTagName(items.at(i).toElement(), "link");
 			if (linkElement.isNull())
 			{
 				qWarning() << "Link element" << i << "in RSS feed doesn't exist! Skipping.";
 				continue;
 			}
-			
+
 			QString link = linkElement.text();
-			
+
 			// Make sure it's a download link.
 			if (link.endsWith("/download") && link.contains(lwjglRegex))
 			{
 				QString name = link.mid(lwjglRegex.indexIn(link) + 6);
 				// Subtract 4 here to remove the .zip file extension.
 				name = name.left(lwjglRegex.matchedLength() - 10);
-				
+
 				QUrl url(link);
 				if (!url.isValid())
 				{
 					qWarning() << "LWJGL version URL isn't valid:" << link << "Skipping.";
 					continue;
 				}
-				
+
 				tempList.append(LWJGLVersion::Create(name, link));
 			}
 		}
-		
+
 		beginResetModel();
 		m_vlist.swap(tempList);
 		endResetModel();
-		
-		qDebug("Loaded LWJGL list.");
+
+		QLOG_INFO() << "Loaded LWJGL list.";
 		finished();
 	}
 	else
 	{
 		failed("Failed to load LWJGL list. Network error: " + reply->errorString());
 	}
-	
+
 	setLoading(false);
 	reply->deleteLater();
 }
@@ -173,13 +172,12 @@ const PtrLWJGLVersion LWJGLVersionList::getVersion(const QString &versionName)
 	for (int i = 0; i < count(); i++)
 	{
 		QString name = at(i)->name();
-		if ( name == versionName)
+		if (name == versionName)
 			return at(i);
 	}
 	return PtrLWJGLVersion();
 }
 
-
 void LWJGLVersionList::failed(QString msg)
 {
 	qWarning() << msg;
-- 
cgit v1.2.3