Use Property::appendAttributesToCloudReal(...) instead of appendAttributesToCloud() macro

pennam · pennam · commit 5dd3ee280cc7 · 2022-12-01T11:43:42.000+01:00
diff --git a/src/property/types/CloudBool.h b/src/property/types/CloudBool.h
@@ -52,7 +52,7 @@ class CloudBool : public Property {
     virtual void fromLocalToCloud() {
       _cloud_value = _value;
     }
-    virtual CborError appendAttributesToCloud() {
+    virtual CborError appendAttributesToCloudReal(CborEncoder *encoder) {
       return appendAttributeReal(_value, "", encoder);
     }
     virtual void setAttributesFromCloud() {
diff --git a/src/property/types/CloudColor.h b/src/property/types/CloudColor.h
@@ -188,7 +188,7 @@ class CloudColor : public Property {
     virtual void fromLocalToCloud() {
       _cloud_value = _value;
     }
-    virtual CborError appendAttributesToCloud() {
+    virtual CborError appendAttributesToCloudReal(CborEncoder *encoder) {
       CHECK_CBOR_MULTI(appendAttributeReal(_value.hue, "hue", encoder));
       CHECK_CBOR_MULTI(appendAttributeReal(_value.sat, "sat", encoder));
       CHECK_CBOR_MULTI(appendAttributeReal(_value.bri, "bri", encoder));
diff --git a/src/property/types/CloudFloat.h b/src/property/types/CloudFloat.h
@@ -54,7 +54,7 @@ class CloudFloat : public Property {
     virtual void fromLocalToCloud() {
       _cloud_value = _value;
     }
-    virtual CborError appendAttributesToCloud() {
+    virtual CborError appendAttributesToCloudReal(CborEncoder *encoder) {
       return appendAttributeReal(_value, "", encoder);
     }
     virtual void setAttributesFromCloud() {
diff --git a/src/property/types/CloudInt.h b/src/property/types/CloudInt.h
@@ -52,7 +52,7 @@ class CloudInt : public Property {
     virtual void fromLocalToCloud() {
       _cloud_value = _value;
     }
-    virtual CborError appendAttributesToCloud() {
+    virtual CborError appendAttributesToCloudReal(CborEncoder *encoder) {
       return appendAttributeReal(_value, "", encoder);
     }
     virtual void setAttributesFromCloud() {
diff --git a/src/property/types/CloudLocation.h b/src/property/types/CloudLocation.h
@@ -89,7 +89,7 @@ class CloudLocation : public Property {
     virtual void fromLocalToCloud() {
       _cloud_value = _value;
     }
-    virtual CborError appendAttributesToCloud() {
+    virtual CborError appendAttributesToCloudReal(CborEncoder *encoder) {
       CHECK_CBOR_MULTI(appendAttributeReal(_value.lat, "lat", encoder));
       CHECK_CBOR_MULTI(appendAttributeReal(_value.lon, "lon", encoder));
       return CborNoError;
diff --git a/src/property/types/CloudSchedule.h b/src/property/types/CloudSchedule.h
@@ -417,7 +417,7 @@ class CloudSchedule : public Property {
     virtual void fromLocalToCloud() {
       _cloud_value = _value;
     }
-    virtual CborError appendAttributesToCloud() {
+    virtual CborError appendAttributesToCloudReal(CborEncoder *encoder) {
       CHECK_CBOR_MULTI(appendAttributeReal(_value.frm, "frm", encoder));
       CHECK_CBOR_MULTI(appendAttributeReal(_value.to, "to", encoder));
       CHECK_CBOR_MULTI(appendAttributeReal(_value.len, "len", encoder));
diff --git a/src/property/types/CloudString.h b/src/property/types/CloudString.h
@@ -58,7 +58,7 @@ class CloudString : public Property {
     virtual void fromLocalToCloud() {
       _cloud_value = _value;
     }
-    virtual CborError appendAttributesToCloud() {
+    virtual CborError appendAttributesToCloudReal(CborEncoder *encoder) {
       return appendAttributeReal(_value, "", encoder);
     }
     virtual void setAttributesFromCloud() {
diff --git a/src/property/types/CloudUnsignedInt.h b/src/property/types/CloudUnsignedInt.h
@@ -52,7 +52,7 @@ class CloudUnsignedInt : public Property {
     virtual void fromLocalToCloud() {
       _cloud_value = _value;
     }
-    virtual CborError appendAttributesToCloud() {
+    virtual CborError appendAttributesToCloudReal(CborEncoder *encoder) {
       return appendAttributeReal(_value, "", encoder);
     }
     virtual void setAttributesFromCloud() {
diff --git a/src/property/types/CloudWrapperBool.h b/src/property/types/CloudWrapperBool.h
@@ -45,7 +45,7 @@ class CloudWrapperBool : public CloudWrapperBase {
     virtual void fromLocalToCloud() {
       _cloud_value = _primitive_value;
     }
-    virtual CborError appendAttributesToCloud() {
+    virtual CborError appendAttributesToCloudReal(CborEncoder *encoder) {
       return appendAttributeReal(_primitive_value, "", encoder);
     }
     virtual void setAttributesFromCloud() {
diff --git a/src/property/types/CloudWrapperFloat.h b/src/property/types/CloudWrapperFloat.h
@@ -47,7 +47,7 @@ class CloudWrapperFloat : public CloudWrapperBase {
     virtual void fromLocalToCloud() {
       _cloud_value = _primitive_value;
     }
-    virtual CborError appendAttributesToCloud() {
+    virtual CborError appendAttributesToCloudReal(CborEncoder *encoder) {
       return appendAttributeReal(_primitive_value, "", encoder);
     }
     virtual void setAttributesFromCloud() {
diff --git a/src/property/types/CloudWrapperInt.h b/src/property/types/CloudWrapperInt.h
@@ -45,7 +45,7 @@ class CloudWrapperInt : public CloudWrapperBase {
     virtual void fromLocalToCloud() {
       _cloud_value = _primitive_value;
     }
-    virtual CborError appendAttributesToCloud() {
+    virtual CborError appendAttributesToCloudReal(CborEncoder *encoder) {
       return appendAttributeReal(_primitive_value, "", encoder);
     }
     virtual void setAttributesFromCloud() {
diff --git a/src/property/types/CloudWrapperString.h b/src/property/types/CloudWrapperString.h
@@ -49,7 +49,7 @@ class CloudWrapperString : public CloudWrapperBase {
     virtual void fromLocalToCloud() {
       _cloud_value = _primitive_value;
     }
-    virtual CborError appendAttributesToCloud() {
+    virtual CborError appendAttributesToCloudReal(CborEncoder *encoder) {
       return appendAttributeReal(_primitive_value, "", encoder);
     }
     virtual void setAttributesFromCloud() {
diff --git a/src/property/types/CloudWrapperUnsignedInt.h b/src/property/types/CloudWrapperUnsignedInt.h
@@ -45,7 +45,7 @@ class CloudWrapperUnsignedInt : public CloudWrapperBase {
     virtual void fromLocalToCloud() {
       _cloud_value = _primitive_value;
     }
-    virtual CborError appendAttributesToCloud() {
+    virtual CborError appendAttributesToCloudReal(CborEncoder *encoder) {
       return appendAttributeReal(_primitive_value, "", encoder);
     }
     virtual void setAttributesFromCloud() {
diff --git a/src/property/types/automation/CloudColoredLight.h b/src/property/types/automation/CloudColoredLight.h
@@ -118,7 +118,7 @@ class CloudColoredLight : public CloudColor {
     virtual void fromLocalToCloud() {
       _cloud_value = _value;
     }
-    virtual CborError appendAttributesToCloud() {
+    virtual CborError appendAttributesToCloudReal(CborEncoder *encoder) {
       CHECK_CBOR_MULTI(appendAttributeReal(_value.swi, "swi", encoder));
       CHECK_CBOR_MULTI(appendAttributeReal(_value.hue, "hue", encoder));
       CHECK_CBOR_MULTI(appendAttributeReal(_value.sat, "sat", encoder));
diff --git a/src/property/types/automation/CloudDimmedLight.h b/src/property/types/automation/CloudDimmedLight.h
@@ -98,7 +98,7 @@ class CloudDimmedLight : public Property {
       _cloud_value = _value;
     }
 
-    virtual CborError appendAttributesToCloud() {
+    virtual CborError appendAttributesToCloudReal(CborEncoder *encoder) {
       CHECK_CBOR_MULTI(appendAttributeReal(_value.swi, "swi", encoder));
       // To allow visualization through color widget
       // Start
diff --git a/src/property/types/automation/CloudTelevision.h b/src/property/types/automation/CloudTelevision.h
@@ -213,7 +213,7 @@ class CloudTelevision : public Property {
     virtual void fromLocalToCloud() {
       _cloud_value = _value;
     }
-    virtual CborError appendAttributesToCloud() {
+    virtual CborError appendAttributesToCloudReal(CborEncoder *encoder) {
       CHECK_CBOR_MULTI(appendAttributeReal(_value.swi, "swi", encoder));
       CHECK_CBOR_MULTI(appendAttributeReal(_value.vol, "vol", encoder));
       CHECK_CBOR_MULTI(appendAttributeReal(_value.mut, "mut", encoder));

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ class CloudBool : public Property {`
`52`	`52`	`virtual void fromLocalToCloud() {`
`53`	`53`	`_cloud_value = _value;`
`54`	`54`	`}`
`55`		`- virtual CborError appendAttributesToCloud() {`
	`55`	`+ virtual CborError appendAttributesToCloudReal(CborEncoder *encoder) {`
`56`	`56`	`return appendAttributeReal(_value, "", encoder);`
`57`	`57`	`}`
`58`	`58`	`virtual void setAttributesFromCloud() {`
Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ class CloudColor : public Property {`
`188`	`188`	`virtual void fromLocalToCloud() {`
`189`	`189`	`_cloud_value = _value;`
`190`	`190`	`}`
`191`		`- virtual CborError appendAttributesToCloud() {`
	`191`	`+ virtual CborError appendAttributesToCloudReal(CborEncoder *encoder) {`
`192`	`192`	`CHECK_CBOR_MULTI(appendAttributeReal(_value.hue, "hue", encoder));`
`193`	`193`	`CHECK_CBOR_MULTI(appendAttributeReal(_value.sat, "sat", encoder));`
`194`	`194`	`CHECK_CBOR_MULTI(appendAttributeReal(_value.bri, "bri", encoder));`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ class CloudFloat : public Property {`
`54`	`54`	`virtual void fromLocalToCloud() {`
`55`	`55`	`_cloud_value = _value;`
`56`	`56`	`}`
`57`		`- virtual CborError appendAttributesToCloud() {`
	`57`	`+ virtual CborError appendAttributesToCloudReal(CborEncoder *encoder) {`
`58`	`58`	`return appendAttributeReal(_value, "", encoder);`
`59`	`59`	`}`
`60`	`60`	`virtual void setAttributesFromCloud() {`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ class CloudInt : public Property {`
`52`	`52`	`virtual void fromLocalToCloud() {`
`53`	`53`	`_cloud_value = _value;`
`54`	`54`	`}`
`55`		`- virtual CborError appendAttributesToCloud() {`
	`55`	`+ virtual CborError appendAttributesToCloudReal(CborEncoder *encoder) {`
`56`	`56`	`return appendAttributeReal(_value, "", encoder);`
`57`	`57`	`}`
`58`	`58`	`virtual void setAttributesFromCloud() {`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ class CloudLocation : public Property {`
`89`	`89`	`virtual void fromLocalToCloud() {`
`90`	`90`	`_cloud_value = _value;`
`91`	`91`	`}`
`92`		`- virtual CborError appendAttributesToCloud() {`
	`92`	`+ virtual CborError appendAttributesToCloudReal(CborEncoder *encoder) {`
`93`	`93`	`CHECK_CBOR_MULTI(appendAttributeReal(_value.lat, "lat", encoder));`
`94`	`94`	`CHECK_CBOR_MULTI(appendAttributeReal(_value.lon, "lon", encoder));`
`95`	`95`	`return CborNoError;`
Original file line number	Diff line number	Diff line change
`@@ -417,7 +417,7 @@ class CloudSchedule : public Property {`
`417`	`417`	`virtual void fromLocalToCloud() {`
`418`	`418`	`_cloud_value = _value;`
`419`	`419`	`}`
`420`		`- virtual CborError appendAttributesToCloud() {`
	`420`	`+ virtual CborError appendAttributesToCloudReal(CborEncoder *encoder) {`
`421`	`421`	`CHECK_CBOR_MULTI(appendAttributeReal(_value.frm, "frm", encoder));`
`422`	`422`	`CHECK_CBOR_MULTI(appendAttributeReal(_value.to, "to", encoder));`
`423`	`423`	`CHECK_CBOR_MULTI(appendAttributeReal(_value.len, "len", encoder));`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ class CloudString : public Property {`
`58`	`58`	`virtual void fromLocalToCloud() {`
`59`	`59`	`_cloud_value = _value;`
`60`	`60`	`}`
`61`		`- virtual CborError appendAttributesToCloud() {`
	`61`	`+ virtual CborError appendAttributesToCloudReal(CborEncoder *encoder) {`
`62`	`62`	`return appendAttributeReal(_value, "", encoder);`
`63`	`63`	`}`
`64`	`64`	`virtual void setAttributesFromCloud() {`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ class CloudUnsignedInt : public Property {`
`52`	`52`	`virtual void fromLocalToCloud() {`
`53`	`53`	`_cloud_value = _value;`
`54`	`54`	`}`
`55`		`- virtual CborError appendAttributesToCloud() {`
	`55`	`+ virtual CborError appendAttributesToCloudReal(CborEncoder *encoder) {`
`56`	`56`	`return appendAttributeReal(_value, "", encoder);`
`57`	`57`	`}`
`58`	`58`	`virtual void setAttributesFromCloud() {`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ class CloudWrapperBool : public CloudWrapperBase {`
`45`	`45`	`virtual void fromLocalToCloud() {`
`46`	`46`	`_cloud_value = _primitive_value;`
`47`	`47`	`}`
`48`		`- virtual CborError appendAttributesToCloud() {`
	`48`	`+ virtual CborError appendAttributesToCloudReal(CborEncoder *encoder) {`
`49`	`49`	`return appendAttributeReal(_primitive_value, "", encoder);`
`50`	`50`	`}`
`51`	`51`	`virtual void setAttributesFromCloud() {`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ class CloudWrapperFloat : public CloudWrapperBase {`
`47`	`47`	`virtual void fromLocalToCloud() {`
`48`	`48`	`_cloud_value = _primitive_value;`
`49`	`49`	`}`
`50`		`- virtual CborError appendAttributesToCloud() {`
	`50`	`+ virtual CborError appendAttributesToCloudReal(CborEncoder *encoder) {`
`51`	`51`	`return appendAttributeReal(_primitive_value, "", encoder);`
`52`	`52`	`}`
`53`	`53`	`virtual void setAttributesFromCloud() {`