aboutsummaryrefslogtreecommitdiff
path: root/launcher/tools/MCEditTool.cpp
diff options
context:
space:
mode:
authorSefa Eyeoglu <contact@scrumplex.net>2023-08-04 19:42:36 +0200
committerGitHub <noreply@github.com>2023-08-04 19:42:36 +0200
commitae793f6cf11658c9abc5111e82d5ba7b3e6af127 (patch)
treeed41f30e2c0f02e4be1d42324b3f05fbab75b2cd /launcher/tools/MCEditTool.cpp
parent50c7d39e082f0a7dbd977401e16d5adf534d9770 (diff)
parent1d638e018ac40fbfb35dd117f9a948c0cf35eadd (diff)
downloadPrismLauncher-ae793f6cf11658c9abc5111e82d5ba7b3e6af127.tar.gz
PrismLauncher-ae793f6cf11658c9abc5111e82d5ba7b3e6af127.tar.bz2
PrismLauncher-ae793f6cf11658c9abc5111e82d5ba7b3e6af127.zip
Merge pull request #1459 from Scrumplex/format
Diffstat (limited to 'launcher/tools/MCEditTool.cpp')
-rw-r--r--launcher/tools/MCEditTool.cpp26
1 files changed, 9 insertions, 17 deletions
diff --git a/launcher/tools/MCEditTool.cpp b/launcher/tools/MCEditTool.cpp
index 2c1ec613..19bd5a06 100644
--- a/launcher/tools/MCEditTool.cpp
+++ b/launcher/tools/MCEditTool.cpp
@@ -4,9 +4,9 @@
#include <QProcess>
#include <QUrl>
-#include "settings/SettingsObject.h"
#include "BaseInstance.h"
#include "minecraft/MinecraftInstance.h"
+#include "settings/SettingsObject.h"
MCEditTool::MCEditTool(SettingsObjectPtr settings)
{
@@ -26,19 +26,17 @@ QString MCEditTool::path() const
bool MCEditTool::check(const QString& toolPath, QString& error)
{
- if (toolPath.isEmpty())
- {
+ if (toolPath.isEmpty()) {
error = QObject::tr("Path is empty");
return false;
}
const QDir dir(toolPath);
- if (!dir.exists())
- {
+ if (!dir.exists()) {
error = QObject::tr("Path does not exist");
return false;
}
- if (!dir.exists("mcedit.sh") && !dir.exists("mcedit.py") && !dir.exists("mcedit.exe") && !dir.exists("Contents") && !dir.exists("mcedit2.exe"))
- {
+ if (!dir.exists("mcedit.sh") && !dir.exists("mcedit.py") && !dir.exists("mcedit.exe") && !dir.exists("Contents") &&
+ !dir.exists("mcedit2.exe")) {
error = QObject::tr("Path does not seem to be a MCEdit path");
return false;
}
@@ -53,22 +51,16 @@ QString MCEditTool::getProgramPath()
const QString mceditPath = path();
QDir mceditDir(mceditPath);
#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD)
- if (mceditDir.exists("mcedit.sh"))
- {
+ if (mceditDir.exists("mcedit.sh")) {
return mceditDir.absoluteFilePath("mcedit.sh");
- }
- else if (mceditDir.exists("mcedit.py"))
- {
+ } else if (mceditDir.exists("mcedit.py")) {
return mceditDir.absoluteFilePath("mcedit.py");
}
return QString();
#elif defined(Q_OS_WIN32)
- if (mceditDir.exists("mcedit.exe"))
- {
+ if (mceditDir.exists("mcedit.exe")) {
return mceditDir.absoluteFilePath("mcedit.exe");
- }
- else if (mceditDir.exists("mcedit2.exe"))
- {
+ } else if (mceditDir.exists("mcedit2.exe")) {
return mceditDir.absoluteFilePath("mcedit2.exe");
}
return QString();