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, 35 deletions

diff --git a/launcher/InstanceCopyTask.cpp b/launcher/InstanceCopyTask.cpp
index 48bffd14f7..1cb6c2ac08 100644
--- a/launcher/InstanceCopyTask.cpp
+++ b/launcher/InstanceCopyTask.cpp
@@ -26,56 +26,59 @@
 #include "pathmatcher/RegexpMatcher.h"
 #include <QtConcurrentRun>
 
-InstanceCopyTask::InstanceCopyTask(InstancePtr origInstance, bool copySaves, bool keepPlaytime)
+InstanceCopyTask::InstanceCopyTask(InstancePtr origInstance, bool copySaves,
+								   bool keepPlaytime)
 {
-    m_origInstance = origInstance;
-    m_keepPlaytime = keepPlaytime;
+	m_origInstance = origInstance;
+	m_keepPlaytime = keepPlaytime;
 
-    if(!copySaves)
-    {
-        // FIXME: get this from the original instance type...
-        auto matcherReal = new RegexpMatcher("[.]?minecraft/saves");
-        matcherReal->caseSensitive(false);
-        m_matcher.reset(matcherReal);
-    }
+	if (!copySaves) {
+		// FIXME: get this from the original instance type...
+		auto matcherReal = new RegexpMatcher("[.]?minecraft/saves");
+		matcherReal->caseSensitive(false);
+		m_matcher.reset(matcherReal);
+	}
 }
 
 void InstanceCopyTask::executeTask()
 {
-    setStatus(tr("Copying instance %1").arg(m_origInstance->name()));
+	setStatus(tr("Copying instance %1").arg(m_origInstance->name()));
 
-    FS::copy folderCopy(m_origInstance->instanceRoot(), m_stagingPath);
-    folderCopy.followSymlinks(false).blacklist(m_matcher.get());
+	FS::copy folderCopy(m_origInstance->instanceRoot(), m_stagingPath);
+	folderCopy.followSymlinks(false).blacklist(m_matcher.get());
 
-    m_copyFuture = QtConcurrent::run(QThreadPool::globalInstance(), folderCopy);
-    connect(&m_copyFutureWatcher, &QFutureWatcher<bool>::finished, this, &InstanceCopyTask::copyFinished);
-    connect(&m_copyFutureWatcher, &QFutureWatcher<bool>::canceled, this, &InstanceCopyTask::copyAborted);
-    m_copyFutureWatcher.setFuture(m_copyFuture);
+	m_copyFuture = QtConcurrent::run(QThreadPool::globalInstance(), folderCopy);
+	connect(&m_copyFutureWatcher, &QFutureWatcher<bool>::finished, this,
+			&InstanceCopyTask::copyFinished);
+	connect(&m_copyFutureWatcher, &QFutureWatcher<bool>::canceled, this,
+			&InstanceCopyTask::copyAborted);
+	m_copyFutureWatcher.setFuture(m_copyFuture);
 }
 
 void InstanceCopyTask::copyFinished()
 {
-    auto successful = m_copyFuture.result();
-    if(!successful)
-    {
-        emitFailed(tr("Instance folder copy failed."));
-        return;
-    }
-    // FIXME: shouldn't this be able to report errors?
-    auto instanceSettings = std::make_shared<INISettingsObject>(FS::PathCombine(m_stagingPath, "instance.cfg"));
-    instanceSettings->registerSetting("InstanceType", "Legacy");
+	auto successful = m_copyFuture.result();
+	if (!successful) {
+		emitFailed(tr("Instance folder copy failed."));
+		return;
+	}
+	// FIXME: shouldn't this be able to report errors?
+	auto instanceSettings = std::make_shared<INISettingsObject>(
+		FS::PathCombine(m_stagingPath, "instance.cfg"));
+	instanceSettings->registerSetting("InstanceType", "Legacy");
 
-    InstancePtr inst(new NullInstance(m_globalSettings, instanceSettings, m_stagingPath));
-    inst->setName(m_instName);
-    inst->setIconKey(m_instIcon);
-    if(!m_keepPlaytime) {
-        inst->resetTimePlayed();
-    }
-    emitSucceeded();
+	InstancePtr inst(
+		new NullInstance(m_globalSettings, instanceSettings, m_stagingPath));
+	inst->setName(m_instName);
+	inst->setIconKey(m_instIcon);
+	if (!m_keepPlaytime) {
+		inst->resetTimePlayed();
+	}
+	emitSucceeded();
 }
 
 void InstanceCopyTask::copyAborted()
 {
-    emitFailed(tr("Instance folder copy has been aborted."));
-    return;
+	emitFailed(tr("Instance folder copy has been aborted."));
+	return;
 }