diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-10-06 01:13:40 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-10-06 01:13:40 +0200 |
| commit | f83119ce7ec3d11a903901b8eff762d2b0a9f635 (patch) | |
| tree | 5c30d7b9fff0f9417e7f2cd79d8ad9ea56d7f056 /logic/OneSixVersion.h | |
| parent | eba9b3d759dbf6e402e91ab897059f1d274aef90 (diff) | |
| download | MultiMC-f83119ce7ec3d11a903901b8eff762d2b0a9f635.tar MultiMC-f83119ce7ec3d11a903901b8eff762d2b0a9f635.tar.gz MultiMC-f83119ce7ec3d11a903901b8eff762d2b0a9f635.tar.lz MultiMC-f83119ce7ec3d11a903901b8eff762d2b0a9f635.tar.xz MultiMC-f83119ce7ec3d11a903901b8eff762d2b0a9f635.zip | |
Added file logger
Diffstat (limited to 'logic/OneSixVersion.h')
| -rw-r--r-- | logic/OneSixVersion.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/logic/OneSixVersion.h b/logic/OneSixVersion.h index 69268ecf..3529138c 100644 --- a/logic/OneSixVersion.h +++ b/logic/OneSixVersion.h @@ -1,5 +1,7 @@ #pragma once #include <QtCore> +#include <memory> + class OneSixLibrary; class OneSixVersion : public QAbstractListModel @@ -16,12 +18,12 @@ public: // serialization/deserialization public: bool toOriginalFile(); - static QSharedPointer<OneSixVersion> fromJson(QJsonObject root); - static QSharedPointer<OneSixVersion> fromFile(QString filepath); + static std::shared_ptr<OneSixVersion> fromJson(QJsonObject root); + static std::shared_ptr<OneSixVersion> fromFile(QString filepath); public: - QList<QSharedPointer<OneSixLibrary>> getActiveNormalLibs(); - QList<QSharedPointer<OneSixLibrary>> getActiveNativeLibs(); + QList<std::shared_ptr<OneSixLibrary>> getActiveNormalLibs(); + QList<std::shared_ptr<OneSixLibrary>> getActiveNativeLibs(); // called when something starts/stops messing with the object // FIXME: these are ugly in every possible way. void externalUpdateStart(); @@ -62,7 +64,7 @@ public: QString mainClass; /// the list of libs - both active and inactive, native and java - QList<QSharedPointer<OneSixLibrary>> libraries; + QList<std::shared_ptr<OneSixLibrary>> libraries; /* FIXME: add support for those rules here? Looks like a pile of quick hacks to me though. |