From cd9d37aac402b0edd0f12b66fd7f2fdd5fe6dff5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Mon, 2 Feb 2015 02:14:14 +0100 Subject: SCRATCH nuke the overcomplicated logger, use a simple one. --- logic/minecraft/ProfileUtils.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'logic/minecraft/ProfileUtils.cpp') diff --git a/logic/minecraft/ProfileUtils.cpp b/logic/minecraft/ProfileUtils.cpp index db05b0a6..21fcb2ef 100644 --- a/logic/minecraft/ProfileUtils.cpp +++ b/logic/minecraft/ProfileUtils.cpp @@ -1,7 +1,7 @@ #include "ProfileUtils.h" #include "logic/minecraft/VersionFilterData.h" #include "logic/MMCJson.h" -#include "logger/QsLog.h" +#include #include #include @@ -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; } -- cgit v1.2.3