summaryrefslogtreecommitdiffstats
path: root/gui
diff options
context:
space:
mode:
Diffstat (limited to 'gui')
-rw-r--r--gui/MainWindow.cpp10
-rw-r--r--gui/dialogs/AccountSelectDialog.cpp4
-rw-r--r--gui/dialogs/UpdateDialog.cpp12
-rw-r--r--gui/dialogs/VersionSelectDialog.cpp2
-rw-r--r--gui/groupview/GroupView.cpp2
-rw-r--r--gui/groupview/GroupedProxyModel.cpp8
-rw-r--r--gui/pages/global/AccountListPage.cpp2
-rw-r--r--gui/pages/global/MultiMCPage.cpp2
8 files changed, 21 insertions, 21 deletions
diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp
index f0d882ba..2025a097 100644
--- a/gui/MainWindow.cpp
+++ b/gui/MainWindow.cpp
@@ -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;
diff --git a/gui/dialogs/AccountSelectDialog.cpp b/gui/dialogs/AccountSelectDialog.cpp
index 4d10112e..6ae60738 100644
--- a/gui/dialogs/AccountSelectDialog.cpp
+++ b/gui/dialogs/AccountSelectDialog.cpp
@@ -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));
diff --git a/gui/dialogs/UpdateDialog.cpp b/gui/dialogs/UpdateDialog.cpp
index 29d09ead..1fcc156a 100644
--- a/gui/dialogs/UpdateDialog.cpp
+++ b/gui/dialogs/UpdateDialog.cpp
@@ -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;
}
diff --git a/gui/dialogs/VersionSelectDialog.cpp b/gui/dialogs/VersionSelectDialog.cpp
index e9758d55..a0a58699 100644
--- a/gui/dialogs/VersionSelectDialog.cpp
+++ b/gui/dialogs/VersionSelectDialog.cpp
@@ -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
{
diff --git a/gui/groupview/GroupView.cpp b/gui/groupview/GroupView.cpp
index 502cf259..89694b87 100644
--- a/gui/groupview/GroupView.cpp
+++ b/gui/groupview/GroupView.cpp
@@ -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)
{
diff --git a/gui/groupview/GroupedProxyModel.cpp b/gui/groupview/GroupedProxyModel.cpp
index 30845caa..a45c5ae9 100644
--- a/gui/groupview/GroupedProxyModel.cpp
+++ b/gui/groupview/GroupedProxyModel.cpp
@@ -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;
}
diff --git a/gui/pages/global/AccountListPage.cpp b/gui/pages/global/AccountListPage.cpp
index 2de77115..72e18405 100644
--- a/gui/pages/global/AccountListPage.cpp
+++ b/gui/pages/global/AccountListPage.cpp
@@ -18,7 +18,7 @@
#include <QItemSelectionModel>
-#include <logger/QsLog.h>
+#include <QDebug>
#include "logic/net/NetJob.h"
#include "logic/net/URLConstants.h"
diff --git a/gui/pages/global/MultiMCPage.cpp b/gui/pages/global/MultiMCPage.cpp
index 3226de83..d2934666 100644
--- a/gui/pages/global/MultiMCPage.cpp
+++ b/gui/pages/global/MultiMCPage.cpp
@@ -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;
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 04:19:09 +0000