Skip to content

Commit 74cd3ff

Browse files
pennampennam
committed
Rename setAttributeReal to setAttribute
1 parent 55d7ee8 commit 74cd3ff

18 files changed

+50
-50
lines changed

Diff for: ‎src/property/Property.cpp

+12-12
Original file line numberDiff line numberDiff line change
@@ -282,8 +282,8 @@ void Property::setAttributesFromCloud(std::list<CborMapData> * map_data_list) {
282282
setAttributesFromCloud();
283283
}
284284

285-
void Property::setAttributeReal(bool& value, String attributeName) {
286-
setAttributeReal(attributeName, [&value](CborMapData & md) {
285+
void Property::setAttribute(bool& value, String attributeName) {
286+
setAttribute(attributeName, [&value](CborMapData & md) {
287287
// Manage the case to have boolean values received as integers 0/1
288288
if (md.bool_val.isSet()) {
289289
value = md.bool_val.get();
@@ -299,34 +299,34 @@ void Property::setAttributeReal(bool& value, String attributeName) {
299299
});
300300
}
301301

302-
void Property::setAttributeReal(int& value, String attributeName) {
303-
setAttributeReal(attributeName, [&value](CborMapData & md) {
302+
void Property::setAttribute(int& value, String attributeName) {
303+
setAttribute(attributeName, [&value](CborMapData & md) {
304304
value = md.val.get();
305305
});
306306
}
307307

308-
void Property::setAttributeReal(unsigned int& value, String attributeName) {
309-
setAttributeReal(attributeName, [&value](CborMapData & md) {
308+
void Property::setAttribute(unsigned int& value, String attributeName) {
309+
setAttribute(attributeName, [&value](CborMapData & md) {
310310
value = md.val.get();
311311
});
312312
}
313313

314-
void Property::setAttributeReal(float& value, String attributeName) {
315-
setAttributeReal(attributeName, [&value](CborMapData & md) {
314+
void Property::setAttribute(float& value, String attributeName) {
315+
setAttribute(attributeName, [&value](CborMapData & md) {
316316
value = md.val.get();
317317
});
318318
}
319319

320-
void Property::setAttributeReal(String& value, String attributeName) {
321-
setAttributeReal(attributeName, [&value](CborMapData & md) {
320+
void Property::setAttribute(String& value, String attributeName) {
321+
setAttribute(attributeName, [&value](CborMapData & md) {
322322
value = md.str_val.get();
323323
});
324324
}
325325

326326
#ifdef __AVR__
327-
void Property::setAttributeReal(String attributeName, nonstd::function<void (CborMapData & md)>setValue)
327+
void Property::setAttribute(String attributeName, nonstd::function<void (CborMapData & md)>setValue)
328328
#else
329-
void Property::setAttributeReal(String attributeName, std::function<void (CborMapData & md)>setValue)
329+
void Property::setAttribute(String attributeName, std::function<void (CborMapData & md)>setValue)
330330
#endif
331331
{
332332
if (attributeName != "") {

Diff for: ‎src/property/Property.h

+7-7
Original file line numberDiff line numberDiff line change
@@ -193,17 +193,17 @@ class Property
193193
CborError appendAttribute(String value, String attributeName = "", CborEncoder *encoder = nullptr);
194194
#ifndef __AVR__
195195
CborError appendAttributeName(String attributeName, std::function<CborError (CborEncoder& mapEncoder)>f, CborEncoder *encoder);
196-
void setAttributeReal(String attributeName, std::function<void (CborMapData & md)>setValue);
196+
void setAttribute(String attributeName, std::function<void (CborMapData & md)>setValue);
197197
#else
198198
CborError appendAttributeName(String attributeName, nonstd::function<CborError (CborEncoder& mapEncoder)>f, CborEncoder *encoder);
199-
void setAttributeReal(String attributeName, nonstd::function<void (CborMapData & md)>setValue);
199+
void setAttribute(String attributeName, nonstd::function<void (CborMapData & md)>setValue);
200200
#endif
201201
void setAttributesFromCloud(std::list<CborMapData> * map_data_list);
202-
void setAttributeReal(bool& value, String attributeName = "");
203-
void setAttributeReal(int& value, String attributeName = "");
204-
void setAttributeReal(unsigned int& value, String attributeName = "");
205-
void setAttributeReal(float& value, String attributeName = "");
206-
void setAttributeReal(String& value, String attributeName = "");
202+
void setAttribute(bool& value, String attributeName = "");
203+
void setAttribute(int& value, String attributeName = "");
204+
void setAttribute(unsigned int& value, String attributeName = "");
205+
void setAttribute(float& value, String attributeName = "");
206+
void setAttribute(String& value, String attributeName = "");
207207

208208
virtual bool isDifferentFromCloud() = 0;
209209
virtual void fromCloudToLocal() = 0;

Diff for: ‎src/property/types/CloudBool.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class CloudBool : public Property {
5656
return appendAttribute(_value, "", encoder);
5757
}
5858
virtual void setAttributesFromCloud() {
59-
setAttributeReal(_cloud_value, "");
59+
setAttribute(_cloud_value, "");
6060
}
6161
//modifiers
6262
CloudBool& operator=(bool v) {

Diff for: ‎src/property/types/CloudColor.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,9 @@ class CloudColor : public Property {
195195
return CborNoError;
196196
}
197197
virtual void setAttributesFromCloud() {
198-
setAttributeReal(_cloud_value.hue, "hue");
199-
setAttributeReal(_cloud_value.sat, "sat");
200-
setAttributeReal(_cloud_value.bri, "bri");
198+
setAttribute(_cloud_value.hue, "hue");
199+
setAttribute(_cloud_value.sat, "sat");
200+
setAttribute(_cloud_value.bri, "bri");
201201
}
202202
};
203203

Diff for: ‎src/property/types/CloudFloat.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class CloudFloat : public Property {
5858
return appendAttribute(_value, "", encoder);
5959
}
6060
virtual void setAttributesFromCloud() {
61-
setAttributeReal(_cloud_value, "");
61+
setAttribute(_cloud_value, "");
6262
}
6363
//modifiers
6464
CloudFloat& operator=(float v) {

Diff for: ‎src/property/types/CloudInt.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class CloudInt : public Property {
5656
return appendAttribute(_value, "", encoder);
5757
}
5858
virtual void setAttributesFromCloud() {
59-
setAttributeReal(_cloud_value, "");
59+
setAttribute(_cloud_value, "");
6060
}
6161
//modifiers
6262
CloudInt& operator=(int v) {

Diff for: ‎src/property/types/CloudLocation.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ class CloudLocation : public Property {
9595
return CborNoError;
9696
}
9797
virtual void setAttributesFromCloud() {
98-
setAttributeReal(_cloud_value.lat, "lat");
99-
setAttributeReal(_cloud_value.lon, "lon");
98+
setAttribute(_cloud_value.lat, "lat");
99+
setAttribute(_cloud_value.lon, "lon");
100100
}
101101
};
102102

Diff for: ‎src/property/types/CloudSchedule.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -425,10 +425,10 @@ class CloudSchedule : public Property {
425425
return CborNoError;
426426
}
427427
virtual void setAttributesFromCloud() {
428-
setAttributeReal(_cloud_value.frm, "frm");
429-
setAttributeReal(_cloud_value.to, "to");
430-
setAttributeReal(_cloud_value.len, "len");
431-
setAttributeReal(_cloud_value.msk, "msk");
428+
setAttribute(_cloud_value.frm, "frm");
429+
setAttribute(_cloud_value.to, "to");
430+
setAttribute(_cloud_value.len, "len");
431+
setAttribute(_cloud_value.msk, "msk");
432432
}
433433
};
434434

Diff for: ‎src/property/types/CloudString.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class CloudString : public Property {
6262
return appendAttribute(_value, "", encoder);
6363
}
6464
virtual void setAttributesFromCloud() {
65-
setAttributeReal(_cloud_value, "");
65+
setAttribute(_cloud_value, "");
6666
}
6767
//modifiers
6868
CloudString& operator=(String v) {

Diff for: ‎src/property/types/CloudUnsignedInt.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class CloudUnsignedInt : public Property {
5656
return appendAttribute(_value, "", encoder);
5757
}
5858
virtual void setAttributesFromCloud() {
59-
setAttributeReal(_cloud_value, "");
59+
setAttribute(_cloud_value, "");
6060
}
6161
//modifiers
6262
CloudUnsignedInt& operator=(unsigned int v) {

Diff for: ‎src/property/types/CloudWrapperBool.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class CloudWrapperBool : public CloudWrapperBase {
4949
return appendAttribute(_primitive_value, "", encoder);
5050
}
5151
virtual void setAttributesFromCloud() {
52-
setAttributeReal(_cloud_value, "");
52+
setAttribute(_cloud_value, "");
5353
}
5454
virtual bool isPrimitive() {
5555
return true;

Diff for: ‎src/property/types/CloudWrapperFloat.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class CloudWrapperFloat : public CloudWrapperBase {
5151
return appendAttribute(_primitive_value, "", encoder);
5252
}
5353
virtual void setAttributesFromCloud() {
54-
setAttributeReal(_cloud_value, "");
54+
setAttribute(_cloud_value, "");
5555
}
5656
virtual bool isPrimitive() {
5757
return true;

Diff for: ‎src/property/types/CloudWrapperInt.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class CloudWrapperInt : public CloudWrapperBase {
4949
return appendAttribute(_primitive_value, "", encoder);
5050
}
5151
virtual void setAttributesFromCloud() {
52-
setAttributeReal(_cloud_value, "");
52+
setAttribute(_cloud_value, "");
5353
}
5454
virtual bool isPrimitive() {
5555
return true;

Diff for: ‎src/property/types/CloudWrapperString.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class CloudWrapperString : public CloudWrapperBase {
5353
return appendAttribute(_primitive_value, "", encoder);
5454
}
5555
virtual void setAttributesFromCloud() {
56-
setAttributeReal(_cloud_value, "");
56+
setAttribute(_cloud_value, "");
5757
}
5858
virtual bool isPrimitive() {
5959
return true;

Diff for: ‎src/property/types/CloudWrapperUnsignedInt.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class CloudWrapperUnsignedInt : public CloudWrapperBase {
4949
return appendAttribute(_primitive_value, "", encoder);
5050
}
5151
virtual void setAttributesFromCloud() {
52-
setAttributeReal(_cloud_value, "");
52+
setAttribute(_cloud_value, "");
5353
}
5454
virtual bool isPrimitive() {
5555
return true;

Diff for: ‎src/property/types/automation/CloudColoredLight.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,10 @@ class CloudColoredLight : public CloudColor {
126126
return CborNoError;
127127
}
128128
virtual void setAttributesFromCloud() {
129-
setAttributeReal(_cloud_value.swi, "swi");
130-
setAttributeReal(_cloud_value.hue, "hue");
131-
setAttributeReal(_cloud_value.sat, "sat");
132-
setAttributeReal(_cloud_value.bri, "bri");
129+
setAttribute(_cloud_value.swi, "swi");
130+
setAttribute(_cloud_value.hue, "hue");
131+
setAttribute(_cloud_value.sat, "sat");
132+
setAttribute(_cloud_value.bri, "bri");
133133
}
134134
};
135135

Diff for: ‎src/property/types/automation/CloudDimmedLight.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ class CloudDimmedLight : public Property {
114114
}
115115

116116
virtual void setAttributesFromCloud() {
117-
setAttributeReal(_cloud_value.swi, "swi");
118-
setAttributeReal(_cloud_value.bri, "bri");
117+
setAttribute(_cloud_value.swi, "swi");
118+
setAttribute(_cloud_value.bri, "bri");
119119
}
120120
};
121121

Diff for: ‎src/property/types/automation/CloudTelevision.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -223,12 +223,12 @@ class CloudTelevision : public Property {
223223
return CborNoError;
224224
}
225225
virtual void setAttributesFromCloud() {
226-
setAttributeReal(_cloud_value.swi, "swi");
227-
setAttributeReal(_cloud_value.vol, "vol");
228-
setAttributeReal(_cloud_value.mut, "mut");
229-
setAttributeReal((int&)_cloud_value.pbc, "pbc");
230-
setAttributeReal((int&)_cloud_value.inp, "inp");
231-
setAttributeReal(_cloud_value.cha, "cha");
226+
setAttribute(_cloud_value.swi, "swi");
227+
setAttribute(_cloud_value.vol, "vol");
228+
setAttribute(_cloud_value.mut, "mut");
229+
setAttribute((int&)_cloud_value.pbc, "pbc");
230+
setAttribute((int&)_cloud_value.inp, "inp");
231+
setAttribute(_cloud_value.cha, "cha");
232232
}
233233
};
234234

0 commit comments

Comments
 (0)