Fully replacing PropertyContained as a self-contained class with just a typedef

aentinger · aentinger · commit 01332e7f87e3 · 2020-06-08T16:42:23.000+02:00
diff --git a/src/ArduinoIoTCloud.cpp b/src/ArduinoIoTCloud.cpp
@@ -27,7 +27,7 @@
 
 void ArduinoIoTCloudClass::push()
 {
-  _property_container.requestUpdateForAllProperties();
+  requestUpdateForAllProperties(_property_container);
 }
 
 void ArduinoIoTCloudClass::addCallback(ArduinoIoTCloudEvent const event, OnCloudEventCallback callback)
@@ -52,9 +52,9 @@ void ArduinoIoTCloudClass::addPropertyReal(Property& property, String name, int
   }
 
   if (seconds == ON_CHANGE) {
-    _property_container.addPropertyReal(property, name, permission, tag).publishOnChange(minDelta, DEFAULT_MIN_TIME_BETWEEN_UPDATES_MILLIS).onUpdate(fn).onSync(synFn);
+    addPropertyToContainer(_property_container, property, name, permission, tag).publishOnChange(minDelta, DEFAULT_MIN_TIME_BETWEEN_UPDATES_MILLIS).onUpdate(fn).onSync(synFn);
   } else {
-    _property_container.addPropertyReal(property, name, permission, tag).publishEvery(seconds).onUpdate(fn).onSync(synFn);
+    addPropertyToContainer(_property_container, property, name, permission, tag).publishEvery(seconds).onUpdate(fn).onSync(synFn);
   }
 }
 
