diff options
| author | Ira Lytvynenko (GitHub) <ILytvynenko@luxoft.com> | 2018-03-22 14:54:44 +0200 |
|---|---|---|
| committer | Ira Lytvynenko (GitHub) <ILytvynenko@luxoft.com> | 2018-06-26 12:01:44 +0300 |
| commit | 8ad3ac6a5c1560e1f07516d81d99e711b3e2ee6f (patch) | |
| tree | ddac040495b2efa3c7d0d392682d27af883c58b5 /src/components/application_manager/src/commands | |
| parent | 20cfb81a16fe9569ad21be03108223610d913126 (diff) | |
| download | sdl_core-8ad3ac6a5c1560e1f07516d81d99e711b3e2ee6f.tar.gz | |
Fixes after rebase
Diffstat (limited to 'src/components/application_manager/src/commands')
4 files changed, 8 insertions, 10 deletions
diff --git a/src/components/application_manager/src/commands/notification_from_hmi.cc b/src/components/application_manager/src/commands/notification_from_hmi.cc index 481535d7aa..1fef383213 100644 --- a/src/components/application_manager/src/commands/notification_from_hmi.cc +++ b/src/components/application_manager/src/commands/notification_from_hmi.cc @@ -40,7 +40,7 @@ namespace application_manager { namespace commands { NotificationFromHMI::NotificationFromHMI( - const application_manager::commands::MessageSharedPtr& message, + const MessageSharedPtr& message, ApplicationManager& application_manager, rpc_service::RPCService& rpc_service, HMICapabilities& hmi_capabilities, @@ -67,7 +67,7 @@ bool NotificationFromHMI::CleanUp() { void NotificationFromHMI::Run() {} void NotificationFromHMI::SendNotificationToMobile( - const application_manager::commands::MessageSharedPtr& message) { + const MessageSharedPtr& message) { (*message)[strings::params][strings::message_type] = static_cast<int32_t>(application_manager::MessageType::kNotification); rpc_service_.ManageMobileCommand(message, SOURCE_SDL); diff --git a/src/components/application_manager/src/commands/notification_to_hmi.cc b/src/components/application_manager/src/commands/notification_to_hmi.cc index 5e38207686..2e5f54e950 100644 --- a/src/components/application_manager/src/commands/notification_to_hmi.cc +++ b/src/components/application_manager/src/commands/notification_to_hmi.cc @@ -39,7 +39,7 @@ namespace application_manager { namespace commands { NotificationToHMI::NotificationToHMI( - const application_manager::commands::MessageSharedPtr& message, + const MessageSharedPtr& message, ApplicationManager& application_manager, rpc_service::RPCService& rpc_service, HMICapabilities& hmi_capabilities, diff --git a/src/components/application_manager/src/commands/response_from_hmi.cc b/src/components/application_manager/src/commands/response_from_hmi.cc index c158052b89..6e6761586b 100644 --- a/src/components/application_manager/src/commands/response_from_hmi.cc +++ b/src/components/application_manager/src/commands/response_from_hmi.cc @@ -34,13 +34,12 @@ #include "application_manager/rpc_service.h" #include "smart_objects/smart_object.h" -namespace sdl_rpc_plugin { -using namespace application_manager; +namespace application_manager { namespace commands { ResponseFromHMI::ResponseFromHMI( - const application_manager::commands::MessageSharedPtr& message, + const MessageSharedPtr& message, ApplicationManager& application_manager, rpc_service::RPCService& rpc_service, HMICapabilities& hmi_capabilities, @@ -73,7 +72,7 @@ bool ResponseFromHMI::CleanUp() { void ResponseFromHMI::Run() {} void ResponseFromHMI::SendResponseToMobile( - const application_manager::commands::MessageSharedPtr& message, + const MessageSharedPtr& message, ApplicationManager& application_manager) { (*message)[strings::params][strings::message_type] = MessageType::kResponse; diff --git a/src/components/application_manager/src/commands/response_to_hmi.cc b/src/components/application_manager/src/commands/response_to_hmi.cc index 7aeddf28e5..7c297c56b0 100644 --- a/src/components/application_manager/src/commands/response_to_hmi.cc +++ b/src/components/application_manager/src/commands/response_to_hmi.cc @@ -34,13 +34,12 @@ #include "application_manager/application_manager.h" #include "application_manager/rpc_service.h" -namespace sdl_rpc_plugin { -using namespace application_manager; +namespace application_manager { namespace commands { ResponseToHMI::ResponseToHMI( - const application_manager::commands::MessageSharedPtr& message, + const MessageSharedPtr& message, ApplicationManager& application_manager, rpc_service::RPCService& rpc_service, HMICapabilities& hmi_capabilities, |