diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-02-24 00:29:13 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-02-24 00:29:13 +0100 |
| commit | f7c97efcf3785f597417895945b24c2e7476cba8 (patch) | |
| tree | c0ad8ba4b59bf9be441c2037ae7592585c3cbe58 /MultiMC.cpp | |
| parent | e3d2e5fd7405baa8137e300e8cc817e70df172b7 (diff) | |
| parent | a354e8bfae812b23b85b65c4a5b7e860cb18080c (diff) | |
| download | MultiMC-f7c97efcf3785f597417895945b24c2e7476cba8.tar MultiMC-f7c97efcf3785f597417895945b24c2e7476cba8.tar.gz MultiMC-f7c97efcf3785f597417895945b24c2e7476cba8.tar.lz MultiMC-f7c97efcf3785f597417895945b24c2e7476cba8.tar.xz MultiMC-f7c97efcf3785f597417895945b24c2e7476cba8.zip | |
Merge branch 'feature_profiling' into integration_json_and_tools
Diffstat (limited to 'MultiMC.cpp')
| -rw-r--r-- | MultiMC.cpp | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/MultiMC.cpp b/MultiMC.cpp index 39a4443e..a0745a87 100644 --- a/MultiMC.cpp +++ b/MultiMC.cpp @@ -32,6 +32,10 @@ #include "logic/updater/UpdateChecker.h" #include "logic/updater/NotificationChecker.h" +#include "logic/tools/JProfiler.h" +#include "logic/tools/JVisualVM.h" +#include "logic/tools/MCEditTool.h" + #include "pathutils.h" #include "cmdutils.h" #include <inisettingsobject.h> @@ -42,8 +46,9 @@ using namespace Util::Commandline; MultiMC::MultiMC(int &argc, char **argv, bool root_override) - : QApplication(argc, argv), m_version{VERSION_MAJOR, VERSION_MINOR, VERSION_HOTFIX, - VERSION_BUILD, MultiMCVersion::VERSION_TYPE, VERSION_CHANNEL, BUILD_PLATFORM} + : QApplication(argc, argv), + m_version{VERSION_MAJOR, VERSION_MINOR, VERSION_HOTFIX, VERSION_BUILD, + MultiMCVersion::VERSION_TYPE, VERSION_CHANNEL, BUILD_PLATFORM} { setOrganizationName("MultiMC"); setApplicationName("MultiMC5"); @@ -212,6 +217,21 @@ MultiMC::MultiMC(int &argc, char **argv, bool root_override) // init proxy settings updateProxySettings(); + m_profilers.insert("jprofiler", + std::shared_ptr<BaseProfilerFactory>(new JProfilerFactory())); + m_profilers.insert("jvisualvm", + std::shared_ptr<BaseProfilerFactory>(new JVisualVMFactory())); + for (auto profiler : m_profilers.values()) + { + profiler->registerSettings(m_settings.get()); + } + m_tools.insert("mcedit", + std::shared_ptr<BaseDetachedToolFactory>(new MCEditFactory())); + for (auto tool : m_tools.values()) + { + tool->registerSettings(m_settings.get()); + } + // launch instance, if that's what should be done // WARNING: disabled until further notice /* |