summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2015-07-05 02:47:22 +0200
committerPetr Mrázek <peterix@gmail.com>2015-07-05 02:47:22 +0200
commit5133b0f34f1e6fc046787e7369b403a381a2f60c (patch)
treebf2071c2a517d9adb98d59d7133d115859bd518c
parent5f41886d76c11fe8befe8d059c75dcb5bc11f78d (diff)
downloadMultiMC-5133b0f34f1e6fc046787e7369b403a381a2f60c.tar
MultiMC-5133b0f34f1e6fc046787e7369b403a381a2f60c.tar.gz
MultiMC-5133b0f34f1e6fc046787e7369b403a381a2f60c.tar.lz
MultiMC-5133b0f34f1e6fc046787e7369b403a381a2f60c.tar.xz
MultiMC-5133b0f34f1e6fc046787e7369b403a381a2f60c.zip
GH-1053 cleanup
-rw-r--r--application/LaunchController.cpp10
-rw-r--r--application/MainWindow.cpp3
-rw-r--r--logic/BaseLauncher.h10
3 files changed, 3 insertions, 20 deletions
diff --git a/application/LaunchController.cpp b/application/LaunchController.cpp
index fdda75ef..b1116e07 100644
--- a/application/LaunchController.cpp
+++ b/application/LaunchController.cpp
@@ -162,8 +162,6 @@ void LaunchController::launchInstance()
return;
}
- m_launcher->setProfiler(m_profiler);
-
if(m_parentWidget)
{
m_parentWidget->hide();
@@ -179,22 +177,20 @@ void LaunchController::launchInstance()
void LaunchController::readyForLaunch()
{
- auto profiler = m_launcher->getProfiler();
-
- if (!profiler)
+ if (!m_profiler)
{
m_launcher->launch();
return;
}
QString error;
- if (!profiler->check(&error))
+ if (!m_profiler->check(&error))
{
m_launcher->abort();
QMessageBox::critical(m_parentWidget, tr("Error"), tr("Couldn't start profiler: %1").arg(error));
return;
}
- BaseProfiler *profilerInstance = profiler->createProfiler(m_launcher->instance(), this);
+ BaseProfiler *profilerInstance = m_profiler->createProfiler(m_launcher->instance(), this);
connect(profilerInstance, &BaseProfiler::readyToLaunch, [this](const QString & message)
{
diff --git a/application/MainWindow.cpp b/application/MainWindow.cpp
index 4b18dd2e..4be80492 100644
--- a/application/MainWindow.cpp
+++ b/application/MainWindow.cpp
@@ -377,11 +377,8 @@ namespace Ui {
#include "minecraft/SkinUtils.h"
#include "resources/Resource.h"
-//#include "minecraft/LegacyInstance.h"
-
#include <updater/UpdateChecker.h>
#include <notifications/NotificationChecker.h>
-#include <tasks/ThreadTask.h>
#include <net/CacheDownload.h>
#include "tools/BaseProfiler.h"
diff --git a/logic/BaseLauncher.h b/logic/BaseLauncher.h
index e233e4fd..d8877b3d 100644
--- a/logic/BaseLauncher.h
+++ b/logic/BaseLauncher.h
@@ -56,16 +56,6 @@ public: /* methods */
void setWorkdir(QString path);
- BaseProfilerFactory * getProfiler()
- {
- return m_profiler;
- }
-
- void setProfiler(BaseProfilerFactory * profiler)
- {
- m_profiler = profiler;
- }
-
void killProcess();
qint64 pid();