CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SCRATCH nuke the overcomplicated logger, use a simple one.

Browse Source
This commit is contained in:
Petr Mrázek
2015-02-02 02:14:14 +01:00
parent 28a39ef7ac
commit cd9d37aac4
71 changed files with 415 additions and 934 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
logic/minecraft/ProfileUtils.cpp
View File

@ -1,7 +1,7 @@
#include "ProfileUtils.h"
#include "logic/minecraft/VersionFilterData.h"
#include "logic/MMCJson.h"
#include "logger/QsLog.h"
#include <QDebug>
#include <QJsonDocument>
#include <QJsonArray>
@ -26,7 +26,7 @@ bool writeOverrideOrders(QString path, const PatchOrder &order)
QSaveFile orderFile(path);
if (!orderFile.open(QFile::WriteOnly))
{
QLOG_ERROR() << "Couldn't open" << orderFile.fileName()
qCritical() << "Couldn't open" << orderFile.fileName()
<< "for writing:" << orderFile.errorString();
return false;
}
@ -50,14 +50,14 @@ bool readOverrideOrders(QString path, PatchOrder &order)
QFile orderFile(path);
if (!orderFile.exists())
{
QLOG_WARN() << "Order file doesn't exist. Ignoring.";
qWarning() << "Order file doesn't exist. Ignoring.";
return false;
}
if (!orderFile.open(QFile::ReadOnly))
{
QLOG_ERROR() << "Couldn't open" << orderFile.fileName()
qCritical() << "Couldn't open" << orderFile.fileName()
<< " for reading:" << orderFile.errorString();
QLOG_WARN() << "Ignoring overriden order";
qWarning() << "Ignoring overriden order";
return false;
}
@ -66,8 +66,8 @@ bool readOverrideOrders(QString path, PatchOrder &order)
QJsonDocument doc = QJsonDocument::fromJson(orderFile.readAll(), &error);
if (error.error != QJsonParseError::NoError)
{
QLOG_ERROR() << "Couldn't parse" << orderFile.fileName() << ":" << error.errorString();
QLOG_WARN() << "Ignoring overriden order";
qCritical() << "Couldn't parse" << orderFile.fileName() << ":" << error.errorString();
qWarning() << "Ignoring overriden order";
return false;
}
@ -90,8 +90,8 @@ bool readOverrideOrders(QString path, PatchOrder &order)
}
catch (JSONValidationError &err)
{
QLOG_ERROR() << "Couldn't parse" << orderFile.fileName() << ": bad file format";
QLOG_WARN() << "Ignoring overriden order";
qCritical() << "Couldn't parse" << orderFile.fileName() << ": bad file format";
qWarning() << "Ignoring overriden order";
order.clear();
return false;
}