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, 38 insertions, 34 deletions

diff --git a/launcher/UpdateController.cpp b/launcher/UpdateController.cpp
index 8ab57c5804..af46800dfe 100644
--- a/launcher/UpdateController.cpp
+++ b/launcher/UpdateController.cpp
@@ -30,49 +30,53 @@
 #include "BuildConfig.h"
 #include "FileSystem.h"
 
-UpdateController::UpdateController(QWidget *parent, const QString &root, const QString &downloadUrl)
-    : m_parent(parent), m_root(root), m_downloadUrl(downloadUrl)
+UpdateController::UpdateController(QWidget* parent, const QString& root,
+								   const QString& downloadUrl)
+	: m_parent(parent), m_root(root), m_downloadUrl(downloadUrl)
 {
 }
 
 bool UpdateController::startUpdate()
 {
-    // Locate the updater binary next to ourselves.
-    QString updaterName = BuildConfig.MESHMC_NAME + "-updater";
+	// Locate the updater binary next to ourselves.
+	QString updaterName = BuildConfig.MESHMC_NAME + "-updater";
 #ifdef Q_OS_WIN
-    updaterName += ".exe";
+	updaterName += ".exe";
 #endif
-    const QString updaterPath = FS::PathCombine(m_root, updaterName);
+	const QString updaterPath = FS::PathCombine(m_root, updaterName);
 
-    if (!QFile::exists(updaterPath)) {
-        qCritical() << "UpdateController: updater binary not found at" << updaterPath;
-        QMessageBox::critical(
-            m_parent,
-            QCoreApplication::translate("UpdateController", "Updater Not Found"),
-            QCoreApplication::translate("UpdateController", "The updater binary could not be found at:\n%1\n\nPlease reinstall %2.")
-                .arg(updaterPath, BuildConfig.MESHMC_DISPLAYNAME));
-        return false;
-    }
+	if (!QFile::exists(updaterPath)) {
+		qCritical() << "UpdateController: updater binary not found at"
+					<< updaterPath;
+		QMessageBox::critical(
+			m_parent,
+			QCoreApplication::translate("UpdateController",
+										"Updater Not Found"),
+			QCoreApplication::translate("UpdateController",
+										"The updater binary could not be found "
+										"at:\n%1\n\nPlease reinstall %2.")
+				.arg(updaterPath, BuildConfig.MESHMC_DISPLAYNAME));
+		return false;
+	}
 
-    const QStringList args = {
-        "--url",  m_downloadUrl,
-        "--root", m_root,
-        "--exec", QApplication::applicationFilePath()
-    };
+	const QStringList args = {"--url",	m_downloadUrl,
+							  "--root", m_root,
+							  "--exec", QApplication::applicationFilePath()};
 
-    qDebug() << "UpdateController: launching" << updaterPath << "with args" << args;
-    const bool ok = QProcess::startDetached(updaterPath, args);
-    if (!ok) {
-        qCritical() << "UpdateController: failed to start updater binary.";
-        QMessageBox::critical(
-            m_parent,
-            QCoreApplication::translate("UpdateController", "Update Failed"),
-            QCoreApplication::translate("UpdateController", "Could not launch the updater binary.\nPlease update %1 manually.")
-                .arg(BuildConfig.MESHMC_DISPLAYNAME));
-        return false;
-    }
+	qDebug() << "UpdateController: launching" << updaterPath << "with args"
+			 << args;
+	const bool ok = QProcess::startDetached(updaterPath, args);
+	if (!ok) {
+		qCritical() << "UpdateController: failed to start updater binary.";
+		QMessageBox::critical(
+			m_parent,
+			QCoreApplication::translate("UpdateController", "Update Failed"),
+			QCoreApplication::translate("UpdateController",
+										"Could not launch the updater "
+										"binary.\nPlease update %1 manually.")
+				.arg(BuildConfig.MESHMC_DISPLAYNAME));
+		return false;
+	}
 
-    return true;
+	return true;
 }
-
-