merged from 0.6.7 codebase

1 files changed, 27 insertions, 27 deletions

diff --git a/application/InstanceWindow.h b/application/InstanceWindow.h
index 2b08644e..e5bd4464 100644
--- a/application/InstanceWindow.h
+++ b/application/InstanceWindow.h
@@ -1,4 +1,4 @@
-/* Copyright 2013-2018 MultiMC Contributors
+/* Copyright 2013-2019 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,48 +26,48 @@ class QPushButton;
 class PageContainer;
 class InstanceWindow : public QMainWindow, public BasePageContainer
 {
-	Q_OBJECT
+    Q_OBJECT
 
 public:
-	explicit InstanceWindow(InstancePtr proc, QWidget *parent = 0);
-	virtual ~InstanceWindow();
+    explicit InstanceWindow(InstancePtr proc, QWidget *parent = 0);
+    virtual ~InstanceWindow();
 
-	bool selectPage(QString pageId) override;
-	void refreshContainer() override;
+    bool selectPage(QString pageId) override;
+    void refreshContainer() override;
 
-	QString instanceId();
+    QString instanceId();
 
-	// save all settings and changes (prepare for launch)
-	bool saveAll();
+    // save all settings and changes (prepare for launch)
+    bool saveAll();
 
-	// request closing the window (from a page)
-	bool requestClose() override;
+    // request closing the window (from a page)
+    bool requestClose() override;
 
 signals:
-	void isClosing();
+    void isClosing();
 
 private
 slots:
-	void on_closeButton_clicked();
-	void on_btnKillMinecraft_clicked();
-	void on_btnLaunchMinecraftOffline_clicked();
+    void on_closeButton_clicked();
+    void on_btnKillMinecraft_clicked();
+    void on_btnLaunchMinecraftOffline_clicked();
 
-	void on_InstanceLaunchTask_changed(std::shared_ptr<LaunchTask> proc);
-	void on_RunningState_changed(bool running);
-	void on_instanceStatusChanged(BaseInstance::Status, BaseInstance::Status newStatus);
+    void on_InstanceLaunchTask_changed(shared_qobject_ptr<LaunchTask> proc);
+    void on_RunningState_changed(bool running);
+    void on_instanceStatusChanged(BaseInstance::Status, BaseInstance::Status newStatus);
 
 protected:
-	void closeEvent(QCloseEvent *) override;
+    void closeEvent(QCloseEvent *) override;
 
 private:
-	void updateLaunchButtons();
+    void updateLaunchButtons();
 
 private:
-	std::shared_ptr<LaunchTask> m_proc;
-	InstancePtr m_instance;
-	bool m_doNotSave = false;
-	PageContainer *m_container = nullptr;
-	QPushButton *m_closeButton = nullptr;
-	QPushButton *m_killButton = nullptr;
-	QPushButton *m_launchOfflineButton = nullptr;
+    shared_qobject_ptr<LaunchTask> m_proc;
+    InstancePtr m_instance;
+    bool m_doNotSave = false;
+    PageContainer *m_container = nullptr;
+    QPushButton *m_closeButton = nullptr;
+    QPushButton *m_killButton = nullptr;
+    QPushButton *m_launchOfflineButton = nullptr;
 };