NOISSUE reformat MeshMC to new clang format rules and fixed macOS portability issue and java find issue

Signed-off-by: Mehmet Samet Duman <yongdohyun@projecttick.org>

1 files changed, 96 insertions, 105 deletions

diff --git a/launcher/tasks/Task.cpp b/launcher/tasks/Task.cpp
index e7fb0cdd8e..9f55b38699 100644
--- a/launcher/tasks/Task.cpp
+++ b/launcher/tasks/Task.cpp
@@ -17,7 +17,7 @@
  *
  *   You should have received a copy of the GNU General Public License
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *  
+ *
  *  This file incorporates work covered by the following copyright and
  *  permission notice:
  *
@@ -41,158 +41,149 @@
 #include <QDebug>
 #include <QPointer>
 
-Task::Task(QObject *parent) : QObject(parent)
-{
-}
+Task::Task(QObject* parent) : QObject(parent) {}
 
-void Task::setStatus(const QString &new_status)
+void Task::setStatus(const QString& new_status)
 {
-    if(m_status != new_status)
-    {
-        m_status = new_status;
-        emit status(m_status);
-    }
+	if (m_status != new_status) {
+		m_status = new_status;
+		emit status(m_status);
+	}
 }
 
 void Task::setProgress(qint64 current, qint64 total)
 {
-    m_progress = current;
-    m_progressTotal = total;
-    emit progress(m_progress, m_progressTotal);
+	m_progress = current;
+	m_progressTotal = total;
+	emit progress(m_progress, m_progressTotal);
 }
 
 void Task::start()
 {
-    switch(m_state)
-    {
-        case State::Inactive:
-        {
-            qDebug() << "Task" << describe() << "starting for the first time";
-            break;
-        }
-        case State::AbortedByUser:
-        {
-            qDebug() << "Task" << describe() << "restarting for after being aborted by user";
-            break;
-        }
-        case State::Failed:
-        {
-            qDebug() << "Task" << describe() << "restarting for after failing at first";
-            break;
-        }
-        case State::Succeeded:
-        {
-            qDebug() << "Task" << describe() << "restarting for after succeeding at first";
-            break;
-        }
-        case State::Running:
-        {
-            qWarning() << "MeshMC tried to start task" << describe() << "while it was already running!";
-            return;
-        }
-    }
-    // NOTE: only fall thorugh to here in end states
-    m_state = State::Running;
-    emit started();
-    executeTask();
+	switch (m_state) {
+		case State::Inactive: {
+			qDebug() << "Task" << describe() << "starting for the first time";
+			break;
+		}
+		case State::AbortedByUser: {
+			qDebug() << "Task" << describe()
+					 << "restarting for after being aborted by user";
+			break;
+		}
+		case State::Failed: {
+			qDebug() << "Task" << describe()
+					 << "restarting for after failing at first";
+			break;
+		}
+		case State::Succeeded: {
+			qDebug() << "Task" << describe()
+					 << "restarting for after succeeding at first";
+			break;
+		}
+		case State::Running: {
+			qWarning() << "MeshMC tried to start task" << describe()
+					   << "while it was already running!";
+			return;
+		}
+	}
+	// NOTE: only fall thorugh to here in end states
+	m_state = State::Running;
+	emit started();
+	executeTask();
 }
 
 void Task::emitFailed(QString reason)
 {
-    // Don't fail twice.
-    if (!isRunning())
-    {
-        qCritical() << "Task" << describe() << "failed while not running!!!!: " << reason;
-        return;
-    }
-    m_state = State::Failed;
-    m_failReason = reason;
-    qCritical() << "Task" << describe() << "failed: " << reason;
-    QPointer<Task> guard(this);
-    emit failed(reason);
-    if (guard)
-        emit finished();
+	// Don't fail twice.
+	if (!isRunning()) {
+		qCritical() << "Task" << describe()
+					<< "failed while not running!!!!: " << reason;
+		return;
+	}
+	m_state = State::Failed;
+	m_failReason = reason;
+	qCritical() << "Task" << describe() << "failed: " << reason;
+	QPointer<Task> guard(this);
+	emit failed(reason);
+	if (guard)
+		emit finished();
 }
 
 void Task::emitAborted()
 {
-    // Don't abort twice.
-    if (!isRunning())
-    {
-        qCritical() << "Task" << describe() << "aborted while not running!!!!";
-        return;
-    }
-    m_state = State::AbortedByUser;
-    m_failReason = "Aborted.";
-    qDebug() << "Task" << describe() << "aborted.";
-    QPointer<Task> guard(this);
-    emit failed(m_failReason);
-    if (guard)
-        emit finished();
+	// Don't abort twice.
+	if (!isRunning()) {
+		qCritical() << "Task" << describe() << "aborted while not running!!!!";
+		return;
+	}
+	m_state = State::AbortedByUser;
+	m_failReason = "Aborted.";
+	qDebug() << "Task" << describe() << "aborted.";
+	QPointer<Task> guard(this);
+	emit failed(m_failReason);
+	if (guard)
+		emit finished();
 }
 
 void Task::emitSucceeded()
 {
-    // Don't succeed twice.
-    if (!isRunning())
-    {
-        qCritical() << "Task" << describe() << "succeeded while not running!!!!";
-        return;
-    }
-    m_state = State::Succeeded;
-    qDebug() << "Task" << describe() << "succeeded";
-    QPointer<Task> guard(this);
-    emit succeeded();
-    if (guard)
-        emit finished();
+	// Don't succeed twice.
+	if (!isRunning()) {
+		qCritical() << "Task" << describe()
+					<< "succeeded while not running!!!!";
+		return;
+	}
+	m_state = State::Succeeded;
+	qDebug() << "Task" << describe() << "succeeded";
+	QPointer<Task> guard(this);
+	emit succeeded();
+	if (guard)
+		emit finished();
 }
 
 QString Task::describe()
 {
-    QString outStr;
-    QTextStream out(&outStr);
-    out << metaObject()->className() << QChar('(');
-    auto name = objectName();
-    if(name.isEmpty())
-    {
-        out << QString("0x%1").arg((quintptr)this, 0, 16);
-    }
-    else
-    {
-        out << name;
-    }
-    out << QChar(')');
-    out.flush();
-    return outStr;
+	QString outStr;
+	QTextStream out(&outStr);
+	out << metaObject()->className() << QChar('(');
+	auto name = objectName();
+	if (name.isEmpty()) {
+		out << QString("0x%1").arg((quintptr)this, 0, 16);
+	} else {
+		out << name;
+	}
+	out << QChar(')');
+	out.flush();
+	return outStr;
 }
 
 bool Task::isRunning() const
 {
-    return m_state == State::Running;
+	return m_state == State::Running;
 }
 
 bool Task::isFinished() const
 {
-    return m_state != State::Running && m_state != State::Inactive;
+	return m_state != State::Running && m_state != State::Inactive;
 }
 
 bool Task::wasSuccessful() const
 {
-    return m_state == State::Succeeded;
+	return m_state == State::Succeeded;
 }
 
 QString Task::failReason() const
 {
-    return m_failReason;
+	return m_failReason;
 }
 
 void Task::logWarning(const QString& line)
 {
-    qWarning() << line;
-    m_Warnings.append(line);
+	qWarning() << line;
+	m_Warnings.append(line);
 }
 
 QStringList Task::warnings() const
 {
-    return m_Warnings;
+	return m_Warnings;
 }