summaryrefslogtreecommitdiffstats
path: root/logic/tools
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2015-07-04 20:02:43 +0200
committerPetr Mrázek <peterix@gmail.com>2015-07-04 20:02:43 +0200
commit526a511f455234152ca9b5bc8c60d3c82cbfa417 (patch)
treedfc64e8d84fff503f646e7422d6b7939475a6dca /logic/tools
parent5628d3d379785c9c6f4a595c70392d9b1e9ea4df (diff)
downloadMultiMC-526a511f455234152ca9b5bc8c60d3c82cbfa417.tar
MultiMC-526a511f455234152ca9b5bc8c60d3c82cbfa417.tar.gz
MultiMC-526a511f455234152ca9b5bc8c60d3c82cbfa417.tar.lz
MultiMC-526a511f455234152ca9b5bc8c60d3c82cbfa417.tar.xz
MultiMC-526a511f455234152ca9b5bc8c60d3c82cbfa417.zip
GH-1053 move instance update into the launch task (BaseLauncher)
Diffstat (limited to 'logic/tools')
-rw-r--r--logic/tools/BaseProfiler.cpp2
-rw-r--r--logic/tools/BaseProfiler.h4
-rw-r--r--logic/tools/JProfiler.cpp4
-rw-r--r--logic/tools/JVisualVM.cpp4
4 files changed, 7 insertions, 7 deletions
diff --git a/logic/tools/BaseProfiler.cpp b/logic/tools/BaseProfiler.cpp
index cfac47d4..42ed1d93 100644
--- a/logic/tools/BaseProfiler.cpp
+++ b/logic/tools/BaseProfiler.cpp
@@ -7,7 +7,7 @@ BaseProfiler::BaseProfiler(SettingsObjectPtr settings, InstancePtr instance, QOb
{
}
-void BaseProfiler::beginProfiling(BaseLauncher *process)
+void BaseProfiler::beginProfiling(std::shared_ptr<BaseLauncher> process)
{
beginProfilingImpl(process);
}
diff --git a/logic/tools/BaseProfiler.h b/logic/tools/BaseProfiler.h
index 54ba89ce..709c7cb4 100644
--- a/logic/tools/BaseProfiler.h
+++ b/logic/tools/BaseProfiler.h
@@ -15,13 +15,13 @@ public:
public
slots:
- void beginProfiling(BaseLauncher *process);
+ void beginProfiling(std::shared_ptr<BaseLauncher> process);
void abortProfiling();
protected:
QProcess *m_profilerProcess;
- virtual void beginProfilingImpl(BaseLauncher *process) = 0;
+ virtual void beginProfilingImpl(std::shared_ptr<BaseLauncher> process) = 0;
virtual void abortProfilingImpl();
signals:
diff --git a/logic/tools/JProfiler.cpp b/logic/tools/JProfiler.cpp
index 73121239..975345d5 100644
--- a/logic/tools/JProfiler.cpp
+++ b/logic/tools/JProfiler.cpp
@@ -18,7 +18,7 @@ private slots:
void profilerFinished(int exit, QProcess::ExitStatus status);
protected:
- void beginProfilingImpl(BaseLauncher *process);
+ void beginProfilingImpl(std::shared_ptr<BaseLauncher> process);
private:
int listeningPort = 0;
@@ -48,7 +48,7 @@ void JProfiler::profilerFinished(int exit, QProcess::ExitStatus status)
}
}
-void JProfiler::beginProfilingImpl(BaseLauncher *process)
+void JProfiler::beginProfilingImpl(std::shared_ptr<BaseLauncher> process)
{
listeningPort = globalSettings->get("JProfilerPort").toInt();
QProcess *profiler = new QProcess(this);
diff --git a/logic/tools/JVisualVM.cpp b/logic/tools/JVisualVM.cpp
index fbfd858a..a749012b 100644
--- a/logic/tools/JVisualVM.cpp
+++ b/logic/tools/JVisualVM.cpp
@@ -18,7 +18,7 @@ private slots:
void profilerFinished(int exit, QProcess::ExitStatus status);
protected:
- void beginProfilingImpl(BaseLauncher *process);
+ void beginProfilingImpl(std::shared_ptr<BaseLauncher> process);
};
@@ -45,7 +45,7 @@ void JVisualVM::profilerFinished(int exit, QProcess::ExitStatus status)
}
}
-void JVisualVM::beginProfilingImpl(BaseLauncher *process)
+void JVisualVM::beginProfilingImpl(std::shared_ptr<BaseLauncher> process)
{
QProcess *profiler = new QProcess(this);
QStringList profilerArgs =