Restyled by whitespace

Author: restyled-commits

examples/rvc-app/rvc-common/src/rvc-service-area-delegate.cpp

@@ -26,7 +26,7 @@ CHIP_ERROR RvcServiceAreaDelegate::Init()
     // hardcoded fill of SUPPORTED MAPS for prototyping
     uint8_t supportedMapId_XX  = 3;
     uint8_t supportedMapId_YY  = 245;
-    
+
     GetInstance()->AddSupportedMap(supportedMapId_XX, CharSpan::fromCharString("My Map XX"));
     GetInstance()->AddSupportedMap(supportedMapId_YY, CharSpan::fromCharString("My Map YY"));
 
@@ -39,7 +39,7 @@ CHIP_ERROR RvcServiceAreaDelegate::Init()
 
 
     // Location A has name, floor number, uses map XX
-    GetInstance()->AddSupportedLocation(  supportedLocationId_A, 
+    GetInstance()->AddSupportedLocation(  supportedLocationId_A,
                                               DataModel::Nullable<uint_fast8_t>(supportedMapId_XX),
                                               CharSpan::fromCharString("My Location A"),
                                               DataModel::Nullable<int16_t>(4),
@@ -50,7 +50,7 @@ CHIP_ERROR RvcServiceAreaDelegate::Init()
 
 
     // Location B has name, uses map XX
-    GetInstance()->AddSupportedLocation(  supportedLocationId_B, 
+    GetInstance()->AddSupportedLocation(  supportedLocationId_B,
                                               DataModel::Nullable<uint_fast8_t>(supportedMapId_XX),
                                               CharSpan::fromCharString("My Location B"),
                                               DataModel::Nullable<int16_t>(),
@@ -63,7 +63,7 @@ CHIP_ERROR RvcServiceAreaDelegate::Init()
 
 
     // Location C has full SemData, no name, Map YY
-    GetInstance()->AddSupportedLocation(  supportedLocationId_C, 
+    GetInstance()->AddSupportedLocation(  supportedLocationId_C,
                                               DataModel::Nullable<uint_fast8_t>(supportedMapId_YY),
                                               CharSpan(),
                                               DataModel::Nullable<int16_t>(-1),
@@ -73,7 +73,7 @@ CHIP_ERROR RvcServiceAreaDelegate::Init()
                                               DataModel::Nullable<ServiceArea::FloorSurfaceTag>(ServiceArea::FloorSurfaceTag::kConcrete) );
 
     // Location D has null values for all HomeLocationStruct fields, Map YY
-    GetInstance()->AddSupportedLocation(   supportedLocationId_D, 
+    GetInstance()->AddSupportedLocation(   supportedLocationId_D,
                                               DataModel::Nullable<uint_fast8_t>(supportedMapId_YY),
                                               CharSpan::fromCharString("My Location D"),
                                               DataModel::Nullable<int16_t>(),
@@ -125,12 +125,12 @@ bool RvcServiceAreaDelegate::IsSupportedLocationsChangeAllowed()
     return true; // TODO
 }
 
-uint32_t RvcServiceAreaDelegate::GetNumberOfSupportedLocations() 
+uint32_t RvcServiceAreaDelegate::GetNumberOfSupportedLocations()
 {
     return mSupportedLocations.size();
 }
 
-bool RvcServiceAreaDelegate::GetSupportedLocationByIndex(uint32_t listIndex, LocationStructureWrapper & aSupportedLocation) 
+bool RvcServiceAreaDelegate::GetSupportedLocationByIndex(uint32_t listIndex, LocationStructureWrapper & aSupportedLocation)
 {
     bool ret_value = false;
 
@@ -198,9 +198,9 @@ bool RvcServiceAreaDelegate::ModifySupportedLocation(uint32_t listIndex, const L
     // The server instance (caller) is responsible for ensuring that there are no duplicate location IDs, list size not exceeded, etc.
 
     // Double-check that locationID's match.
-    VerifyOrExit((modifiedLocation.locationID == mSupportedLocations[listIndex].locationID), 
-                 ChipLogError(Zcl,  "ModifySupportedLocation - new locationID %u does not match existing locationID %u", 
-                              modifiedLocation.locationID, mSupportedLocations[listIndex].locationID));   
+    VerifyOrExit((modifiedLocation.locationID == mSupportedLocations[listIndex].locationID),
+                 ChipLogError(Zcl,  "ModifySupportedLocation - new locationID %u does not match existing locationID %u",
+                              modifiedLocation.locationID, mSupportedLocations[listIndex].locationID));
 
     // checks passed, update the attribute
     mSupportedLocations[listIndex] = modifiedLocation;
@@ -233,12 +233,12 @@ bool RvcServiceAreaDelegate::IsSupportedMapChangeAllowed()
     return true; // TODO
 }
 
-uint32_t RvcServiceAreaDelegate::GetNumberOfSupportedMaps() 
+uint32_t RvcServiceAreaDelegate::GetNumberOfSupportedMaps()
 {
     return mSupportedMaps.size();
 }
 
-bool RvcServiceAreaDelegate::GetSupportedMapByIndex(uint32_t listIndex, MapStructureWrapper & aSupportedMap) 
+bool RvcServiceAreaDelegate::GetSupportedMapByIndex(uint32_t listIndex, MapStructureWrapper & aSupportedMap)
 {
     bool ret_value = false;
 
@@ -307,7 +307,7 @@ bool RvcServiceAreaDelegate::ModifySupportedMap(uint32_t listIndex, const MapStr
     // Double-check that mapID's match.
     VerifyOrExit((modifiedMap.mapID == mSupportedMaps[listIndex].mapID),
                  ChipLogError(Zcl,  "ModifySupportedMap - mapID's do not match, new mapID %u, existing mapID %u",
-                              modifiedMap.mapID, mSupportedMaps[listIndex].mapID));   
+                              modifiedMap.mapID, mSupportedMaps[listIndex].mapID));
 
     // save modified map
     mSupportedMaps[listIndex] = modifiedMap;
@@ -391,12 +391,12 @@ bool RvcServiceAreaDelegate::ClearSelectedLocations()
 //*************************************************************************
 // Progress List accessors
 
-uint32_t RvcServiceAreaDelegate::GetNumberOfProgressElements() 
+uint32_t RvcServiceAreaDelegate::GetNumberOfProgressElements()
 {
     return mProgressList.size();
 }
 
-bool RvcServiceAreaDelegate::GetProgressElementByIndex(uint32_t listIndex,  Structs::ProgressStruct::Type & aProgressElement) 
+bool RvcServiceAreaDelegate::GetProgressElementByIndex(uint32_t listIndex,  Structs::ProgressStruct::Type & aProgressElement)
 {
     bool ret_value = false;
 
@@ -449,20 +449,20 @@ bool RvcServiceAreaDelegate::AddProgressElement(const Structs::ProgressStruct::T
     }
     else
     {
-        ChipLogError(Zcl,  "AddProgressElement %u -progress list is already at maximum size %u", 
+        ChipLogError(Zcl,  "AddProgressElement %u -progress list is already at maximum size %u",
                      newProgressElement.locationID, (uint32_t)kMaxNumProgressElements);
     }
 
     return ret_value;
 }
 
-bool RvcServiceAreaDelegate::ModifyProgressElement(uint32_t listIndex, const Structs::ProgressStruct::Type & modifiedProgressElement) 
+bool RvcServiceAreaDelegate::ModifyProgressElement(uint32_t listIndex, const Structs::ProgressStruct::Type & modifiedProgressElement)
 {
     bool ret_value = false;
 
     // TODO
 
-    return ret_value; 
+    return ret_value;
 }
 
 bool RvcServiceAreaDelegate::ClearProgress()

src/app/clusters/service-area-server/service-area-cluster-objects.h

@@ -41,7 +41,7 @@ struct LocationStructureWrapper : public chip::app::Clusters::ServiceArea::Struc
      */
     LocationStructureWrapper()
     {
-        Set(0, 0, 
+        Set(0, 0,
              CharSpan(), DataModel::Nullable<int16_t>(), DataModel::Nullable<AreaTypeTag>(),
              DataModel::Nullable<LandmarkTag>(), DataModel::Nullable<PositionTag>(), DataModel::Nullable<FloorSurfaceTag>());
     }
@@ -56,37 +56,37 @@ struct LocationStructureWrapper : public chip::app::Clusters::ServiceArea::Struc
      * @param[in] aLandmarkTag A common namespace Landmark tag - indicates an association of the location with a home landmark.
      * @param[in] aPositionTag A common namespace Position tag - indicates the position of the location with respect to the landmark.
      * @param[in] aSurfaceTag A common namespace Floor Surface tag - indicates an association of the location with a surface type.
-     * 
+     *
      * @note Requirements regarding what combinations of fields and values are valid are not checked by this class.
      * @note If aLocationName is larger than kLocationNameMaxSize, it will be truncated.
      * @note If aLocationName is an empty string and aFloorNumber and aAreaTypeTag are null, locationInfo will be set to null.
      */
-    LocationStructureWrapper( uint32_t                                     aLocationId, 
-                              const DataModel::Nullable<uint8_t>         & aMapId, 
+    LocationStructureWrapper( uint32_t                                     aLocationId,
+                              const DataModel::Nullable<uint8_t>         & aMapId,
                               const CharSpan                             & aLocationName,
                               const DataModel::Nullable<int16_t>         & aFloorNumber,
                               const DataModel::Nullable<AreaTypeTag>     & aAreaTypeTag,
                               const DataModel::Nullable<LandmarkTag>     & aLandmarkTag,
                               const DataModel::Nullable<PositionTag>     & aPositionTag,
                               const DataModel::Nullable<FloorSurfaceTag> & aSurfaceTag  )
     {
-        Set( aLocationId, aMapId, 
-             aLocationName, aFloorNumber, aAreaTypeTag, 
+        Set( aLocationId, aMapId,
+             aLocationName, aFloorNumber, aAreaTypeTag,
              aLandmarkTag, aPositionTag, aSurfaceTag);
     }
 
     /**
      * @brief This is a copy constructor that initializes the location object with the values from another location object. All values are deep copied.
      * @param[in] aOther The location object to copy.
-     * 
+     *
      * @note If the locationName is empty string and aFloorNumber and aAreaTypeTag are null, locationInfo will be set to null.
      */
     LocationStructureWrapper(const LocationStructureWrapper & aOther) { *this = aOther; }
 
     /**
      * @brief This is an assignment operator that initializes the location object with the values from another location object. All values are deep copied.
      * @param[in] aOther The location object to copy.
-     * 
+     *
      * @note If the locationName is empty string and aFloorNumber and aAreaTypeTag are null, locationInfo will be set to null.
      */
     LocationStructureWrapper & operator=(const LocationStructureWrapper & aOther)
@@ -122,8 +122,8 @@ struct LocationStructureWrapper : public chip::app::Clusters::ServiceArea::Struc
      * @note If aLocationName is larger than kLocationNameMaxSize, it will be truncated.
      * @note If aLocationName is an empty string and aFloorNumber and aAreaTypeTag are null, locationInfo will be set to null.
      */
-    void Set( uint32_t                                     aLocationId, 
-              const DataModel::Nullable<uint8_t>         & aMapId, 
+    void Set( uint32_t                                     aLocationId,
+              const DataModel::Nullable<uint8_t>         & aMapId,
               const CharSpan                             & aLocationName,
               const DataModel::Nullable<int16_t>         & aFloorNumber,
               const DataModel::Nullable<AreaTypeTag>     & aAreaType,
@@ -149,7 +149,7 @@ struct LocationStructureWrapper : public chip::app::Clusters::ServiceArea::Struc
         {
             locationInfo.locationInfo.SetNull();
         }
-                                                                         
+
         locationInfo.landmarkTag   = aLandmarkTag;
         locationInfo.positionTag   = aPositionTag;
         locationInfo.surfaceTag    = aSurfaceTag;
@@ -185,7 +185,7 @@ struct LocationStructureWrapper : public chip::app::Clusters::ServiceArea::Struc
      * @brief Compare the location's name with the given text.
      * @param[in] aLocationName The name to compare.
      * @return true if the location structure's name field matches aLocationName.
-     * 
+     *
      * @note if locations structure's name field is null, returns false.
      */
     bool DoesNameMatch(const CharSpan & aLocationName) const
@@ -253,7 +253,7 @@ struct LocationStructureWrapper : public chip::app::Clusters::ServiceArea::Struc
     /**
      * @brief Get the location name (for logging).
      * @return The map name as a c style char string.
-     * 
+     *
      * @note This is only available through the LocationStructure object (no access from base structure).
      */
     const char* name_c_str() const
@@ -285,7 +285,7 @@ struct MapStructureWrapper : public chip::app::Clusters::ServiceArea::Structs::M
      * @brief This is a full constructor that initializes the map object with the given values. All values are deep copied.
      * @param[in] aMapId The identifier of this map.
      * @param[in] aMapName A human readable name (should not be empty string).
-     * 
+     *
      * @note Requirements regarding what combinations of fields and values are 'valid' are not checked by this class.
      * @note If aMapName is larger than kMapNameMaxSize, it will be truncated.
      */
@@ -318,7 +318,7 @@ struct MapStructureWrapper : public chip::app::Clusters::ServiceArea::Structs::M
      * @note Requirements regarding what combinations of fields and values are 'valid' are not checked by this class.
      * @note if aMapName is larger than kMapNameMaxSize, it will be truncated.
      */
-    void Set( uint8_t aMapId, 
+    void Set( uint8_t aMapId,
               const CharSpan & aMapName)
     {
         mapID = aMapId;
@@ -359,7 +359,7 @@ struct MapStructureWrapper : public chip::app::Clusters::ServiceArea::Structs::M
     /**
      * @brief Get the map name (for logging).
      * @return The map name as a c style char string.
-     * 
+     *
      * @note This is only available through the MapStructure object (no access from base structure).
      */
     const char* name_c_str() const