intel
diff --git a/‎parameter/AreaConfiguration.cpp‎
Lines changed: 29 additions & 22 deletions b/‎parameter/AreaConfiguration.cpp‎
Lines changed: 29 additions & 22 deletions
diff --git a/‎parameter/AreaConfiguration.h‎
Lines changed: 19 additions & 17 deletions b/‎parameter/AreaConfiguration.h‎
Lines changed: 19 additions & 17 deletions
@@ -32,30 +32,31 @@
 #include "ConfigurationAccessContext.h"
 #include <assert.h>
 
-CAreaConfiguration::CAreaConfiguration(const CConfigurableElement* pConfigurableElement, const CSyncerSet* pSyncerSet)
+CAreaConfiguration::CAreaConfiguration(const CConfigurableElement *pConfigurableElement,
+                                       const CSyncerSet *pSyncerSet)
     : _pConfigurableElement(pConfigurableElement), _pSyncerSet(pSyncerSet)
 {
     // Size blackboard
     _blackboard.setSize(_pConfigurableElement->getFootPrint());
 }
 
-CAreaConfiguration::CAreaConfiguration(const CConfigurableElement* pConfigurableElement, const CSyncerSet* pSyncerSet, size_t size)
+CAreaConfiguration::CAreaConfiguration(const CConfigurableElement *pConfigurableElement,
+                                       const CSyncerSet *pSyncerSet, size_t size)
     : _pConfigurableElement(pConfigurableElement), _pSyncerSet(pSyncerSet)
 {
     // Size blackboard
     _blackboard.setSize(size);
 }
 
 // Save data from current
-void CAreaConfiguration::save(const CParameterBlackboard* pMainBlackboard)
+void CAreaConfiguration::save(const CParameterBlackboard *pMainBlackboard)
 {
     copyFrom(pMainBlackboard, _pConfigurableElement->getOffset());
 }
 
 // Apply data to current
