summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcollin <collin+i@collinmcqueen.com>2021-11-09 08:43:03 -0500
committercollin <collin+i@collinmcqueen.com>2021-11-09 08:43:03 -0500
commitec019298bc01709bd6ee926e9c6d76f0b7c08f66 (patch)
treeb930cd436f240fc98af25a3e99fadd123632a158
parentfd9f32016537e628ac6a9667b882c7c9fe04a9f0 (diff)
downloadsdl_core-fix/lang_change_invalid_iter.tar.gz
simplify code copying applicationsetfix/lang_change_invalid_iter
-rw-r--r--src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_language_change_notification.cc8
-rw-r--r--src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_language_change_notification.cc8
-rw-r--r--src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_language_change_notification.cc8
3 files changed, 3 insertions, 21 deletions
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_language_change_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_language_change_notification.cc
index 533740e193..51df69d0bc 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_language_change_notification.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_language_change_notification.cc
@@ -88,13 +88,7 @@ void OnTTSLanguageChangeNotification::Run() {
(*message_)[strings::params][strings::function_id] =
static_cast<int32_t>(mobile_apis::FunctionID::OnLanguageChangeID);
- ApplicationSet apps;
-
- {
- const ApplicationSet& accessor =
- application_manager_.applications().GetData();
- apps = ApplicationSet(accessor);
- }
+ auto apps = ApplicationSet(application_manager_.applications().GetData());
auto message_language =
(*message_)[strings::msg_params][strings::language].asInt();
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_language_change_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_language_change_notification.cc
index f0826e0612..8da7da28e7 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_language_change_notification.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_language_change_notification.cc
@@ -80,13 +80,7 @@ void OnUILanguageChangeNotification::Run() {
(*message_)[strings::params][strings::function_id] =
static_cast<int32_t>(mobile_apis::FunctionID::OnLanguageChangeID);
- ApplicationSet apps;
-
- {
- const ApplicationSet& accessor =
- application_manager_.applications().GetData();
- apps = ApplicationSet(accessor);
- }
+ auto apps = ApplicationSet(application_manager_.applications().GetData());
auto message_language =
(*message_)[strings::msg_params][strings::hmi_display_language].asInt();
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_language_change_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_language_change_notification.cc
index 062ec62623..9cb4653548 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_language_change_notification.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_language_change_notification.cc
@@ -78,13 +78,7 @@ void OnVRLanguageChangeNotification::Run() {
(*message_)[strings::params][strings::function_id] =
static_cast<int32_t>(mobile_apis::FunctionID::OnLanguageChangeID);
- ApplicationSet apps;
-
- {
- const ApplicationSet& accessor =
- application_manager_.applications().GetData();
- apps = ApplicationSet(accessor);
- }
+ auto apps = ApplicationSet(application_manager_.applications().GetData());
auto message_language =
(*message_)[strings::msg_params][strings::language].asInt();