Merge PR #256: Cleanup Rule definition in introspection

This commit is contained in:
Jenkins nymea 2020-02-23 23:38:28 +01:00
commit bfb14fe4ae
2 changed files with 4 additions and 4 deletions

View File

@ -44,9 +44,9 @@ namespace nymeaserver {
class Rule class Rule
{ {
Q_GADGET Q_GADGET
Q_PROPERTY(QUuid id READ id WRITE setId USER true) Q_PROPERTY(QUuid id READ id)
Q_PROPERTY(QString name READ name WRITE setName) Q_PROPERTY(QString name READ name WRITE setName)
Q_PROPERTY(bool active READ active USER true) Q_PROPERTY(bool active READ active)
Q_PROPERTY(bool enabled READ enabled WRITE setEnabled USER true) Q_PROPERTY(bool enabled READ enabled WRITE setEnabled USER true)
Q_PROPERTY(bool executable READ executable WRITE setExecutable USER true) Q_PROPERTY(bool executable READ executable WRITE setExecutable USER true)
Q_PROPERTY(EventDescriptors eventDescriptors READ eventDescriptors WRITE setEventDescriptors USER true) Q_PROPERTY(EventDescriptors eventDescriptors READ eventDescriptors WRITE setEventDescriptors USER true)

View File

@ -2031,10 +2031,10 @@
"o:eventDescriptors": "$ref:EventDescriptors", "o:eventDescriptors": "$ref:EventDescriptors",
"o:executable": "Bool", "o:executable": "Bool",
"o:exitActions": "$ref:RuleActions", "o:exitActions": "$ref:RuleActions",
"o:id": "Uuid",
"o:stateEvaluator": "$ref:StateEvaluator", "o:stateEvaluator": "$ref:StateEvaluator",
"o:timeDescriptor": "$ref:TimeDescriptor", "o:timeDescriptor": "$ref:TimeDescriptor",
"r:o:active": "Bool" "r:active": "Bool",
"r:id": "Uuid"
}, },
"RuleAction": { "RuleAction": {
"o:actionTypeId": "Uuid", "o:actionTypeId": "Uuid",