diff options
| author | Petr Mrázek <peterix@gmail.com> | 2019-04-07 23:59:04 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2019-04-07 23:59:04 +0200 |
| commit | 70ed30f9e6b47fbfb3151078ca61a2bb419feccb (patch) | |
| tree | 0849ab3776d3e716285f3186b4e8e21ee246ee21 /api/logic/BaseInstance.h | |
| parent | 414946cad94affccddfa500056c6eeb967438643 (diff) | |
| download | MultiMC-70ed30f9e6b47fbfb3151078ca61a2bb419feccb.tar MultiMC-70ed30f9e6b47fbfb3151078ca61a2bb419feccb.tar.gz MultiMC-70ed30f9e6b47fbfb3151078ca61a2bb419feccb.tar.lz MultiMC-70ed30f9e6b47fbfb3151078ca61a2bb419feccb.tar.xz MultiMC-70ed30f9e6b47fbfb3151078ca61a2bb419feccb.zip | |
GH-2591 less std::shared_ptr and more shared_qobject_ptr
This eliminates some weird crashes.
Diffstat (limited to 'api/logic/BaseInstance.h')
| -rw-r--r-- | api/logic/BaseInstance.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/api/logic/BaseInstance.h b/api/logic/BaseInstance.h index 73500b1a..3c342cb3 100644 --- a/api/logic/BaseInstance.h +++ b/api/logic/BaseInstance.h @@ -134,8 +134,6 @@ public: /// Sets the last launched time to 'val' milliseconds since epoch void setLastLaunch(qint64 val = QDateTime::currentMSecsSinceEpoch()); - InstancePtr getSharedPtr(); - /*! * \brief Gets this instance's settings object. * This settings object stores instance-specific settings. @@ -147,10 +145,10 @@ public: virtual shared_qobject_ptr<Task> createUpdateTask(Net::Mode mode) = 0; /// returns a valid launcher (task container) - virtual std::shared_ptr<LaunchTask> createLaunchTask(AuthSessionPtr account) = 0; + virtual shared_qobject_ptr<LaunchTask> createLaunchTask(AuthSessionPtr account) = 0; /// returns the current launch task (if any) - std::shared_ptr<LaunchTask> getLaunchTask(); + shared_qobject_ptr<LaunchTask> getLaunchTask(); /*! * Create envrironment variables for running the instance @@ -241,7 +239,7 @@ signals: */ void propertiesChanged(BaseInstance *inst); - void launchTaskChanged(std::shared_ptr<LaunchTask>); + void launchTaskChanged(shared_qobject_ptr<LaunchTask>); void runningStatusChanged(bool running); @@ -255,7 +253,7 @@ protected: /* data */ SettingsObjectPtr m_settings; // InstanceFlags m_flags; bool m_isRunning = false; - std::shared_ptr<LaunchTask> m_launchProcess; + shared_qobject_ptr<LaunchTask> m_launchProcess; QDateTime m_timeStarted; private: /* data */ @@ -265,6 +263,6 @@ private: /* data */ bool m_hasBrokenVersion = false; }; -Q_DECLARE_METATYPE(std::shared_ptr<BaseInstance>) +Q_DECLARE_METATYPE(shared_qobject_ptr<BaseInstance>) //Q_DECLARE_METATYPE(BaseInstance::InstanceFlag) //Q_DECLARE_OPERATORS_FOR_FLAGS(BaseInstance::InstanceFlags) |