summaryrefslogtreecommitdiffstats
path: root/MultiMC.h
diff options
context:
space:
mode:
Diffstat (limited to 'MultiMC.h')
-rw-r--r--MultiMC.h14
1 files changed, 11 insertions, 3 deletions
diff --git a/MultiMC.h b/MultiMC.h
index 775189b1..9ad276ff 100644
--- a/MultiMC.h
+++ b/MultiMC.h
@@ -6,7 +6,6 @@
#include "logger/QsLog.h"
#include "logger/QsLogDest.h"
-
class MinecraftVersionList;
class LWJGLVersionList;
class HttpMetaCache;
@@ -107,12 +106,12 @@ public:
/*!
* Installs update from the given update files directory.
*/
- void installUpdates(const QString& updateFilesDir, bool restartOnFinish=false);
+ void installUpdates(const QString &updateFilesDir, bool restartOnFinish = false);
/*!
* Sets MultiMC to install updates from the given directory when it exits.
*/
- void setUpdateOnExit(const QString& updateFilesDir);
+ void setUpdateOnExit(const QString &updateFilesDir);
/*!
* Gets the path to install updates from on exit.
@@ -120,6 +119,12 @@ public:
*/
QString getExitUpdatePath() const;
+ /*!
+ * Opens a json file using either a system default editor, or, if note empty, the editor
+ * specified in the settings
+ */
+ bool openJsonEditor(const QString &filename);
+
private:
void initLogger();
@@ -130,6 +135,9 @@ private:
void initTranslations();
private:
+ friend class UpdateCheckerTest;
+ friend class DownloadUpdateTaskTest;
+
std::shared_ptr<QTranslator> m_qt_translator;
std::shared_ptr<QTranslator> m_mmc_translator;
std::shared_ptr<SettingsObject> m_settings;