diff options
| author | Petr Mrázek <peterix@gmail.com> | 2015-07-04 20:02:43 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2015-07-04 20:02:43 +0200 |
| commit | 526a511f455234152ca9b5bc8c60d3c82cbfa417 (patch) | |
| tree | dfc64e8d84fff503f646e7422d6b7939475a6dca /application/pages | |
| parent | 5628d3d379785c9c6f4a595c70392d9b1e9ea4df (diff) | |
| download | MultiMC-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 'application/pages')
| -rw-r--r-- | application/pages/LogPage.cpp | 4 | ||||
| -rw-r--r-- | application/pages/LogPage.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/application/pages/LogPage.cpp b/application/pages/LogPage.cpp index 0b88193c..cdf6b345 100644 --- a/application/pages/LogPage.cpp +++ b/application/pages/LogPage.cpp @@ -11,12 +11,12 @@ #include <settings/Setting.h> #include "GuiUtil.h" -LogPage::LogPage(BaseLauncher *proc, QWidget *parent) +LogPage::LogPage(std::shared_ptr<BaseLauncher> proc, QWidget *parent) : QWidget(parent), ui(new Ui::LogPage), m_process(proc) { ui->setupUi(this); ui->tabWidget->tabBar()->hide(); - connect(m_process, SIGNAL(log(QString, MessageLevel::Enum)), this, + connect(m_process.get(), SIGNAL(log(QString, MessageLevel::Enum)), this, SLOT(write(QString, MessageLevel::Enum))); // create the format and set its font diff --git a/application/pages/LogPage.h b/application/pages/LogPage.h index a420a75f..0bd74846 100644 --- a/application/pages/LogPage.h +++ b/application/pages/LogPage.h @@ -33,7 +33,7 @@ class LogPage : public QWidget, public BasePage Q_OBJECT public: - explicit LogPage(BaseLauncher *proc, QWidget *parent = 0); + explicit LogPage(std::shared_ptr<BaseLauncher> proc, QWidget *parent = 0); virtual ~LogPage(); virtual QString displayName() const override { @@ -77,7 +77,7 @@ private slots: private: Ui::LogPage *ui; - BaseLauncher *m_process; + std::shared_ptr<BaseLauncher> m_process; int m_last_scroll_value = 0; bool m_scroll_active = true; int m_saved_offset = 0; |