diff options
author | Thomas Groman <tgroman@nuegia.net> | 2019-09-19 00:41:48 -0700 |
---|---|---|
committer | Thomas Groman <tgroman@nuegia.net> | 2019-09-19 00:41:48 -0700 |
commit | 32b3ed0a1362a4b0798ad71fac3450fb77cb7e41 (patch) | |
tree | 7be7a2f602e6a5af7bc2db86bef9cf2a659c3d3d /api/logic/tools/BaseProfiler.cpp | |
parent | 5fb2c6334e7d5237db11695b4c0ec0f2d1e47c88 (diff) | |
download | MultiMC-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/BaseProfiler.cpp')
-rw-r--r-- | api/logic/tools/BaseProfiler.cpp | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/api/logic/tools/BaseProfiler.cpp b/api/logic/tools/BaseProfiler.cpp index 5ff0fa44..300d1a73 100644 --- a/api/logic/tools/BaseProfiler.cpp +++ b/api/logic/tools/BaseProfiler.cpp @@ -1,35 +1,36 @@ #include "BaseProfiler.h" +#include "QObjectPtr.h" #include <QProcess> BaseProfiler::BaseProfiler(SettingsObjectPtr settings, InstancePtr instance, QObject *parent) - : BaseExternalTool(settings, instance, parent) + : BaseExternalTool(settings, instance, parent) { } -void BaseProfiler::beginProfiling(std::shared_ptr<LaunchTask> process) +void BaseProfiler::beginProfiling(shared_qobject_ptr<LaunchTask> process) { - beginProfilingImpl(process); + beginProfilingImpl(process); } void BaseProfiler::abortProfiling() { - abortProfilingImpl(); + abortProfilingImpl(); } void BaseProfiler::abortProfilingImpl() { - if (!m_profilerProcess) - { - return; - } - m_profilerProcess->terminate(); - m_profilerProcess->deleteLater(); - m_profilerProcess = 0; - emit abortLaunch(tr("Profiler aborted")); + if (!m_profilerProcess) + { + return; + } + m_profilerProcess->terminate(); + m_profilerProcess->deleteLater(); + m_profilerProcess = 0; + emit abortLaunch(tr("Profiler aborted")); } BaseProfiler *BaseProfilerFactory::createProfiler(InstancePtr instance, QObject *parent) { - return qobject_cast<BaseProfiler *>(createTool(instance, parent)); + return qobject_cast<BaseProfiler *>(createTool(instance, parent)); } |