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

10
gui/MainWindow.cpp
View File

@ -916,7 +916,7 @@ void MainWindow::updateAvailable(QString repo, QString versionName, int versionI
switch (action)
{
case UPDATE_LATER:
QLOG_INFO() << "Update will be installed later.";
qDebug() << "Update will be installed later.";
break;
case UPDATE_NOW:
downloadUpdates(repo, versionId);
@ -975,7 +975,7 @@ void MainWindow::notificationsChanged()
void MainWindow::downloadUpdates(QString repo, int versionId, bool installOnExit)
{
QLOG_INFO() << "Downloading updates.";
qDebug() << "Downloading updates.";
// TODO: If the user chooses to update on exit, we should download updates in the
// background.
// Doing so is a bit complicated, because we'd have to make sure it finished downloading
@ -1086,7 +1086,7 @@ void MainWindow::instanceFromZipPack(QString instName, QString instGroup, QStrin
QTemporaryDir extractTmpDir;
QDir extractDir(extractTmpDir.path());
QLOG_INFO() << "Attempting to create instance from" << archivePath;
qDebug() << "Attempting to create instance from" << archivePath;
if (JlCompress::extractDir(archivePath, extractDir.absolutePath()).isEmpty())
{
CustomMessageBox::selectable(this, tr("Error"),
@ -1730,7 +1730,7 @@ void MainWindow::doLaunch(bool online, BaseProfilerFactory *profiler)
{
case AuthSession::Undetermined:
{
QLOG_ERROR() << "Received undetermined session status during login. Bye.";
qCritical() << "Received undetermined session status during login. Bye.";
tryagain = false;
break;
}
@ -2004,7 +2004,7 @@ void MainWindow::checkSetDefaultJava()
if (askForJava)
{
QLOG_DEBUG() << "Java path needs resetting, showing Java selection dialog...";
qDebug() << "Java path needs resetting, showing Java selection dialog...";
JavaVersionPtr java;

4
gui/dialogs/AccountSelectDialog.cpp
View File

@ -18,7 +18,7 @@
#include <QItemSelectionModel>
#include <logger/QsLog.h>
#include <QDebug>
#include <gui/dialogs/ProgressDialog.h>
@ -40,7 +40,7 @@ AccountSelectDialog::AccountSelectDialog(const QString &message, int flags, QWid
// Flags...
ui->globalDefaultCheck->setVisible(flags & GlobalDefaultCheckbox);
ui->instDefaultCheck->setVisible(flags & InstanceDefaultCheckbox);
QLOG_DEBUG() << flags;
qDebug() << flags;
// Select the first entry in the list.
ui->listView->setCurrentIndex(ui->listView->model()->index(0, 0));

12
gui/dialogs/UpdateDialog.cpp
View File

@ -1,7 +1,7 @@
#include "UpdateDialog.h"
#include "ui_UpdateDialog.h"
#include "gui/Platform.h"
#include "logger/QsLog.h"
#include <QDebug>
#include "MultiMC.h"
#include <logic/settings/SettingsObject.h>
@ -82,7 +82,7 @@ QString reprocessMarkdown(QString markdown)
html << "<ul>\n";
html << "<li>" << procLine(line.mid(2)) << "</li>\n";
}
else QLOG_ERROR() << "Invalid input on line " << i << ": " << line;
else qCritical() << "Invalid input on line " << i << ": " << line;
break;
case LIST1:
if(line.startsWith("##"))
@ -107,7 +107,7 @@ QString reprocessMarkdown(QString markdown)
html << "<ul>\n";
html << "<li>" << procLine(line.mid(4)) << "</li>\n";
}
else QLOG_ERROR() << "Invalid input on line " << i << ": " << line;
else qCritical() << "Invalid input on line " << i << ": " << line;
break;
case LIST2:
if(line.startsWith("##"))
@ -134,7 +134,7 @@ QString reprocessMarkdown(QString markdown)
{
html << "<li>" << procLine(line.mid(4)) << "</li>\n";
}
else QLOG_ERROR() << "Invalid input on line " << i << ": " << line;
else qCritical() << "Invalid input on line " << i << ": " << line;
break;
}
i++;
@ -151,10 +151,10 @@ QString reprocessMarkdown(QString markdown)
}
if (state != BASE)
{
QLOG_ERROR() << "Reprocessing markdown didn't end in a final state!";
qCritical() << "Reprocessing markdown didn't end in a final state!";
}
html << "</html>\n";
QLOG_DEBUG() << htmlData;
qDebug() << htmlData;
return htmlData;
}

2
gui/dialogs/VersionSelectDialog.cpp
View File

@ -25,7 +25,7 @@
#include <logic/BaseVersionList.h>
#include <logic/tasks/Task.h>
#include <depends/util/include/modutils.h>
#include "logger/QsLog.h"
#include <QDebug>
class VersionSelectProxyModel : public QSortFilterProxyModel
{

2
gui/groupview/GroupView.cpp
View File

@ -12,7 +12,7 @@
#include <QScrollBar>
#include "VisualGroup.h"
#include "logger/QsLog.h"
#include <QDebug>
template <typename T> bool listsIntersect(const QList<T> &l1, const QList<T> t2)
{

8
gui/groupview/GroupedProxyModel.cpp
View File

@ -1,7 +1,7 @@
#include "GroupedProxyModel.h"
#include "GroupView.h"
#include "logger/QsLog.h"
#include <QDebug>
GroupedProxyModel::GroupedProxyModel(QObject *parent) : QSortFilterProxyModel(parent)
{
@ -21,16 +21,16 @@ bool GroupedProxyModel::lessThan(const QModelIndex &left, const QModelIndex &rig
auto result = leftCategory.localeAwareCompare(rightCategory);
if(result < 0)
{
QLOG_DEBUG() << leftCategory << "<" << rightCategory;
qDebug() << leftCategory << "<" << rightCategory;
}
if(result == 0)
{
QLOG_DEBUG() << leftCategory << "=" << rightCategory;
qDebug() << leftCategory << "=" << rightCategory;
return subSortLessThan(left, right);
}
if(result > 0)
{
QLOG_DEBUG() << leftCategory << ">" << rightCategory;
qDebug() << leftCategory << ">" << rightCategory;
}
return result < 0;
}

2
gui/pages/global/AccountListPage.cpp
View File

@ -18,7 +18,7 @@
#include <QItemSelectionModel>
#include <logger/QsLog.h>
#include <QDebug>
#include "logic/net/NetJob.h"
#include "logic/net/URLConstants.h"

2
gui/pages/global/MultiMCPage.cpp
View File

@ -212,7 +212,7 @@ void MultiMCPage::refreshUpdateChannelList()
// the combo box to it.
if (entry.id == m_currentUpdateChannel)
{
QLOG_DEBUG() << "Selected index" << i << "channel id" << m_currentUpdateChannel;
qDebug() << "Selected index" << i << "channel id" << m_currentUpdateChannel;
selection = i;
}
}