diff options
author | agaliuzov <agaliuzov@luxoft.com> | 2016-05-15 05:43:18 -0700 |
---|---|---|
committer | agaliuzov <agaliuzov@luxoft.com> | 2016-05-15 07:32:01 -0700 |
commit | d2aa2f5ba839ab016708d298292428063d6fd5ea (patch) | |
tree | 9679e68946690e289eb25a7b58e76c40077d610d /src/components/formatters/include | |
parent | 8b853ebe626d5500b8e832f5f48cf26f0919de88 (diff) | |
parent | be8feae0e11c59e20f8c9b08c32f7f64937e0ee4 (diff) | |
download | sdl_core-d2aa2f5ba839ab016708d298292428063d6fd5ea.tar.gz |
Merge branch 'master' into develop
Diffstat (limited to 'src/components/formatters/include')
-rw-r--r-- | src/components/formatters/include/formatters/CSmartFactory.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/components/formatters/include/formatters/CSmartFactory.h b/src/components/formatters/include/formatters/CSmartFactory.h index 7cefabaa74..55f9a30385 100644 --- a/src/components/formatters/include/formatters/CSmartFactory.h +++ b/src/components/formatters/include/formatters/CSmartFactory.h @@ -149,9 +149,13 @@ namespace NsSmartDeviceLink * * @param object SmartObject to attach schema for. * + * @param RemoveFakeParameters contains true if need + * to remove fake parameters from smart object otherwise contains false. + * * @return True if operation was successful or false otherwise. */ - bool attachSchema(NsSmartDeviceLink::NsSmartObjects::SmartObject& object); + bool attachSchema(NsSmartDeviceLink::NsSmartObjects::SmartObject& object, + const bool RemoveFakeParameters); /** * @brief Attach schema to the struct SmartObject. @@ -275,7 +279,9 @@ namespace NsSmartDeviceLink } template <class FunctionIdEnum, class MessageTypeEnum, class StructIdEnum> - bool CSmartFactory<FunctionIdEnum, MessageTypeEnum, StructIdEnum>::attachSchema(NsSmartDeviceLink::NsSmartObjects::SmartObject &object) + bool CSmartFactory<FunctionIdEnum, MessageTypeEnum, StructIdEnum>:: + attachSchema(NsSmartDeviceLink::NsSmartObjects::SmartObject &object, + const bool RemoveFakeParameters) { if(false == object.keyExists(strings::S_PARAMS)) return false; if(false == object[strings::S_PARAMS].keyExists(strings::S_MESSAGE_TYPE)) return false; @@ -295,7 +301,7 @@ namespace NsSmartDeviceLink } object.setSchema(schemaIterator->second); - schemaIterator->second.applySchema(object); + schemaIterator->second.applySchema(object, RemoveFakeParameters); return true; } @@ -315,7 +321,7 @@ namespace NsSmartDeviceLink } object.setSchema(structs_iterator->second); - structs_iterator->second.applySchema(object); + structs_iterator->second.applySchema(object, false); return true; } @@ -338,7 +344,7 @@ namespace NsSmartDeviceLink NsSmartDeviceLink::NsSmartObjects::SmartObject function_object( NsSmartDeviceLink::NsSmartObjects::SmartType_Map); function_object.setSchema(schema_iterator->second); - schema_iterator->second.applySchema(function_object); + schema_iterator->second.applySchema(function_object, false); return function_object; } |