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 /gui/OneSixModEditDialog.h | |
| parent | 2398acc9e490ce124aa621c19156c89ef87591f1 (diff) | |
| parent | f83119ce7ec3d11a903901b8eff762d2b0a9f635 (diff) | |
| download | PrismLauncher-7aeea14a027f8cf28615f73f4fda1ffffc2cdc3c.tar.gz PrismLauncher-7aeea14a027f8cf28615f73f4fda1ffffc2cdc3c.tar.bz2 PrismLauncher-7aeea14a027f8cf28615f73f4fda1ffffc2cdc3c.zip | |
Merge branch 'develop' of https://github.com/MultiMC/MultiMC5 into develop
Diffstat (limited to 'gui/OneSixModEditDialog.h')
| -rw-r--r-- | gui/OneSixModEditDialog.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gui/OneSixModEditDialog.h b/gui/OneSixModEditDialog.h index e70bd73f..5c65fea3 100644 --- a/gui/OneSixModEditDialog.h +++ b/gui/OneSixModEditDialog.h @@ -52,9 +52,9 @@ protected: bool resourcePackListFilter( QKeyEvent* ev ); private: Ui::OneSixModEditDialog *ui; - QSharedPointer<OneSixVersion> m_version; - QSharedPointer<ModList> m_mods; - QSharedPointer<ModList> m_resourcepacks; + std::shared_ptr<OneSixVersion> m_version; + std::shared_ptr<ModList> m_mods; + std::shared_ptr<ModList> m_resourcepacks; EnabledItemFilter * main_model; OneSixInstance * m_inst; }; |