Skip to content

Commit 3b72f69

Browse files
pennampennam
committed
Use Property::appendAttributeReal Property::setAttributeReal instead of macros
1 parent 9828845 commit 3b72f69

16 files changed

+62
-62
lines changed

‎src/property/types/CloudBool.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ class CloudBool : public Property {
5353
_cloud_value = _value;
5454
}
5555
virtual CborError appendAttributesToCloud() {
56-
return appendAttribute(_value);
56+
return appendAttributeReal(_value, "", encoder);
5757
}
5858
virtual void setAttributesFromCloud() {
59-
setAttribute(_cloud_value);
59+
setAttributeReal(_cloud_value, "");
6060
}
6161
//modifiers
6262
CloudBool& operator=(bool v) {

‎src/property/types/CloudColor.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -189,15 +189,15 @@ class CloudColor : public Property {
189189
_cloud_value = _value;
190190
}
191191
virtual CborError appendAttributesToCloud() {
192-
CHECK_CBOR_MULTI(appendAttribute(_value.hue));
193-
CHECK_CBOR_MULTI(appendAttribute(_value.sat));
194-
CHECK_CBOR_MULTI(appendAttribute(_value.bri));
192+
CHECK_CBOR_MULTI(appendAttributeReal(_value.hue, "hue", encoder));
193+
CHECK_CBOR_MULTI(appendAttributeReal(_value.sat, "sat", encoder));
194+
CHECK_CBOR_MULTI(appendAttributeReal(_value.bri, "bri", encoder));
195195
return CborNoError;
196196
}
197197
virtual void setAttributesFromCloud() {
198-
setAttribute(_cloud_value.hue);
199-
setAttribute(_cloud_value.sat);
200-
setAttribute(_cloud_value.bri);
198+
setAttributeReal(_cloud_value.hue, "hue");
199+
setAttributeReal(_cloud_value.sat, "sat");
200+
setAttributeReal(_cloud_value.bri, "bri");
201201
}
202202
};
203203

‎src/property/types/CloudFloat.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ class CloudFloat : public Property {
5555
_cloud_value = _value;
5656
}
5757
virtual CborError appendAttributesToCloud() {
58-
return appendAttribute(_value);
58+
return appendAttributeReal(_value, "", encoder);
5959
}
6060
virtual void setAttributesFromCloud() {
61-
setAttribute(_cloud_value);
61+
setAttributeReal(_cloud_value, "");
6262
}
6363
//modifiers
6464
CloudFloat& operator=(float v) {

‎src/property/types/CloudInt.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ class CloudInt : public Property {
5353
_cloud_value = _value;
5454
}
5555
virtual CborError appendAttributesToCloud() {
56-
return appendAttribute(_value);
56+
return appendAttributeReal(_value, "", encoder);
5757
}
5858
virtual void setAttributesFromCloud() {
59-
setAttribute(_cloud_value);
59+
setAttributeReal(_cloud_value, "");
6060
}
6161
//modifiers
6262
CloudInt& operator=(int v) {

‎src/property/types/CloudLocation.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,13 @@ class CloudLocation : public Property {
9090
_cloud_value = _value;
9191
}
9292
virtual CborError appendAttributesToCloud() {
93-
CHECK_CBOR_MULTI(appendAttribute(_value.lat));
94-
CHECK_CBOR_MULTI(appendAttribute(_value.lon));
93+
CHECK_CBOR_MULTI(appendAttributeReal(_value.lat, "lat", encoder));
94+
CHECK_CBOR_MULTI(appendAttributeReal(_value.lon, "lon", encoder));
9595
return CborNoError;
9696
}
9797
virtual void setAttributesFromCloud() {
98-
setAttribute(_cloud_value.lat);
99-
setAttribute(_cloud_value.lon);
98+
setAttributeReal(_cloud_value.lat, "lat");
99+
setAttributeReal(_cloud_value.lon, "lon");
100100
}
101101
};
102102

‎src/property/types/CloudSchedule.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -418,17 +418,17 @@ class CloudSchedule : public Property {
418418
_cloud_value = _value;
419419
}
420420
virtual CborError appendAttributesToCloud() {
421-
CHECK_CBOR_MULTI(appendAttribute(_value.frm));
422-
CHECK_CBOR_MULTI(appendAttribute(_value.to));
423-
CHECK_CBOR_MULTI(appendAttribute(_value.len));
424-
CHECK_CBOR_MULTI(appendAttribute(_value.msk));
421+
CHECK_CBOR_MULTI(appendAttributeReal(_value.frm, "frm", encoder));
422+
CHECK_CBOR_MULTI(appendAttributeReal(_value.to, "to", encoder));
423+
CHECK_CBOR_MULTI(appendAttributeReal(_value.len, "len", encoder));
424+
CHECK_CBOR_MULTI(appendAttributeReal(_value.msk, "msk", encoder));
425425
return CborNoError;
426426
}
427427
virtual void setAttributesFromCloud() {
428-
setAttribute(_cloud_value.frm);
429-
setAttribute(_cloud_value.to);
430-
setAttribute(_cloud_value.len);
431-
setAttribute(_cloud_value.msk);
428+
setAttributeReal(_cloud_value.frm, "frm");
429+
setAttributeReal(_cloud_value.to, "to");
430+
setAttributeReal(_cloud_value.len, "len");
431+
setAttributeReal(_cloud_value.msk, "msk");
432432
}
433433
};
434434

‎src/property/types/CloudString.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ class CloudString : public Property {
5959
_cloud_value = _value;
6060
}
6161
virtual CborError appendAttributesToCloud() {
62-
return appendAttribute(_value);
62+
return appendAttributeReal(_value, "", encoder);
6363
}
6464
virtual void setAttributesFromCloud() {
65-
setAttribute(_cloud_value);
65+
setAttributeReal(_cloud_value, "");
6666
}
6767
//modifiers
6868
CloudString& operator=(String v) {

‎src/property/types/CloudUnsignedInt.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ class CloudUnsignedInt : public Property {
5353
_cloud_value = _value;
5454
}
5555
virtual CborError appendAttributesToCloud() {
56-
return appendAttribute(_value);
56+
return appendAttributeReal(_value, "", encoder);
5757
}
5858
virtual void setAttributesFromCloud() {
59-
setAttribute(_cloud_value);
59+
setAttributeReal(_cloud_value, "");
6060
}
6161
//modifiers
6262
CloudUnsignedInt& operator=(unsigned int v) {

‎src/property/types/CloudWrapperBool.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ class CloudWrapperBool : public CloudWrapperBase {
4646
_cloud_value = _primitive_value;
4747
}
4848
virtual CborError appendAttributesToCloud() {
49-
return appendAttribute(_primitive_value);
49+
return appendAttributeReal(_primitive_value, "", encoder);
5050
}
5151
virtual void setAttributesFromCloud() {
52-
setAttribute(_cloud_value);
52+
setAttributeReal(_cloud_value, "");
5353
}
5454
virtual bool isPrimitive() {
5555
return true;

‎src/property/types/CloudWrapperFloat.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ class CloudWrapperFloat : public CloudWrapperBase {
4848
_cloud_value = _primitive_value;
4949
}
5050
virtual CborError appendAttributesToCloud() {
51-
return appendAttribute(_primitive_value);
51+
return appendAttributeReal(_primitive_value, "", encoder);
5252
}
5353
virtual void setAttributesFromCloud() {
54-
setAttribute(_cloud_value);
54+
setAttributeReal(_cloud_value, "");
5555
}
5656
virtual bool isPrimitive() {
5757
return true;

0 commit comments

Comments
 (0)