-bool CAreaConfiguration::restore(CParameterBlackboard* pMainBlackboard,
-                                 bool bSync,
-                                 core::Results* errors) const
+bool CAreaConfiguration::restore(CParameterBlackboard *pMainBlackboard, bool bSync,
+                                 core::Results *errors) const
 {
     assert(_bValid);
 
@@ -66,7 +67,7 @@ bool CAreaConfiguration::restore(CParameterBlackboard* pMainBlackboard,
 }
 
 // Ensure validity
-void CAreaConfiguration::validate(const CParameterBlackboard* pMainBlackboard)
+void CAreaConfiguration::validate(const CParameterBlackboard *pMainBlackboard)
 {
     if (!_bValid) {
 
@@ -84,7 +85,7 @@ bool CAreaConfiguration::isValid() const
 }
 
 // Ensure validity against given valid area configuration
-void CAreaConfiguration::validateAgainst(const CAreaConfiguration* pValidAreaConfiguration)
+void CAreaConfiguration::validateAgainst(const CAreaConfiguration *pValidAreaConfiguration)
 {
     // Should be called on purpose
     assert(!_bValid);
@@ -103,7 +104,9 @@ void CAreaConfiguration::validateAgainst(const CAreaConfiguration* pValidAreaCon
 }
 
 // XML configuration settings parsing
-bool CAreaConfiguration::serializeXmlSettings(CXmlElement& xmlConfigurableElementSettingsElementContent, CConfigurationAccessContext& configurationAccessContext)
+bool CAreaConfiguration::serializeXmlSettings(
+    CXmlElement &xmlConfigurableElementSettingsElementContent,
+    CConfigurationAccessContext &configurationAccessContext)
 {
     // Assign blackboard to configuration context
     configurationAccessContext.setParameterBlackboard(&_blackboard);
@@ -112,7 +115,8 @@ bool CAreaConfiguration::serializeXmlSettings(CXmlElement& xmlConfigurableElemen
     configurationAccessContext.setBaseOffset(_pConfigurableElement->getOffset());
 
     // Parse configuration settings (element contents)
-    if (_pConfigurableElement->serializeXmlSettings(xmlConfigurableElementSettingsElementContent, configurationAccessContext)) {
+    if (_pConfigurableElement->serializeXmlSettings(xmlConfigurableElementSettingsElementContent,
+                                                    configurationAccessContext)) {
 
         if (!configurationAccessContext.serializeOut()) {
 
@@ -125,36 +129,40 @@ bool CAreaConfiguration::serializeXmlSettings(CXmlElement& xmlConfigurableElemen
 }
 
 // Compound handling
-const CConfigurableElement* CAreaConfiguration::getConfigurableElement() const
+const CConfigurableElement *CAreaConfiguration::getConfigurableElement() const
 {
     return _pConfigurableElement;
 }
 
-void CAreaConfiguration::copyToOuter(CAreaConfiguration* pToAreaConfiguration) const
+void CAreaConfiguration::copyToOuter(CAreaConfiguration *pToAreaConfiguration) const
 {
     assert(_pConfigurableElement->isDescendantOf(pToAreaConfiguration->getConfigurableElement()));
 
-    copyTo(&pToAreaConfiguration->_blackboard, _pConfigurableElement->getOffset() - pToAreaConfiguration->getConfigurableElement()->getOffset());
+    copyTo(&pToAreaConfiguration->_blackboard,
+           _pConfigurableElement->getOffset() -
+               pToAreaConfiguration->getConfigurableElement()->getOffset());
 }
 
-void CAreaConfiguration::copyFromOuter(const CAreaConfiguration* pFromAreaConfiguration)
+void CAreaConfiguration::copyFromOuter(const CAreaConfiguration *pFromAreaConfiguration)
 {
     assert(_pConfigurableElement->isDescendantOf(pFromAreaConfiguration->getConfigurableElement()));
 
-    copyFrom(&pFromAreaConfiguration->_blackboard, _pConfigurableElement->getOffset() - pFromAreaConfiguration->getConfigurableElement()->getOffset());
+    copyFrom(&pFromAreaConfiguration->_blackboard,
+             _pConfigurableElement->getOffset() -
+                 pFromAreaConfiguration->getConfigurableElement()->getOffset());
 
     // Inner becomes valid
     setValid(true);
 }
 
-CParameterBlackboard& CAreaConfiguration::getBlackboard()
+CParameterBlackboard &CAreaConfiguration::getBlackboard()
 {
     return _blackboard;
 }
 
-const CParameterBlackboard& CAreaConfiguration::getBlackboard() const
+const CParameterBlackboard &CAreaConfiguration::getBlackboard() const
 {
-     return _blackboard;
+    return _blackboard;
 }
 
 // Store validity
@@ -164,13 +172,12 @@ void CAreaConfiguration::setValid(bool bValid)
 }
 
 // Blackboard copies
-void CAreaConfiguration::copyTo(CParameterBlackboard* pToBlackboard, size_t offset) const
+void CAreaConfiguration::copyTo(CParameterBlackboard *pToBlackboard, size_t offset) const
 {
     pToBlackboard->restoreFrom(&_blackboard, offset);
 }
 
-void CAreaConfiguration::copyFrom(const CParameterBlackboard* pFromBlackboard, size_t offset)
+void CAreaConfiguration::copyFrom(const CParameterBlackboard *pFromBlackboard, size_t offset)
 {
-   pFromBlackboard->saveTo(&_blackboard, offset);
+    pFromBlackboard->saveTo(&_blackboard, offset);
 }
-
 
@@ -40,12 +40,13 @@ class CConfigurationAccessContext;
 class CAreaConfiguration
 {
 public:
-    CAreaConfiguration(const CConfigurableElement* pConfigurableElement, const CSyncerSet* pSyncerSet);
+    CAreaConfiguration(const CConfigurableElement *pConfigurableElement,
+                       const CSyncerSet *pSyncerSet);
 
     virtual ~CAreaConfiguration() = default;
 
     // Save data from current
-    void save(const CParameterBlackboard* pMainBlackboard);
+    void save(const CParameterBlackboard *pMainBlackboard);
 
     /** Restore the configuration area
      *
@@ -54,56 +55,57 @@ class CAreaConfiguration
      * @param[out] errors, errors encountered during restoration
      * @return true if success false otherwise
      */
-    bool restore(CParameterBlackboard* pMainBlackboard, bool bSync, core::Results* errors) const;
+    bool restore(CParameterBlackboard *pMainBlackboard, bool bSync, core::Results *errors) const;
 
     // Ensure validity
-    void validate(const CParameterBlackboard* pMainBlackboard);
+    void validate(const CParameterBlackboard *pMainBlackboard);
 
     // Return validity
     bool isValid() const;
 
     // Ensure validity against given valid area configuration
-    void validateAgainst(const CAreaConfiguration* pValidAreaConfiguration);
+    void validateAgainst(const CAreaConfiguration *pValidAreaConfiguration);
 
     // Compound handling
-    const CConfigurableElement* getConfigurableElement() const;
+    const CConfigurableElement *getConfigurableElement() const;
 
     // Configuration merging
-    virtual void copyToOuter(CAreaConfiguration* pToAreaConfiguration) const;
+    virtual void copyToOuter(CAreaConfiguration *pToAreaConfiguration) const;
 
     // Configuration splitting
-    virtual void copyFromOuter(const CAreaConfiguration* pFromAreaConfiguration);
+    virtual void copyFromOuter(const CAreaConfiguration *pFromAreaConfiguration);
 
     // XML configuration settings parsing/composing
-    bool serializeXmlSettings(CXmlElement& xmlConfigurableElementSettingsElementContent, CConfigurationAccessContext& configurationAccessContext);
+    bool serializeXmlSettings(CXmlElement &xmlConfigurableElementSettingsElementContent,
+                              CConfigurationAccessContext &configurationAccessContext);
 
     // Fetch the Configuration Blackboard
-    CParameterBlackboard& getBlackboard();
-    const CParameterBlackboard& getBlackboard() const;
+    CParameterBlackboard &getBlackboard();
+    const CParameterBlackboard &getBlackboard() const;
 
 protected:
-    CAreaConfiguration(const CConfigurableElement* pConfigurableElement, const CSyncerSet* pSyncerSet, size_t size);
+    CAreaConfiguration(const CConfigurableElement *pConfigurableElement,
+                       const CSyncerSet *pSyncerSet, size_t size);
 
 private:
     // Blackboard copies
-    virtual void copyTo(CParameterBlackboard* pToBlackboard, size_t offset) const;
-    virtual void copyFrom(const CParameterBlackboard* pFromBlackboard, size_t offset);
+    virtual void copyTo(CParameterBlackboard *pToBlackboard, size_t offset) const;
+    virtual void copyFrom(const CParameterBlackboard *pFromBlackboard, size_t offset);
 
     // Store validity
     void setValid(bool bValid);
 
 protected:
     // Associated configurable element
-    const CConfigurableElement* _pConfigurableElement;
+    const CConfigurableElement *_pConfigurableElement;
 
     // Configurable element settings
     CParameterBlackboard _blackboard;
 
 private:
     // Syncer set (required for immediate synchronization)
-    const CSyncerSet* _pSyncerSet;
+    const CSyncerSet *_pSyncerSet;
 
     // Area configuration validity (invalid area configurations can't be restored)
     bool _bValid{false};
 };
-
Original file line number	Diff line number	Diff line change
`@@ -32,30 +32,31 @@`
`32`	`32`	`#include "ConfigurationAccessContext.h"`
`33`	`33`	`#include <assert.h>`
`34`	`34`
`35`		`-CAreaConfiguration::CAreaConfiguration(const CConfigurableElement* pConfigurableElement, const CSyncerSet* pSyncerSet)`
	`35`	`+CAreaConfiguration::CAreaConfiguration(const CConfigurableElement *pConfigurableElement,`
	`36`	`+ const CSyncerSet *pSyncerSet)`
`36`	`37`	`: _pConfigurableElement(pConfigurableElement), _pSyncerSet(pSyncerSet)`
`37`	`38`	`{`
`38`	`39`	`// Size blackboard`
`39`	`40`	`_blackboard.setSize(_pConfigurableElement->getFootPrint());`
`40`	`41`	`}`
`41`	`42`
`42`		`-CAreaConfiguration::CAreaConfiguration(const CConfigurableElement* pConfigurableElement, const CSyncerSet* pSyncerSet, size_t size)`
	`43`	`+CAreaConfiguration::CAreaConfiguration(const CConfigurableElement *pConfigurableElement,`
	`44`	`+ const CSyncerSet *pSyncerSet, size_t size)`
`43`	`45`	`: _pConfigurableElement(pConfigurableElement), _pSyncerSet(pSyncerSet)`
`44`	`46`	`{`
`45`	`47`	`// Size blackboard`
`46`	`48`	`_blackboard.setSize(size);`
`47`	`49`	`}`
`48`	`50`
`49`	`51`	`// Save data from current`
`50`		`-void CAreaConfiguration::save(const CParameterBlackboard* pMainBlackboard)`
	`52`	`+void CAreaConfiguration::save(const CParameterBlackboard *pMainBlackboard)`
`51`	`53`	`{`
`52`	`54`	`copyFrom(pMainBlackboard, _pConfigurableElement->getOffset());`
`53`	`55`	`}`
`54`	`56`
`55`	`57`	`// Apply data to current`
`56`		`-bool CAreaConfiguration::restore(CParameterBlackboard* pMainBlackboard,`
`57`		`- bool bSync,`
`58`		`- core::Results* errors) const`
	`58`	`+bool CAreaConfiguration::restore(CParameterBlackboard *pMainBlackboard, bool bSync,`
	`59`	`+ core::Results *errors) const`
`59`	`60`	`{`
`60`	`61`	`assert(_bValid);`
`61`	`62`
`@@ -66,7 +67,7 @@ bool CAreaConfiguration::restore(CParameterBlackboard* pMainBlackboard,`
`66`	`67`	`}`
`67`	`68`
`68`	`69`	`// Ensure validity`
`69`		`-void CAreaConfiguration::validate(const CParameterBlackboard* pMainBlackboard)`
	`70`	`+void CAreaConfiguration::validate(const CParameterBlackboard *pMainBlackboard)`
`70`	`71`	`{`
`71`	`72`	`if (!_bValid) {`
`72`	`73`
`@@ -84,7 +85,7 @@ bool CAreaConfiguration::isValid() const`
`84`	`85`	`}`
`85`	`86`
`86`	`87`	`// Ensure validity against given valid area configuration`
`87`		`-void CAreaConfiguration::validateAgainst(const CAreaConfiguration* pValidAreaConfiguration)`
	`88`	`+void CAreaConfiguration::validateAgainst(const CAreaConfiguration *pValidAreaConfiguration)`
`88`	`89`	`{`
`89`	`90`	`// Should be called on purpose`
`90`	`91`	`assert(!_bValid);`
`@@ -103,7 +104,9 @@ void CAreaConfiguration::validateAgainst(const CAreaConfiguration* pValidAreaCon`
`103`	`104`	`}`
`104`	`105`
`105`	`106`	`// XML configuration settings parsing`
`106`		`-bool CAreaConfiguration::serializeXmlSettings(CXmlElement& xmlConfigurableElementSettingsElementContent, CConfigurationAccessContext& configurationAccessContext)`
	`107`	`+bool CAreaConfiguration::serializeXmlSettings(`
	`108`	`+ CXmlElement &xmlConfigurableElementSettingsElementContent,`
	`109`	`+ CConfigurationAccessContext &configurationAccessContext)`
`107`	`110`	`{`
`108`	`111`	`// Assign blackboard to configuration context`
`109`	`112`	`configurationAccessContext.setParameterBlackboard(&_blackboard);`
`@@ -112,7 +115,8 @@ bool CAreaConfiguration::serializeXmlSettings(CXmlElement& xmlConfigurableElemen`
`112`	`115`	`configurationAccessContext.setBaseOffset(_pConfigurableElement->getOffset());`
`113`	`116`
`114`	`117`	`// Parse configuration settings (element contents)`
`115`		`- if (_pConfigurableElement->serializeXmlSettings(xmlConfigurableElementSettingsElementContent, configurationAccessContext)) {`
	`118`	`+ if (_pConfigurableElement->serializeXmlSettings(xmlConfigurableElementSettingsElementContent,`
	`119`	`+ configurationAccessContext)) {`
`116`	`120`
`117`	`121`	`if (!configurationAccessContext.serializeOut()) {`
`118`	`122`
`@@ -125,36 +129,40 @@ bool CAreaConfiguration::serializeXmlSettings(CXmlElement& xmlConfigurableElemen`
`125`	`129`	`}`
`126`	`130`
`127`	`131`	`// Compound handling`
`128`		`-const CConfigurableElement* CAreaConfiguration::getConfigurableElement() const`
	`132`	`+const CConfigurableElement *CAreaConfiguration::getConfigurableElement() const`
`129`	`133`	`{`
`130`	`134`	`return _pConfigurableElement;`
`131`	`135`	`}`
`132`	`136`
`133`		`-void CAreaConfiguration::copyToOuter(CAreaConfiguration* pToAreaConfiguration) const`
	`137`	`+void CAreaConfiguration::copyToOuter(CAreaConfiguration *pToAreaConfiguration) const`
`134`	`138`	`{`
`135`	`139`	`assert(_pConfigurableElement->isDescendantOf(pToAreaConfiguration->getConfigurableElement()));`
`136`	`140`
`137`		`- copyTo(&pToAreaConfiguration->_blackboard, _pConfigurableElement->getOffset() - pToAreaConfiguration->getConfigurableElement()->getOffset());`
	`141`	`+ copyTo(&pToAreaConfiguration->_blackboard,`
	`142`	`+ _pConfigurableElement->getOffset() -`
	`143`	`+ pToAreaConfiguration->getConfigurableElement()->getOffset());`
`138`	`144`	`}`
`139`	`145`
`140`		`-void CAreaConfiguration::copyFromOuter(const CAreaConfiguration* pFromAreaConfiguration)`
	`146`	`+void CAreaConfiguration::copyFromOuter(const CAreaConfiguration *pFromAreaConfiguration)`
`141`	`147`	`{`
`142`	`148`	`assert(_pConfigurableElement->isDescendantOf(pFromAreaConfiguration->getConfigurableElement()));`
`143`	`149`
`144`		`- copyFrom(&pFromAreaConfiguration->_blackboard, _pConfigurableElement->getOffset() - pFromAreaConfiguration->getConfigurableElement()->getOffset());`
	`150`	`+ copyFrom(&pFromAreaConfiguration->_blackboard,`
	`151`	`+ _pConfigurableElement->getOffset() -`
	`152`	`+ pFromAreaConfiguration->getConfigurableElement()->getOffset());`
`145`	`153`
`146`	`154`	`// Inner becomes valid`
`147`	`155`	`setValid(true);`
`148`	`156`	`}`
`149`	`157`
`150`		`-CParameterBlackboard& CAreaConfiguration::getBlackboard()`
	`158`	`+CParameterBlackboard &CAreaConfiguration::getBlackboard()`
`151`	`159`	`{`
`152`	`160`	`return _blackboard;`
`153`	`161`	`}`
`154`	`162`
`155`		`-const CParameterBlackboard& CAreaConfiguration::getBlackboard() const`
	`163`	`+const CParameterBlackboard &CAreaConfiguration::getBlackboard() const`
`156`	`164`	`{`
`157`		`- return _blackboard;`
	`165`	`+ return _blackboard;`
`158`	`166`	`}`
`159`	`167`
`160`	`168`	`// Store validity`
`@@ -164,13 +172,12 @@ void CAreaConfiguration::setValid(bool bValid)`
`164`	`172`	`}`
`165`	`173`
`166`	`174`	`// Blackboard copies`
`167`		`-void CAreaConfiguration::copyTo(CParameterBlackboard* pToBlackboard, size_t offset) const`
	`175`	`+void CAreaConfiguration::copyTo(CParameterBlackboard *pToBlackboard, size_t offset) const`
`168`	`176`	`{`
`169`	`177`	`pToBlackboard->restoreFrom(&_blackboard, offset);`
`170`	`178`	`}`
`171`	`179`
`172`		`-void CAreaConfiguration::copyFrom(const CParameterBlackboard* pFromBlackboard, size_t offset)`
	`180`	`+void CAreaConfiguration::copyFrom(const CParameterBlackboard *pFromBlackboard, size_t offset)`
`173`	`181`	`{`
`174`		`- pFromBlackboard->saveTo(&_blackboard, offset);`
	`182`	`+ pFromBlackboard->saveTo(&_blackboard, offset);`
`175`	`183`	`}`
`176`		`-`