summaryrefslogtreecommitdiffstats
path: root/api/logic/tools/MCEditTool.cpp
diff options
context:
space:
mode:
authorThomas Groman <tgroman@nuegia.net>2019-09-19 00:41:48 -0700
committerThomas Groman <tgroman@nuegia.net>2019-09-19 00:41:48 -0700
commit32b3ed0a1362a4b0798ad71fac3450fb77cb7e41 (patch)
tree7be7a2f602e6a5af7bc2db86bef9cf2a659c3d3d /api/logic/tools/MCEditTool.cpp
parent5fb2c6334e7d5237db11695b4c0ec0f2d1e47c88 (diff)
downloadMultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.tar
MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.tar.gz
MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.tar.lz
MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.tar.xz
MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.zip
merged from 0.6.7 codebase
Diffstat (limited to 'api/logic/tools/MCEditTool.cpp')
-rw-r--r--api/logic/tools/MCEditTool.cpp84
1 files changed, 42 insertions, 42 deletions
diff --git a/api/logic/tools/MCEditTool.cpp b/api/logic/tools/MCEditTool.cpp
index 74715d3f..880327c7 100644
--- a/api/logic/tools/MCEditTool.cpp
+++ b/api/logic/tools/MCEditTool.cpp
@@ -10,68 +10,68 @@
MCEditTool::MCEditTool(SettingsObjectPtr settings)
{
- settings->registerSetting("MCEditPath");
- m_settings = settings;
+ settings->registerSetting("MCEditPath");
+ m_settings = settings;
}
void MCEditTool::setPath(QString& path)
{
- m_settings->set("MCEditPath", path);
+ m_settings->set("MCEditPath", path);
}
QString MCEditTool::path() const
{
- return m_settings->get("MCEditPath").toString();
+ return m_settings->get("MCEditPath").toString();
}
bool MCEditTool::check(const QString& toolPath, QString& error)
{
- if (toolPath.isEmpty())
- {
- error = QObject::tr("Path is empty");
- return false;
- }
- const QDir dir(toolPath);
- 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"))
- {
- error = QObject::tr("Path does not seem to be a MCEdit path");
- return false;
- }
- return true;
+ if (toolPath.isEmpty())
+ {
+ error = QObject::tr("Path is empty");
+ return false;
+ }
+ const QDir dir(toolPath);
+ 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"))
+ {
+ error = QObject::tr("Path does not seem to be a MCEdit path");
+ return false;
+ }
+ return true;
}
QString MCEditTool::getProgramPath()
{
#ifdef Q_OS_OSX
- return path();
+ return path();
#else
- const QString mceditPath = path();
- QDir mceditDir(mceditPath);
+ const QString mceditPath = path();
+ QDir mceditDir(mceditPath);
#ifdef Q_OS_LINUX
- if (mceditDir.exists("mcedit.sh"))
- {
- return mceditDir.absoluteFilePath("mcedit.sh");
- }
- else if (mceditDir.exists("mcedit.py"))
- {
- return mceditDir.absoluteFilePath("mcedit.py");
- }
- return QString();
+ if (mceditDir.exists("mcedit.sh"))
+ {
+ return mceditDir.absoluteFilePath("mcedit.sh");
+ }
+ else if (mceditDir.exists("mcedit.py"))
+ {
+ return mceditDir.absoluteFilePath("mcedit.py");
+ }
+ return QString();
#elif defined(Q_OS_WIN32)
- if (mceditDir.exists("mcedit.exe"))
- {
- return mceditDir.absoluteFilePath("mcedit.exe");
- }
- else if (mceditDir.exists("mcedit2.exe"))
- {
- return mceditDir.absoluteFilePath("mcedit2.exe");
- }
- return QString();
+ if (mceditDir.exists("mcedit.exe"))
+ {
+ return mceditDir.absoluteFilePath("mcedit.exe");
+ }
+ else if (mceditDir.exists("mcedit2.exe"))
+ {
+ return mceditDir.absoluteFilePath("mcedit2.exe");
+ }
+ return QString();
#endif
#endif
}