diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-02-09 20:49:48 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-02-09 20:49:48 +0100 |
| commit | 1f6a484cb2368a5704cdb4820ac06194ea6d7e1a (patch) | |
| tree | f4ebfd97c25387b3e26d4a55c5c85d67782df25d /logic/OneSixRule.cpp | |
| parent | f8df07c3272c0e02f31f46fda8a429292c7a446a (diff) | |
| parent | 18f532b0d7d873280ec17218196db15fa64175a2 (diff) | |
| download | MultiMC-1f6a484cb2368a5704cdb4820ac06194ea6d7e1a.tar MultiMC-1f6a484cb2368a5704cdb4820ac06194ea6d7e1a.tar.gz MultiMC-1f6a484cb2368a5704cdb4820ac06194ea6d7e1a.tar.lz MultiMC-1f6a484cb2368a5704cdb4820ac06194ea6d7e1a.tar.xz MultiMC-1f6a484cb2368a5704cdb4820ac06194ea6d7e1a.zip | |
Merge branch 'integration_derpstances_groupview' into develop
Diffstat (limited to 'logic/OneSixRule.cpp')
| -rw-r--r-- | logic/OneSixRule.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/logic/OneSixRule.cpp b/logic/OneSixRule.cpp index 392b1dd1..d8d13b50 100644 --- a/logic/OneSixRule.cpp +++ b/logic/OneSixRule.cpp @@ -18,7 +18,7 @@ #include "OneSixRule.h" -QList<std::shared_ptr<Rule>> rulesFromJsonV4(QJsonObject &objectWithRules) +QList<std::shared_ptr<Rule>> rulesFromJsonV4(const QJsonObject &objectWithRules) { QList<std::shared_ptr<Rule>> rules; auto rulesVal = objectWithRules.value("rules"); @@ -86,4 +86,4 @@ RuleAction RuleAction_fromString(QString name) if (name == "disallow") return Disallow; return Defer; -}
\ No newline at end of file +} |