summaryrefslogtreecommitdiffstats
path: root/application/pages
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2015-07-10 01:11:06 +0200
committerPetr Mrázek <peterix@gmail.com>2015-07-10 01:11:06 +0200
commit8e7caf4e25dc3f56877a504c45d157860215496b (patch)
tree4ce3ea68190d4b693519ad6f76473b5b8f4da8be /application/pages
parent5dd48e89f5a7facf8355641d0caf8deaec2a03ec (diff)
downloadMultiMC-8e7caf4e25dc3f56877a504c45d157860215496b.tar
MultiMC-8e7caf4e25dc3f56877a504c45d157860215496b.tar.gz
MultiMC-8e7caf4e25dc3f56877a504c45d157860215496b.tar.lz
MultiMC-8e7caf4e25dc3f56877a504c45d157860215496b.tar.xz
MultiMC-8e7caf4e25dc3f56877a504c45d157860215496b.zip
GH-1053 move launch related things and rename them
Diffstat (limited to 'application/pages')
-rw-r--r--application/pages/LogPage.cpp4
-rw-r--r--application/pages/LogPage.h6
2 files changed, 5 insertions, 5 deletions
diff --git a/application/pages/LogPage.cpp b/application/pages/LogPage.cpp
index cdf6b345..77d5d6b8 100644
--- a/application/pages/LogPage.cpp
+++ b/application/pages/LogPage.cpp
@@ -7,11 +7,11 @@
#include <QScrollBar>
#include <QShortcut>
-#include "BaseLauncher.h"
+#include "launch/LaunchTask.h"
#include <settings/Setting.h>
#include "GuiUtil.h"
-LogPage::LogPage(std::shared_ptr<BaseLauncher> proc, QWidget *parent)
+LogPage::LogPage(std::shared_ptr<LaunchTask> proc, QWidget *parent)
: QWidget(parent), ui(new Ui::LogPage), m_process(proc)
{
ui->setupUi(this);
diff --git a/application/pages/LogPage.h b/application/pages/LogPage.h
index 0bd74846..f2cd90c3 100644
--- a/application/pages/LogPage.h
+++ b/application/pages/LogPage.h
@@ -18,7 +18,7 @@
#include <QWidget>
#include "BaseInstance.h"
-#include "BaseLauncher.h"
+#include "launch/LaunchTask.h"
#include "BasePage.h"
#include <MultiMC.h>
@@ -33,7 +33,7 @@ class LogPage : public QWidget, public BasePage
Q_OBJECT
public:
- explicit LogPage(std::shared_ptr<BaseLauncher> proc, QWidget *parent = 0);
+ explicit LogPage(std::shared_ptr<LaunchTask> proc, QWidget *parent = 0);
virtual ~LogPage();
virtual QString displayName() const override
{
@@ -77,7 +77,7 @@ private slots:
private:
Ui::LogPage *ui;
- std::shared_ptr<BaseLauncher> m_process;
+ std::shared_ptr<LaunchTask> m_process;
int m_last_scroll_value = 0;
bool m_scroll_active = true;
int m_saved_offset = 0;