diff options
| author | Sky <git@bunnies.cc> | 2013-10-06 01:13:20 +0100 |
|---|---|---|
| committer | Sky <git@bunnies.cc> | 2013-10-06 01:13:20 +0100 |
| commit | 7aeea14a027f8cf28615f73f4fda1ffffc2cdc3c (patch) | |
| tree | 53ea703d11a525442d6ebf575bd22f840c5b4e8d /logic/BaseInstance.h | |
| parent | 2398acc9e490ce124aa621c19156c89ef87591f1 (diff) | |
| parent | f83119ce7ec3d11a903901b8eff762d2b0a9f635 (diff) | |
| download | MultiMC-7aeea14a027f8cf28615f73f4fda1ffffc2cdc3c.tar MultiMC-7aeea14a027f8cf28615f73f4fda1ffffc2cdc3c.tar.gz MultiMC-7aeea14a027f8cf28615f73f4fda1ffffc2cdc3c.tar.lz MultiMC-7aeea14a027f8cf28615f73f4fda1ffffc2cdc3c.tar.xz MultiMC-7aeea14a027f8cf28615f73f4fda1ffffc2cdc3c.zip | |
Merge branch 'develop' of https://github.com/MultiMC/MultiMC5 into develop
Diffstat (limited to 'logic/BaseInstance.h')
| -rw-r--r-- | logic/BaseInstance.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/logic/BaseInstance.h b/logic/BaseInstance.h index 0056327a..e360d3ae 100644 --- a/logic/BaseInstance.h +++ b/logic/BaseInstance.h @@ -135,7 +135,7 @@ public: * \brief Gets a pointer to this instance's version list. * \return A pointer to the available version list for this instance. */ - virtual QSharedPointer<BaseVersionList> versionList() const; + virtual std::shared_ptr<BaseVersionList> versionList() const; /*! * \brief Gets this instance's settings object. @@ -179,9 +179,9 @@ signals: void nuked(BaseInstance * inst); protected: - QSharedPointer<BaseInstancePrivate> inst_d; + std::shared_ptr<BaseInstancePrivate> inst_d; }; // pointer for lazy people -typedef QSharedPointer<BaseInstance> InstancePtr; +typedef std::shared_ptr<BaseInstance> InstancePtr; |