From cd9d37aac402b0edd0f12b66fd7f2fdd5fe6dff5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Mon, 2 Feb 2015 02:14:14 +0100
Subject: SCRATCH nuke the overcomplicated logger, use a simple one.

---
 logic/java/JavaCheckerJob.cpp  |  6 +++---
 logic/java/JavaUtils.cpp       |  6 +++---
 logic/java/JavaVersionList.cpp | 12 ++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'logic/java')

diff --git a/logic/java/JavaCheckerJob.cpp b/logic/java/JavaCheckerJob.cpp
index 8fd423c1..149024c0 100644
--- a/logic/java/JavaCheckerJob.cpp
+++ b/logic/java/JavaCheckerJob.cpp
@@ -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)
 	{
diff --git a/logic/java/JavaUtils.cpp b/logic/java/JavaUtils.cpp
index a522f45c..3cacbbd2 100644
--- a/logic/java/JavaUtils.cpp
+++ b/logic/java/JavaUtils.cpp
@@ -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);
diff --git a/logic/java/JavaVersionList.cpp b/logic/java/JavaVersionList.cpp
index 73e8259a..4f8592ce 100644
--- a/logic/java/JavaVersionList.cpp
+++ b/logic/java/JavaVersionList.cpp
@@ -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)
-- 
cgit v1.2.3