Skip to content

Commit 02c46a8

Browse files
using override on overridden methods instead of virtual
1 parent ea757fa commit 02c46a8

File tree

4 files changed

+20
-20
lines changed

4 files changed

+20
-20
lines changed

src/property/types/CloudColor.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ class CloudColor : public Property {
161161
CloudColor() : _value(0, 0, 0), _cloud_value(0, 0, 0) {}
162162
CloudColor(float hue, float saturation, float brightness) : _value(hue, saturation, brightness), _cloud_value(hue, saturation, brightness) {}
163163

164-
virtual bool isDifferentFromCloud() {
164+
bool isDifferentFromCloud() override {
165165

166166
return _value != _cloud_value;
167167
}
@@ -182,19 +182,19 @@ class CloudColor : public Property {
182182
return _value;
183183
}
184184

185-
virtual void fromCloudToLocal() {
185+
void fromCloudToLocal() override {
186186
_value = _cloud_value;
187187
}
188-
virtual void fromLocalToCloud() {
188+
void fromLocalToCloud() override {
189189
_cloud_value = _value;
190190
}
191-
virtual CborError appendAttributesToCloud(CborEncoder *encoder) {
191+
CborError appendAttributesToCloud(CborEncoder *encoder) override {
192192
CHECK_CBOR_MULTI(appendAttribute(_value.hue, "hue", encoder));
193193
CHECK_CBOR_MULTI(appendAttribute(_value.sat, "sat", encoder));
194194
CHECK_CBOR_MULTI(appendAttribute(_value.bri, "bri", encoder));
195195
return CborNoError;
196196
}
197-
virtual void setAttributesFromCloud() {
197+
void setAttributesFromCloud() override {
198198
setAttribute(_cloud_value.hue, "hue");
199199
setAttribute(_cloud_value.sat, "sat");
200200
setAttribute(_cloud_value.bri, "bri");

src/property/types/CloudLocation.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class CloudLocation : public Property {
6363
public:
6464
CloudLocation() : _value(0, 0), _cloud_value(0, 0) {}
6565
CloudLocation(float lat, float lon) : _value(lat, lon), _cloud_value(lat, lon) {}
66-
virtual bool isDifferentFromCloud() {
66+
bool isDifferentFromCloud() override {
6767
float const distance = Location::distance(_value, _cloud_value);
6868
return _value != _cloud_value && (abs(distance) >= Property::_min_delta_property);
6969
}
@@ -83,18 +83,18 @@ class CloudLocation : public Property {
8383
return _value;
8484
}
8585

86-
virtual void fromCloudToLocal() {
86+
void fromCloudToLocal() override {
8787
_value = _cloud_value;
8888
}
89-
virtual void fromLocalToCloud() {
89+
void fromLocalToCloud() override {
9090
_cloud_value = _value;
9191
}
92-
virtual CborError appendAttributesToCloud(CborEncoder *encoder) {
92+
CborError appendAttributesToCloud(CborEncoder *encoder) override {
9393
CHECK_CBOR_MULTI(appendAttribute(_value.lat, "lat", encoder));
9494
CHECK_CBOR_MULTI(appendAttribute(_value.lon, "lon", encoder));
9595
return CborNoError;
9696
}
97-
virtual void setAttributesFromCloud() {
97+
void setAttributesFromCloud() override {
9898
setAttribute(_cloud_value.lat, "lat");
9999
setAttribute(_cloud_value.lon, "lon");
100100
}

src/property/types/CloudSchedule.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ class CloudSchedule : public Property {
384384
CloudSchedule() : _value(0, 0, 0, 0), _cloud_value(0, 0, 0, 0) {}
385385
CloudSchedule(unsigned int frm, unsigned int to, unsigned int len, unsigned int msk) : _value(frm, to, len, msk), _cloud_value(frm, to, len, msk) {}
386386

387-
virtual bool isDifferentFromCloud() {
387+
bool isDifferentFromCloud() override {
388388

389389
return _value != _cloud_value;
390390
}
@@ -410,20 +410,20 @@ class CloudSchedule : public Property {
410410
return _value.isActive();
411411
}
412412

413-
virtual void fromCloudToLocal() {
413+
void fromCloudToLocal() override {
414414
_value = _cloud_value;
415415
}
416-
virtual void fromLocalToCloud() {
416+
void fromLocalToCloud() override {
417417
_cloud_value = _value;
418418
}
419-
virtual CborError appendAttributesToCloud(CborEncoder *encoder) {
419+
CborError appendAttributesToCloud(CborEncoder *encoder) override {
420420
CHECK_CBOR_MULTI(appendAttribute(_value.frm, "frm", encoder));
421421
CHECK_CBOR_MULTI(appendAttribute(_value.to, "to", encoder));
422422
CHECK_CBOR_MULTI(appendAttribute(_value.len, "len", encoder));
423423
CHECK_CBOR_MULTI(appendAttribute(_value.msk, "msk", encoder));
424424
return CborNoError;
425425
}
426-
virtual void setAttributesFromCloud() {
426+
void setAttributesFromCloud() override {
427427
setAttribute(_cloud_value.frm, "frm");
428428
setAttribute(_cloud_value.to, "to");
429429
setAttribute(_cloud_value.len, "len");

src/property/types/CloudString.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,19 @@ class CloudString : public Property {
4949
void clear() {
5050
_value = PropertyActions::CLEAR;
5151
}
52-
virtual bool isDifferentFromCloud() {
52+
bool isDifferentFromCloud() override {
5353
return _value != _cloud_value;
5454
}
55-
virtual void fromCloudToLocal() {
55+
void fromCloudToLocal() override {
5656
_value = _cloud_value;
5757
}
58-
virtual void fromLocalToCloud() {
58+
void fromLocalToCloud() override {
5959
_cloud_value = _value;
6060
}
61-
virtual CborError appendAttributesToCloud(CborEncoder *encoder) {
61+
CborError appendAttributesToCloud(CborEncoder *encoder) override {
6262
return appendAttribute(_value, "", encoder);
6363
}
64-
virtual void setAttributesFromCloud() {
64+
void setAttributesFromCloud() override {
6565
setAttribute(_cloud_value, "");
6666
}
6767
//modifiers

0 commit comments

Comments
 (0)