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/OneSixRule.cpp | |
| 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/OneSixRule.cpp')
| -rw-r--r-- | logic/OneSixRule.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/logic/OneSixRule.cpp b/logic/OneSixRule.cpp index 545cd641..cb64c9ba 100644 --- a/logic/OneSixRule.cpp +++ b/logic/OneSixRule.cpp @@ -2,9 +2,9 @@ #include <QJsonObject> #include <QJsonArray> -QList<QSharedPointer<Rule>> rulesFromJsonV4(QJsonObject &objectWithRules) +QList<std::shared_ptr<Rule>> rulesFromJsonV4(QJsonObject &objectWithRules) { - QList<QSharedPointer<Rule>> rules; + QList<std::shared_ptr<Rule>> rules; auto rulesVal = objectWithRules.value("rules"); if (!rulesVal.isArray()) return rules; @@ -12,7 +12,7 @@ QList<QSharedPointer<Rule>> rulesFromJsonV4(QJsonObject &objectWithRules) QJsonArray ruleList = rulesVal.toArray(); for (auto ruleVal : ruleList) { - QSharedPointer<Rule> rule; + std::shared_ptr<Rule> rule; if (!ruleVal.isObject()) continue; auto ruleObj = ruleVal.toObject(); |