@@ -77,7 +77,7 @@ Property& ArduinoIoTCloudClass::addPropertyReal(bool& property, String name, Per
 Property& ArduinoIoTCloudClass::addPropertyReal(bool& property, String name, int tag, Permission const permission)
 {
   Property* p = new CloudWrapperBool(property);
-  return _property_container.addPropertyReal(*p, name, permission, tag);
+  return addPropertyToContainer(_property_container, *p, name, permission, tag);
 }
 
 void ArduinoIoTCloudClass::addPropertyReal(float& property, String name, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(Property & property))
@@ -99,7 +99,7 @@ Property& ArduinoIoTCloudClass::addPropertyReal(float& property, String name, Pe
 Property& ArduinoIoTCloudClass::addPropertyReal(float& property, String name, int tag, Permission const permission)
 {
   Property* p = new CloudWrapperFloat(property);
-  return _property_container.addPropertyReal(*p, name, permission, tag);
+  return addPropertyToContainer(_property_container, *p, name, permission, tag);
 }
 
 void ArduinoIoTCloudClass::addPropertyReal(int& property, String name, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(Property & property))
@@ -121,7 +121,7 @@ Property& ArduinoIoTCloudClass::addPropertyReal(int& property, String name, Perm
 Property& ArduinoIoTCloudClass::addPropertyReal(int& property, String name, int tag, Permission const permission)
 {
   Property* p = new CloudWrapperInt(property);
-  return _property_container.addPropertyReal(*p, name, permission, tag);
+  return addPropertyToContainer(_property_container, *p, name, permission, tag);
 }
 
 void ArduinoIoTCloudClass::addPropertyReal(String& property, String name, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(Property & property))
@@ -143,7 +143,7 @@ Property& ArduinoIoTCloudClass::addPropertyReal(String& property, String name, P
 Property& ArduinoIoTCloudClass::addPropertyReal(String& property, String name, int tag, Permission const permission)
 {
   Property* p = new CloudWrapperString(property);
-  return _property_container.addPropertyReal(*p, name, permission, tag);
+  return addPropertyToContainer(_property_container, *p, name, permission, tag);
 }
 
 /******************************************************************************
diff --git a/src/ArduinoIoTCloudLPWAN.cpp b/src/ArduinoIoTCloudLPWAN.cpp
@@ -63,7 +63,7 @@ int ArduinoIoTCloudLPWAN::begin(ConnectionHandler& connection, bool retry)
 void ArduinoIoTCloudLPWAN::update()
 {
   // Check if a primitive property wrapper is locally changed
-  _property_container.updateTimestampOnLocallyChangedProperties();
+  updateTimestampOnLocallyChangedProperties(_property_container);
 
   ArduinoIoTConnectionStatus next_iot_status = _iot_status;
 
diff --git a/src/ArduinoIoTCloudTCP.cpp b/src/ArduinoIoTCloudTCP.cpp
@@ -153,7 +153,7 @@ void ArduinoIoTCloudTCP::update()
 #endif /* OTA_ENABLED */
 
   // Check if a primitive property wrapper is locally changed
-  _property_container.updateTimestampOnLocallyChangedProperties();
+  updateTimestampOnLocallyChangedProperties(_property_container);
 
   if(checkPhyConnection()   != NetworkConnectionState::CONNECTED)     return;
   if(checkCloudConnection() != ArduinoIoTConnectionStatus::CONNECTED) return;
diff --git a/src/cbor/ArduinoCloudThing.cpp b/src/cbor/ArduinoCloudThing.cpp
@@ -60,7 +60,7 @@ int ArduinoCloudThing::encode(uint8_t * data, size_t const size, bool lightPaylo
     return -1;
   }
 
-  if (_property_container->appendChangedProperties(&arrayEncoder, lightPayload) < 1) {
+  if (appendChangedProperties(*_property_container, &arrayEncoder, lightPayload) < 1) {
     return -1;
   }
 
@@ -398,7 +398,7 @@ void ArduinoCloudThing::freeMapDataList(std::list<CborMapData *> * map_data_list
 }
 
 void ArduinoCloudThing::updateProperty(String propertyName, unsigned long cloudChangeEventTime) {
-  Property* property = _property_container->getProperty(propertyName);
+  Property* property = getProperty(*_property_container, propertyName);
   if (property && property->isWriteableByCloud()) {
     property->setLastCloudChangeTimestamp(cloudChangeEventTime);
     property->setAttributesFromCloud(&_map_data_list);
@@ -415,9 +415,9 @@ void ArduinoCloudThing::updateProperty(String propertyName, unsigned long cloudC
 String ArduinoCloudThing::getPropertyNameByIdentifier(int propertyIdentifier) {
   Property* property;
   if (propertyIdentifier > 255) {
-    property = _property_container->getProperty(propertyIdentifier & 255);
+    property = getProperty(*_property_container, propertyIdentifier & 255);
   } else {
-    property = _property_container->getProperty(propertyIdentifier);
+    property = getProperty(*_property_container, propertyIdentifier);
   }
   return property->name();
 }
diff --git a/src/property/PropertyContainer.cpp b/src/property/PropertyContainer.cpp
@@ -29,59 +29,59 @@
    PUBLIC MEMBER FUNCTIONS
  ******************************************************************************/
 
-Property & PropertyContainer::addPropertyReal(Property & property, String const & name, Permission const permission, int propertyIdentifier, GetTimeCallbackFunc func)
+Property & addPropertyToContainer(PropertyContainer & prop_cont, Property & property, String const & name, Permission const permission, int propertyIdentifier, GetTimeCallbackFunc func)
 {
   /* Check whether or not the property already has been added to the container */
-  Property * p = getProperty(name);
+  Property * p = getProperty(prop_cont, name);
   if(p != nullptr) return (*p);
 
   /* Initialize property and add it to the container */
   property.init(name, permission, func);
 
-  addProperty(&property, propertyIdentifier);
+  addProperty(prop_cont, &property, propertyIdentifier);
   return property;
 }
 
 
-Property * PropertyContainer::getProperty(String const & name)
+Property * getProperty(PropertyContainer & prop_cont, String const & name)
 {
   std::list<Property *>::iterator iter;
 
-  iter = std::find_if(_property_list.begin(),
-                      _property_list.end(),
+  iter = std::find_if(prop_cont.begin(),
+                      prop_cont.end(),
                       [name](Property * p) -> bool
                       {
                         return (p->name() == name);
                       });
 
-  if (iter == _property_list.end())
+  if (iter == prop_cont.end())
     return nullptr;
   else
     return (*iter);
 }
 
-Property * PropertyContainer::getProperty(int const identifier)
+Property * getProperty(PropertyContainer & prop_cont, int const identifier)
 {
   std::list<Property *>::iterator iter;
 
-  iter = std::find_if(_property_list.begin(),
-                      _property_list.end(),
+  iter = std::find_if(prop_cont.begin(),
+                      prop_cont.end(),
                       [identifier](Property * p) -> bool
                       {
                         return (p->identifier() == identifier);
                       });
 
-  if (iter == _property_list.end())
+  if (iter == prop_cont.end())
     return nullptr;
   else
     return (*iter);
 }
 
-int PropertyContainer::appendChangedProperties(CborEncoder * arrayEncoder, bool lightPayload)
+int appendChangedProperties(PropertyContainer & prop_cont, CborEncoder * arrayEncoder, bool lightPayload)
 {
   int appendedProperties = 0;
-  std::for_each(_property_list.begin(),
-                _property_list.end(),
+  std::for_each(prop_cont.begin(),
+                prop_cont.end(),
                 [arrayEncoder, lightPayload, &appendedProperties](Property * p)
                 {
                   if (p->shouldBeUpdated() && p->isReadableByCloud())
@@ -93,23 +93,23 @@ int PropertyContainer::appendChangedProperties(CborEncoder * arrayEncoder, bool
   return appendedProperties;
 }
 
-void PropertyContainer::requestUpdateForAllProperties()
+void requestUpdateForAllProperties(PropertyContainer & prop_cont)
 {
-  std::for_each(_property_list.begin(),
-                _property_list.end(),
+  std::for_each(prop_cont.begin(),
+                prop_cont.end(),
                 [](Property * p)
                 {
                   p->requestUpdate();
                 });
 }
 
-void PropertyContainer::updateTimestampOnLocallyChangedProperties()
+void updateTimestampOnLocallyChangedProperties(PropertyContainer & prop_cont)
 {
   /* This function updates the timestamps on the primitive properties 
    * that have been modified locally since last cloud synchronization
    */
-  std::for_each(_property_list.begin(),
-                _property_list.end(),
+  std::for_each(prop_cont.begin(),
+                prop_cont.end(),
                 [](Property * p)
                 {
                   CloudWrapperBase * pbase = reinterpret_cast<CloudWrapperBase *>(p);
@@ -124,7 +124,7 @@ void PropertyContainer::updateTimestampOnLocallyChangedProperties()
    PRIVATE MEMBER FUNCTIONS
  ******************************************************************************/
 
-void PropertyContainer::addProperty(Property * property_obj, int propertyIdentifier)
+void addProperty(PropertyContainer & prop_cont, Property * property_obj, int propertyIdentifier)
 {
   if (propertyIdentifier != -1)
   {
@@ -133,7 +133,7 @@ void PropertyContainer::addProperty(Property * property_obj, int propertyIdentif
   /* If property identifier is -1, an incremental value will be assigned as identifier. */
   else
   {
-    property_obj->setIdentifier(_property_list.size() + 1); /* This is in order to stay compatible to the old system of first increasing _numProperties and then assigning it here. */
+    property_obj->setIdentifier(prop_cont.size() + 1); /* This is in order to stay compatible to the old system of first increasing _numProperties and then assigning it here. */
   }
-  _property_list.push_back(property_obj);
+  prop_cont.push_back(property_obj);
 }
diff --git a/src/property/PropertyContainer.h b/src/property/PropertyContainer.h
@@ -39,37 +39,31 @@ extern "C" unsigned long getTime();
 #endif
 
 /******************************************************************************
-   CLASS DECLARATION
+   TYPEDEF
  ******************************************************************************/
 
-class PropertyContainer
-{
+typedef std::list<Property *> PropertyContainer;
 
-public:
+/******************************************************************************
+   FUNCTION DECLARATION
+ ******************************************************************************/
 
-  Property & addPropertyReal(Property & property,
-                             String const & name,
-                             Permission const permission,
-                             int propertyIdentifier = -1,
-                             GetTimeCallbackFunc func = getTime);
+Property & addPropertyToContainer(PropertyContainer & prop_cont,
+                                  Property & property,
+                                  String const & name,
+                                  Permission const permission,
+                                  int propertyIdentifier = -1,
+                                  GetTimeCallbackFunc func = getTime);
 
   
-  Property * getProperty          (String const & name);
-  Property * getProperty          (int const identifier);
-
-
-  int appendChangedProperties(CborEncoder * arrayEncoder, bool lightPayload);
-  void updateTimestampOnLocallyChangedProperties();
-  void requestUpdateForAllProperties();
-
-
-
-private:
+Property * getProperty(PropertyContainer & prop_cont, String const & name);
+Property * getProperty(PropertyContainer & prop_cont, int const identifier);
 
-  std::list<Property *> _property_list;
 
-  void addProperty(Property * property_obj, int propertyIdentifier);
+int appendChangedProperties(PropertyContainer & prop_cont, CborEncoder * arrayEncoder, bool lightPayload);
+void updateTimestampOnLocallyChangedProperties(PropertyContainer & prop_cont);
+void requestUpdateForAllProperties(PropertyContainer & prop_cont);
 
-};
+void addProperty(PropertyContainer & prop_cont, Property * property_obj, int propertyIdentifier);
 
 #endif /* ARDUINO_PROPERTY_CONTAINER_H_ */

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`
`28`	`28`	`void ArduinoIoTCloudClass::push()`
`29`	`29`	`{`
`30`		`- _property_container.requestUpdateForAllProperties();`
	`30`	`+ requestUpdateForAllProperties(_property_container);`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`void ArduinoIoTCloudClass::addCallback(ArduinoIoTCloudEvent const event, OnCloudEventCallback callback)`
`@@ -52,9 +52,9 @@ void ArduinoIoTCloudClass::addPropertyReal(Property& property, String name, int`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`if (seconds == ON_CHANGE) {`
`55`		`- _property_container.addPropertyReal(property, name, permission, tag).publishOnChange(minDelta, DEFAULT_MIN_TIME_BETWEEN_UPDATES_MILLIS).onUpdate(fn).onSync(synFn);`
	`55`	`+ addPropertyToContainer(_property_container, property, name, permission, tag).publishOnChange(minDelta, DEFAULT_MIN_TIME_BETWEEN_UPDATES_MILLIS).onUpdate(fn).onSync(synFn);`
`56`	`56`	`} else {`
`57`		`- _property_container.addPropertyReal(property, name, permission, tag).publishEvery(seconds).onUpdate(fn).onSync(synFn);`
	`57`	`+ addPropertyToContainer(_property_container, property, name, permission, tag).publishEvery(seconds).onUpdate(fn).onSync(synFn);`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`
`@@ -77,7 +77,7 @@ Property& ArduinoIoTCloudClass::addPropertyReal(bool& property, String name, Per`
`77`	`77`	`Property& ArduinoIoTCloudClass::addPropertyReal(bool& property, String name, int tag, Permission const permission)`
`78`	`78`	`{`
`79`	`79`	`Property* p = new CloudWrapperBool(property);`
`80`		`- return _property_container.addPropertyReal(*p, name, permission, tag);`
	`80`	`+ return addPropertyToContainer(_property_container, *p, name, permission, tag);`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`void ArduinoIoTCloudClass::addPropertyReal(float& property, String name, permissionType permission_type, long seconds, void(fn)(void), float minDelta, void(synFn)(Property & property))`
`@@ -99,7 +99,7 @@ Property& ArduinoIoTCloudClass::addPropertyReal(float& property, String name, Pe`
`99`	`99`	`Property& ArduinoIoTCloudClass::addPropertyReal(float& property, String name, int tag, Permission const permission)`
`100`	`100`	`{`
`101`	`101`	`Property* p = new CloudWrapperFloat(property);`
`102`		`- return _property_container.addPropertyReal(*p, name, permission, tag);`
	`102`	`+ return addPropertyToContainer(_property_container, *p, name, permission, tag);`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`void ArduinoIoTCloudClass::addPropertyReal(int& property, String name, permissionType permission_type, long seconds, void(fn)(void), float minDelta, void(synFn)(Property & property))`
`@@ -121,7 +121,7 @@ Property& ArduinoIoTCloudClass::addPropertyReal(int& property, String name, Perm`
`121`	`121`	`Property& ArduinoIoTCloudClass::addPropertyReal(int& property, String name, int tag, Permission const permission)`
`122`	`122`	`{`
`123`	`123`	`Property* p = new CloudWrapperInt(property);`
`124`		`- return _property_container.addPropertyReal(*p, name, permission, tag);`
	`124`	`+ return addPropertyToContainer(_property_container, *p, name, permission, tag);`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`void ArduinoIoTCloudClass::addPropertyReal(String& property, String name, permissionType permission_type, long seconds, void(fn)(void), float minDelta, void(synFn)(Property & property))`
`@@ -143,7 +143,7 @@ Property& ArduinoIoTCloudClass::addPropertyReal(String& property, String name, P`
`143`	`143`	`Property& ArduinoIoTCloudClass::addPropertyReal(String& property, String name, int tag, Permission const permission)`
`144`	`144`	`{`
`145`	`145`	`Property* p = new CloudWrapperString(property);`
`146`		`- return _property_container.addPropertyReal(*p, name, permission, tag);`
	`146`	`+ return addPropertyToContainer(_property_container, *p, name, permission, tag);`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`/******************************************************************************`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ int ArduinoIoTCloudLPWAN::begin(ConnectionHandler& connection, bool retry)`
`63`	`63`	`void ArduinoIoTCloudLPWAN::update()`
`64`	`64`	`{`
`65`	`65`	`// Check if a primitive property wrapper is locally changed`
`66`		`- _property_container.updateTimestampOnLocallyChangedProperties();`
	`66`	`+ updateTimestampOnLocallyChangedProperties(_property_container);`
`67`	`67`
`68`	`68`	`ArduinoIoTConnectionStatus next_iot_status = _iot_status;`
`69`	`69`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ int ArduinoCloudThing::encode(uint8_t * data, size_t const size, bool lightPaylo`
`60`	`60`	`return -1;`
`61`	`61`	`}`
`62`	`62`
`63`		`- if (_property_container->appendChangedProperties(&arrayEncoder, lightPayload) < 1) {`
	`63`	`+ if (appendChangedProperties(*_property_container, &arrayEncoder, lightPayload) < 1) {`
`64`	`64`	`return -1;`
`65`	`65`	`}`
`66`	`66`
`@@ -398,7 +398,7 @@ void ArduinoCloudThing::freeMapDataList(std::list<CborMapData > map_data_list`
`398`	`398`	`}`
`399`	`399`
`400`	`400`	`void ArduinoCloudThing::updateProperty(String propertyName, unsigned long cloudChangeEventTime) {`
`401`		`- Property* property = _property_container->getProperty(propertyName);`
	`401`	`+ Property* property = getProperty(*_property_container, propertyName);`
`402`	`402`	`if (property && property->isWriteableByCloud()) {`
`403`	`403`	`property->setLastCloudChangeTimestamp(cloudChangeEventTime);`
`404`	`404`	`property->setAttributesFromCloud(&_map_data_list);`
`@@ -415,9 +415,9 @@ void ArduinoCloudThing::updateProperty(String propertyName, unsigned long cloudC`
`415`	`415`	`String ArduinoCloudThing::getPropertyNameByIdentifier(int propertyIdentifier) {`
`416`	`416`	`Property* property;`
`417`	`417`	`if (propertyIdentifier > 255) {`
`418`		`- property = _property_container->getProperty(propertyIdentifier & 255);`
	`418`	`+ property = getProperty(*_property_container, propertyIdentifier & 255);`
`419`	`419`	`} else {`
`420`		`- property = _property_container->getProperty(propertyIdentifier);`
	`420`	`+ property = getProperty(*_property_container, propertyIdentifier);`
`421`	`421`	`}`
`422`	`422`	`return property->name();`
`423`	`423`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,59 +29,59 @@`
`29`	`29`	`PUBLIC MEMBER FUNCTIONS`
`30`	`30`	`******************************************************************************/`
`31`	`31`
`32`		`-Property & PropertyContainer::addPropertyReal(Property & property, String const & name, Permission const permission, int propertyIdentifier, GetTimeCallbackFunc func)`
	`32`	`+Property & addPropertyToContainer(PropertyContainer & prop_cont, Property & property, String const & name, Permission const permission, int propertyIdentifier, GetTimeCallbackFunc func)`
`33`	`33`	`{`
`34`	`34`	`/* Check whether or not the property already has been added to the container */`
`35`		`- Property * p = getProperty(name);`
	`35`	`+ Property * p = getProperty(prop_cont, name);`
`36`	`36`	`if(p != nullptr) return (*p);`
`37`	`37`
`38`	`38`	`/* Initialize property and add it to the container */`
`39`	`39`	`property.init(name, permission, func);`
`40`	`40`
`41`		`- addProperty(&property, propertyIdentifier);`
	`41`	`+ addProperty(prop_cont, &property, propertyIdentifier);`
`42`	`42`	`return property;`
`43`	`43`	`}`
`44`	`44`
`45`	`45`
`46`		`-Property * PropertyContainer::getProperty(String const & name)`
	`46`	`+Property * getProperty(PropertyContainer & prop_cont, String const & name)`
`47`	`47`	`{`
`48`	`48`	`std::list<Property *>::iterator iter;`
`49`	`49`
`50`		`- iter = std::find_if(_property_list.begin(),`
`51`		`- _property_list.end(),`
	`50`	`+ iter = std::find_if(prop_cont.begin(),`
	`51`	`+ prop_cont.end(),`
`52`	`52`	`[name](Property * p) -> bool`
`53`	`53`	`{`
`54`	`54`	`return (p->name() == name);`
`55`	`55`	`});`
`56`	`56`
`57`		`- if (iter == _property_list.end())`
	`57`	`+ if (iter == prop_cont.end())`
`58`	`58`	`return nullptr;`
`59`	`59`	`else`
`60`	`60`	`return (*iter);`
`61`	`61`	`}`
`62`	`62`
`63`		`-Property * PropertyContainer::getProperty(int const identifier)`
	`63`	`+Property * getProperty(PropertyContainer & prop_cont, int const identifier)`
`64`	`64`	`{`
`65`	`65`	`std::list<Property *>::iterator iter;`
`66`	`66`
`67`		`- iter = std::find_if(_property_list.begin(),`
`68`		`- _property_list.end(),`
	`67`	`+ iter = std::find_if(prop_cont.begin(),`
	`68`	`+ prop_cont.end(),`
`69`	`69`	`[identifier](Property * p) -> bool`
`70`	`70`	`{`
`71`	`71`	`return (p->identifier() == identifier);`
`72`	`72`	`});`
`73`	`73`
`74`		`- if (iter == _property_list.end())`
	`74`	`+ if (iter == prop_cont.end())`
`75`	`75`	`return nullptr;`
`76`	`76`	`else`
`77`	`77`	`return (*iter);`
`78`	`78`	`}`
`79`	`79`
`80`		`-int PropertyContainer::appendChangedProperties(CborEncoder * arrayEncoder, bool lightPayload)`
	`80`	`+int appendChangedProperties(PropertyContainer & prop_cont, CborEncoder * arrayEncoder, bool lightPayload)`
`81`	`81`	`{`
`82`	`82`	`int appendedProperties = 0;`
`83`		`- std::for_each(_property_list.begin(),`
`84`		`- _property_list.end(),`
	`83`	`+ std::for_each(prop_cont.begin(),`
	`84`	`+ prop_cont.end(),`
`85`	`85`	`[arrayEncoder, lightPayload, &appendedProperties](Property * p)`
`86`	`86`	`{`
`87`	`87`	`if (p->shouldBeUpdated() && p->isReadableByCloud())`
`@@ -93,23 +93,23 @@ int PropertyContainer::appendChangedProperties(CborEncoder * arrayEncoder, bool`
`93`	`93`	`return appendedProperties;`
`94`	`94`	`}`
`95`	`95`
`96`		`-void PropertyContainer::requestUpdateForAllProperties()`
	`96`	`+void requestUpdateForAllProperties(PropertyContainer & prop_cont)`
`97`	`97`	`{`
`98`		`- std::for_each(_property_list.begin(),`
`99`		`- _property_list.end(),`
	`98`	`+ std::for_each(prop_cont.begin(),`
	`99`	`+ prop_cont.end(),`
`100`	`100`	`[](Property * p)`
`101`	`101`	`{`
`102`	`102`	`p->requestUpdate();`
`103`	`103`	`});`
`104`	`104`	`}`
`105`	`105`
`106`		`-void PropertyContainer::updateTimestampOnLocallyChangedProperties()`
	`106`	`+void updateTimestampOnLocallyChangedProperties(PropertyContainer & prop_cont)`
`107`	`107`	`{`
`108`	`108`	`/* This function updates the timestamps on the primitive properties`
`109`	`109`	`* that have been modified locally since last cloud synchronization`
`110`	`110`	`*/`
`111`		`- std::for_each(_property_list.begin(),`
`112`		`- _property_list.end(),`
	`111`	`+ std::for_each(prop_cont.begin(),`
	`112`	`+ prop_cont.end(),`
`113`	`113`	`[](Property * p)`
`114`	`114`	`{`
`115`	`115`	`CloudWrapperBase * pbase = reinterpret_cast<CloudWrapperBase *>(p);`
`@@ -124,7 +124,7 @@ void PropertyContainer::updateTimestampOnLocallyChangedProperties()`
`124`	`124`	`PRIVATE MEMBER FUNCTIONS`
`125`	`125`	`******************************************************************************/`
`126`	`126`
`127`		`-void PropertyContainer::addProperty(Property * property_obj, int propertyIdentifier)`
	`127`	`+void addProperty(PropertyContainer & prop_cont, Property * property_obj, int propertyIdentifier)`
`128`	`128`	`{`
`129`	`129`	`if (propertyIdentifier != -1)`
`130`	`130`	`{`
`@@ -133,7 +133,7 @@ void PropertyContainer::addProperty(Property * property_obj, int propertyIdentif`
`133`	`133`	`/* If property identifier is -1, an incremental value will be assigned as identifier. */`
`134`	`134`	`else`
`135`	`135`	`{`
`136`		`- property_obj->setIdentifier(_property_list.size() + 1); /* This is in order to stay compatible to the old system of first increasing _numProperties and then assigning it here. */`
	`136`	`+ property_obj->setIdentifier(prop_cont.size() + 1); /* This is in order to stay compatible to the old system of first increasing _numProperties and then assigning it here. */`
`137`	`137`	`}`
`138`		`- _property_list.push_back(property_obj);`
	`138`	`+ prop_cont.push_back(property_obj);`
`139`	`139`	`}`