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

6
logic/java/JavaCheckerJob.cpp
View File

@ -16,12 +16,12 @@
#include "JavaCheckerJob.h"
#include "pathutils.h"
#include "logger/QsLog.h"
#include <QDebug>
void JavaCheckerJob::partFinished(JavaCheckResult result)
{
num_finished++;
QLOG_INFO() << m_job_name.toLocal8Bit() << "progress:" << num_finished << "/"
qDebug() << m_job_name.toLocal8Bit() << "progress:" << num_finished << "/"
<< javacheckers.size();
emit progress(num_finished, javacheckers.size());
@ -35,7 +35,7 @@ void JavaCheckerJob::partFinished(JavaCheckResult result)
void JavaCheckerJob::start()
{
QLOG_INFO() << m_job_name.toLocal8Bit() << " started.";
qDebug() << m_job_name.toLocal8Bit() << " started.";
m_running = true;
for (auto iter : javacheckers)
{

6
logic/java/JavaUtils.cpp
View File

@ -21,7 +21,7 @@
#include <logic/settings/Setting.h>
#include <pathutils.h>
#include "logger/QsLog.h"
#include <QDebug>
#include "logic/java/JavaUtils.h"
#include "logic/java/JavaCheckerJob.h"
#include "logic/java/JavaVersionList.h"
@ -197,7 +197,7 @@ QList<QString> JavaUtils::FindJavaPaths()
#elif LINUX
QList<QString> JavaUtils::FindJavaPaths()
{
QLOG_INFO() << "Linux Java detection incomplete - defaulting to \"java\"";
qDebug() << "Linux Java detection incomplete - defaulting to \"java\"";
QList<QString> javas;
javas.append(this->GetDefaultJava()->path);
@ -209,7 +209,7 @@ QList<QString> JavaUtils::FindJavaPaths()
#else
QList<QString> JavaUtils::FindJavaPaths()
{
QLOG_INFO() << "Unknown operating system build - defaulting to \"java\"";
qDebug() << "Unknown operating system build - defaulting to \"java\"";
QList<QString> javas;
javas.append(this->GetDefaultJava()->path);

12
logic/java/JavaVersionList.cpp
View File

@ -17,7 +17,7 @@
#include <QtXml>
#include <QRegExp>
#include "logger/QsLog.h"
#include <QDebug>
#include "logic/java/JavaVersionList.h"
#include "logic/java/JavaCheckerJob.h"
@ -180,11 +180,11 @@ void JavaListLoadTask::executeTask()
connect(m_job.get(), SIGNAL(finished(QList<JavaCheckResult>)), this, SLOT(javaCheckerFinished(QList<JavaCheckResult>)));
connect(m_job.get(), SIGNAL(progress(int, int)), this, SLOT(checkerProgress(int, int)));
QLOG_DEBUG() << "Probing the following Java paths: ";
qDebug() << "Probing the following Java paths: ";
int id = 0;
for(QString candidate : candidate_paths)
{
QLOG_DEBUG() << " " << candidate;
qDebug() << " " << candidate;
auto candidate_checker = new JavaChecker();
candidate_checker->path = candidate;
@ -207,7 +207,7 @@ void JavaListLoadTask::javaCheckerFinished(QList<JavaCheckResult> results)
{
QList<JavaVersionPtr> candidates;
QLOG_DEBUG() << "Found the following valid Java installations:";
qDebug() << "Found the following valid Java installations:";
for(JavaCheckResult result : results)
{
if(result.valid)
@ -219,14 +219,14 @@ void JavaListLoadTask::javaCheckerFinished(QList<JavaCheckResult> results)
javaVersion->path = result.path;
candidates.append(javaVersion);
QLOG_DEBUG() << " " << javaVersion->id << javaVersion->arch << javaVersion->path;
qDebug() << " " << javaVersion->id << javaVersion->arch << javaVersion->path;
}
}
QList<BaseVersionPtr> javas_bvp;
for (auto java : candidates)
{
//QLOG_INFO() << java->id << java->arch << " at " << java->path;
//qDebug() << java->id << java->arch << " at " << java->path;
BaseVersionPtr bp_java = std::dynamic_pointer_cast<BaseVersion>(java);
if (bp_java)