diff options
author | Conlain Kelly <conlain.k@gmail.com> | 2018-08-09 13:33:15 -0400 |
---|---|---|
committer | Conlain Kelly <conlain.k@gmail.com> | 2018-08-09 13:33:15 -0400 |
commit | a68ecb3ac7278e1cc0d6c425ad54527e5376d0ed (patch) | |
tree | 087c4b88faf97dfb453d008f2f504396a882200e /src | |
parent | c55471953afa6642b3cbc017c96570f5c854a61f (diff) | |
download | sdl_core-a68ecb3ac7278e1cc0d6c425ad54527e5376d0ed.tar.gz |
yet another style fix
Diffstat (limited to 'src')
7 files changed, 30 insertions, 22 deletions
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_system_request_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_system_request_notification.h index 8c6261700d..e00423c9a7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_system_request_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_system_request_notification.h @@ -74,18 +74,20 @@ class OnSystemRequestNotification void Run() OVERRIDE; private: - #if defined(PROPRIETARY_MODE) || defined(EXTERNAL_PROPRIETARY_MODE) -/** - * @brief Adds the full_app_id_supported to a string, allows attaching this flag to a PT snapshot - * @param policy_table_string PT snapshot string - * @param useFullAppID what to set full_app_id_supported to in the snapshot -\ */ -void AttachFullAppIdSupport(std::string& policy_table_string, bool useFullAppID) const; -#endif + /** + * @brief Adds the full_app_id_supported to a string, allows attaching this + flag to a PT snapshot + * @param policy_table_string PT snapshot string + * @param useFullAppID what to set full_app_id_supported to in the snapshot + \ */ + void AttachFullAppIdSupport(std::string& policy_table_string, + bool useFullAppID) const; +#endif #ifdef PROPRIETARY_MODE - /** + +/** * @brief Adds HTTP header to message * @param message Message * @param useFullAppID
\ No newline at end of file diff --git a/src/components/include/policy/policy_external/policy/policy_settings.h b/src/components/include/policy/policy_external/policy/policy_settings.h index ba287be7f9..7eca5129ad 100644 --- a/src/components/include/policy/policy_external/policy/policy_settings.h +++ b/src/components/include/policy/policy_external/policy/policy_settings.h @@ -30,7 +30,7 @@ class PolicySettings { * @return file path */ virtual const std::string& policies_snapshot_file_name() const = 0; - + virtual bool use_full_app_id() const = 0; /** diff --git a/src/components/include/policy/policy_regular/policy/policy_settings.h b/src/components/include/policy/policy_regular/policy/policy_settings.h index 756aeb653f..35a2d54c3a 100644 --- a/src/components/include/policy/policy_regular/policy/policy_settings.h +++ b/src/components/include/policy/policy_regular/policy/policy_settings.h @@ -35,7 +35,7 @@ class PolicySettings { * @brief Returns system files folder path */ virtual const std::string& system_files_path() const = 0; - + virtual bool use_full_app_id() const = 0; virtual ~PolicySettings() {} diff --git a/src/components/policy/policy_external/src/cache_manager.cc b/src/components/policy/policy_external/src/cache_manager.cc index e296dd8b00..5387a7700a 100644 --- a/src/components/policy/policy_external/src/cache_manager.cc +++ b/src/components/policy/policy_external/src/cache_manager.cc @@ -1516,8 +1516,9 @@ void CacheManager::CheckSnapshotInitialization() { } *(snapshot_->policy_table.module_config.preloaded_pt) = false; - - *(snapshot_->policy_table.module_config.full_app_id_supported) = settings_->use_full_app_id(); + + *(snapshot_->policy_table.module_config.full_app_id_supported) = + settings_->use_full_app_id(); // SDL must not send certificate in snapshot snapshot_->policy_table.module_config.certificate = diff --git a/src/components/policy/policy_external/src/policy_table/types.cc b/src/components/policy/policy_external/src/policy_table/types.cc index d13bbdf725..5922a020e6 100644 --- a/src/components/policy/policy_external/src/policy_table/types.cc +++ b/src/components/policy/policy_external/src/policy_table/types.cc @@ -570,7 +570,8 @@ ModuleConfig::ModuleConfig(const Json::Value* value__) , preloaded_date(impl::ValueMember(value__, "preloaded_date")) , certificate(impl::ValueMember(value__, "certificate")) , preloaded_pt(impl::ValueMember(value__, "preloaded_pt")) - , full_app_id_supported(impl::ValueMember(value__, "full_app_id_supported")) {} + , full_app_id_supported( + impl::ValueMember(value__, "full_app_id_supported")) {} void ModuleConfig::SafeCopyFrom(const ModuleConfig& from) { exchange_after_x_days = from.exchange_after_x_days; @@ -593,7 +594,8 @@ Json::Value ModuleConfig::ToJsonValue() const { Json::Value result__(Json::objectValue); impl::WriteJsonField("certificate", certificate, &result__); impl::WriteJsonField("preloaded_pt", preloaded_pt, &result__); - impl::WriteJsonField("full_app_id_supported", full_app_id_supported, &result__); + impl::WriteJsonField( + "full_app_id_supported", full_app_id_supported, &result__); impl::WriteJsonField("exchange_after_x_ignition_cycles", exchange_after_x_ignition_cycles, &result__); @@ -729,7 +731,8 @@ void ModuleConfig::ReportErrors(rpc::ValidationReport* report__) const { preloaded_pt.ReportErrors(&report__->ReportSubobject("preloaded_pt")); } if (!full_app_id_supported.is_valid()) { - full_app_id_supported.ReportErrors(&report__->ReportSubobject("full_app_id_supported")); + full_app_id_supported.ReportErrors( + &report__->ReportSubobject("full_app_id_supported")); } if (!exchange_after_x_ignition_cycles.is_valid()) { exchange_after_x_ignition_cycles.ReportErrors( diff --git a/src/components/policy/policy_regular/src/cache_manager.cc b/src/components/policy/policy_regular/src/cache_manager.cc index dace9bbbc7..092fd5b9a4 100644 --- a/src/components/policy/policy_regular/src/cache_manager.cc +++ b/src/components/policy/policy_regular/src/cache_manager.cc @@ -824,9 +824,9 @@ void CacheManager::CheckSnapshotInitialization() { } *(snapshot_->policy_table.module_config.preloaded_pt) = false; - - *(snapshot_->policy_table.module_config.full_app_id_supported) = settings_->use_full_app_id(); - + + *(snapshot_->policy_table.module_config.full_app_id_supported) = + settings_->use_full_app_id(); // SDL must not send certificate in snapshot snapshot_->policy_table.module_config.certificate = diff --git a/src/components/policy/policy_regular/src/policy_table/types.cc b/src/components/policy/policy_regular/src/policy_table/types.cc index 6e692ce7cb..851ed1bd18 100644 --- a/src/components/policy/policy_regular/src/policy_table/types.cc +++ b/src/components/policy/policy_regular/src/policy_table/types.cc @@ -495,7 +495,8 @@ void ModuleConfig::SafeCopyFrom(const ModuleConfig& from) { Json::Value ModuleConfig::ToJsonValue() const { Json::Value result__(Json::objectValue); impl::WriteJsonField("preloaded_pt", preloaded_pt, &result__); - impl::WriteJsonField("full_app_id_supported", full_app_id_supported, &result__); + impl::WriteJsonField( + "full_app_id_supported", full_app_id_supported, &result__); impl::WriteJsonField("exchange_after_x_ignition_cycles", exchange_after_x_ignition_cycles, &result__); @@ -572,7 +573,7 @@ bool ModuleConfig::is_initialized() const { bool ModuleConfig::struct_empty() const { if (preloaded_pt.is_initialized()) { return false; - } + } if (full_app_id_supported.is_initialized()) { return false; } @@ -626,7 +627,8 @@ void ModuleConfig::ReportErrors(rpc::ValidationReport* report__) const { preloaded_pt.ReportErrors(&report__->ReportSubobject("preloaded_pt")); } if (!full_app_id_supported.is_valid()) { - full_app_id_supported.ReportErrors(&report__->ReportSubobject("full_app_id_supported")); + full_app_id_supported.ReportErrors( + &report__->ReportSubobject("full_app_id_supported")); } if (!exchange_after_x_ignition_cycles.is_valid()) { exchange_after_x_ignition_cycles.ReportErrors( |