summaryrefslogtreecommitdiffstats
path: root/logic/ForgeInstaller.h
diff options
context:
space:
mode:
authorSky <git@bunnies.cc>2013-10-06 01:13:20 +0100
committerSky <git@bunnies.cc>2013-10-06 01:13:20 +0100
commit7aeea14a027f8cf28615f73f4fda1ffffc2cdc3c (patch)
tree53ea703d11a525442d6ebf575bd22f840c5b4e8d /logic/ForgeInstaller.h
parent2398acc9e490ce124aa621c19156c89ef87591f1 (diff)
parentf83119ce7ec3d11a903901b8eff762d2b0a9f635 (diff)
downloadMultiMC-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/ForgeInstaller.h')
-rw-r--r--logic/ForgeInstaller.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/logic/ForgeInstaller.h b/logic/ForgeInstaller.h
index f4ceaaef..f6f22a2a 100644
--- a/logic/ForgeInstaller.h
+++ b/logic/ForgeInstaller.h
@@ -1,6 +1,6 @@
#pragma once
#include <QString>
-#include <QSharedPointer>
+#include <memory>
class OneSixVersion;
@@ -9,11 +9,11 @@ class ForgeInstaller
public:
ForgeInstaller(QString filename, QString universal_url);
- bool apply(QSharedPointer<OneSixVersion> to);
+ bool apply(std::shared_ptr<OneSixVersion> to);
private:
// the version, read from the installer
- QSharedPointer<OneSixVersion> m_forge_version;
+ std::shared_ptr<OneSixVersion> m_forge_version;
QString internalPath;
QString finalPath;
QString realVersionId;