summaryrefslogtreecommitdiffstats
path: root/logic/OneSixRule.h
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2013-10-06 01:13:40 +0200
committerPetr Mrázek <peterix@gmail.com>2013-10-06 01:13:40 +0200
commitf83119ce7ec3d11a903901b8eff762d2b0a9f635 (patch)
tree5c30d7b9fff0f9417e7f2cd79d8ad9ea56d7f056 /logic/OneSixRule.h
parenteba9b3d759dbf6e402e91ab897059f1d274aef90 (diff)
downloadMultiMC-f83119ce7ec3d11a903901b8eff762d2b0a9f635.tar
MultiMC-f83119ce7ec3d11a903901b8eff762d2b0a9f635.tar.gz
MultiMC-f83119ce7ec3d11a903901b8eff762d2b0a9f635.tar.lz
MultiMC-f83119ce7ec3d11a903901b8eff762d2b0a9f635.tar.xz
MultiMC-f83119ce7ec3d11a903901b8eff762d2b0a9f635.zip
Added file logger
Diffstat (limited to 'logic/OneSixRule.h')
-rw-r--r--logic/OneSixRule.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/logic/OneSixRule.h b/logic/OneSixRule.h
index 23d20ff4..6be01f1b 100644
--- a/logic/OneSixRule.h
+++ b/logic/OneSixRule.h
@@ -11,7 +11,7 @@ enum RuleAction
};
RuleAction RuleAction_fromString(QString);
-QList<QSharedPointer<Rule>> rulesFromJsonV4(QJsonObject &objectWithRules);
+QList<std::shared_ptr<Rule>> rulesFromJsonV4(QJsonObject &objectWithRules);
class Rule
{
@@ -48,9 +48,9 @@ protected:
: Rule(result), m_system(system), m_version_regexp(version_regexp) {}
public:
virtual QJsonObject toJson();
- static QSharedPointer<OsRule> create(RuleAction result, OpSys system, QString version_regexp)
+ static std::shared_ptr<OsRule> create(RuleAction result, OpSys system, QString version_regexp)
{
- return QSharedPointer<OsRule> (new OsRule(result, system, version_regexp));
+ return std::shared_ptr<OsRule> (new OsRule(result, system, version_regexp));
}
};
@@ -65,8 +65,8 @@ protected:
: Rule(result) {}
public:
virtual QJsonObject toJson();
- static QSharedPointer<ImplicitRule> create(RuleAction result)
+ static std::shared_ptr<ImplicitRule> create(RuleAction result)
{
- return QSharedPointer<ImplicitRule> (new ImplicitRule(result));
+ return std::shared_ptr<ImplicitRule> (new ImplicitRule(result));
}
};