diff options
Diffstat (limited to 'src')
729 files changed, 4867 insertions, 3581 deletions
diff --git a/src/appMain/CMakeLists.txt b/src/appMain/CMakeLists.txt index 06738713bd..072f326a9b 100644 --- a/src/appMain/CMakeLists.txt +++ b/src/appMain/CMakeLists.txt @@ -112,13 +112,6 @@ set(LIBRARIES SystemTimeLibrary ) -if(REMOTE_CONTROL) - SET (LIBRARIES - ${LIBRARIES} - FunctionalModule - ) -endif(REMOTE_CONTROL) - if (CMAKE_SYSTEM_NAME STREQUAL "Linux") list(APPEND LIBRARIES pthread) list(APPEND LIBRARIES dl) diff --git a/src/appMain/life_cycle.h b/src/appMain/life_cycle.h index e37da3fa1d..154f427d98 100644 --- a/src/appMain/life_cycle.h +++ b/src/appMain/life_cycle.h @@ -48,7 +48,6 @@ #include "application_manager/application_manager_impl.h" #ifdef SDL_REMOTE_CONTROL #include "application_manager/core_service.h" -#include "functional_module/plugin_manager.h" #endif // SDL_REMOTE_CONTROL #include "connection_handler/connection_handler_impl.h" #include "protocol_handler/protocol_handler_impl.h" diff --git a/src/appMain/smartDeviceLink.ini b/src/appMain/smartDeviceLink.ini index e128bc1a2e..c0c1d78449 100644 --- a/src/appMain/smartDeviceLink.ini +++ b/src/appMain/smartDeviceLink.ini @@ -27,7 +27,7 @@ VideoStreamingPort = 5050 AudioStreamingPort = 5080 [MAIN] -; SDL source version +; SDL source version ; represents as a git commit hash value SDLVersion = {GIT_COMMIT} ; All logging event could be dropped by setting $LogsEnabled to false @@ -86,7 +86,7 @@ TimeTestingPort = 8090 ReadDIDRequest = 5, 1 ; Limitation for a number of GetVehicleData requests (the 1st value) per (the 2nd value) seconds GetVehicleDataRequest = 5, 1 -PluginFolder = plugins +PluginFolder = ./ ; The time used during switch transport procedure AppTransportChangeTimer = 500 @@ -144,7 +144,7 @@ DeleteFileRequest = 5 ListFilesRequest = 5 [VR COMMANDS] -; TODO(EZamakhov): delete with APPLINK-15220 +; TODO(EZamakhov): delete with APPLINK-15220 HelpCommand = Help [AppInfo] @@ -169,7 +169,7 @@ CACertificatePath = . ; Services which can not be started unprotected (could be id's from 0x01 to 0xFF) ;ForceProtectedService = 0x0A, 0x0B ForceProtectedService = Non -; Services which can not be started protected or delayed protected +; Services which can not be started protected or delayed protected ;ForceUnprotectedService = 0x07 ForceUnprotectedService = Non ; The PTU will be triggered in case expiration date of certificate @@ -232,16 +232,16 @@ AppIconsAmountToRemove = 1 [SDL5] ; Section for features added in protocol version 5 -; Control service packet with payload bigger than this value will be marked as a malformed, +; Control service packet with payload bigger than this value will be marked as a malformed, ; if not specified, this value will default to MaxPayloadSize ;MaximumControlPayloadSize = 131072 -; RPC service packet with payload bigger than this value will be marked as a malformed, +; RPC service packet with payload bigger than this value will be marked as a malformed, ; if not specified, this value will default to MaxPayloadSize ;MaximumRpcPayloadSize = 131072 -; Audio service packet with payload bigger than this value will be marked as a malformed, +; Audio service packet with payload bigger than this value will be marked as a malformed, ; if not specified, this value will default to MaxPayloadSize ;MaximumAudioPayloadSize = 131072 -; Video service packet with payloadbigger than this value will be marked as a malformed, +; Video service packet with payloadbigger than this value will be marked as a malformed, ; if not specified, this value will default to MaxPayloadSize ;MaximumVideoPayloadSize = 131072 @@ -275,5 +275,5 @@ RemoveBundleIDattempts = 3 MaxNumberOfiOSDevice = 10 ; time in milliseconds started after request to launch the first app. after either expires or the first app registers SDL requests to launch the second app. WaitTimeBetweenApps = 4000 -; App Launch on iOS devices SDL feature enabler/disabler +; App Launch on iOS devices SDL feature enabler/disabler EnableAppLaunchIOS = true diff --git a/src/components/application_manager/CMakeLists.txt b/src/components/application_manager/CMakeLists.txt index 52304b19a7..b3af800987 100644 --- a/src/components/application_manager/CMakeLists.txt +++ b/src/components/application_manager/CMakeLists.txt @@ -156,12 +156,6 @@ set(LIBRARIES emhashmap -L${EMHASHMAP_LIBS_DIRECTORY} ) -if(REMOTE_CONTROL) - SET (LIBRARIES - ${LIBRARIES} - FunctionalModule - ) -endif(REMOTE_CONTROL) if (CMAKE_SYSTEM_NAME STREQUAL "Linux") list(APPEND LIBRARIES sqlite3) diff --git a/src/components/application_manager/include/application_manager/commands/request_from_hmi.h b/src/components/application_manager/include/application_manager/commands/request_from_hmi.h index 628d3257d9..e9242c9fcf 100644 --- a/src/components/application_manager/include/application_manager/commands/request_from_hmi.h +++ b/src/components/application_manager/include/application_manager/commands/request_from_hmi.h @@ -30,8 +30,8 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_REQUEST_FROM_HMI_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_REQUEST_FROM_HMI_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_REQUEST_FROM_HMI_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_REQUEST_FROM_HMI_H_ #include "application_manager/commands/command_impl.h" #include "interfaces/HMI_API.h" @@ -94,4 +94,4 @@ class RequestFromHMI : public CommandImpl, public event_engine::EventObserver { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_REQUEST_FROM_HMI_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_REQUEST_FROM_HMI_H_ diff --git a/src/components/application_manager/include/application_manager/commands/request_to_hmi.h b/src/components/application_manager/include/application_manager/commands/request_to_hmi.h index b30044fd26..ecefafbb3e 100644 --- a/src/components/application_manager/include/application_manager/commands/request_to_hmi.h +++ b/src/components/application_manager/include/application_manager/commands/request_to_hmi.h @@ -30,8 +30,8 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_REQUEST_TO_HMI_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_REQUEST_TO_HMI_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_REQUEST_TO_HMI_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_REQUEST_TO_HMI_H_ #include "application_manager/commands/command_impl.h" #include "application_manager/application_manager.h" @@ -86,4 +86,4 @@ class RequestToHMI : public CommandImpl { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_REQUEST_TO_HMI_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_REQUEST_TO_HMI_H_ diff --git a/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin.h b/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin.h index 2ca4a08688..3690dfbb4e 100644 --- a/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin.h +++ b/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin.h @@ -25,7 +25,6 @@ enum ApplicationEvent { kApplicationExit = 0, kApplicationUnregistered }; class RPCPlugin { public: - // TODO : pass all required components for plugin virtual bool Init(ApplicationManager& app_manager, rpc_service::RPCService& rpc_service, HMICapabilities& hmi_capabilities, diff --git a/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin_manager_impl.h b/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin_manager_impl.h index 278b648554..72cd8c1c74 100644 --- a/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin_manager_impl.h +++ b/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin_manager_impl.h @@ -1,13 +1,23 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_PLUGIN_MANAGER_RPC_PLUGIN_MANAGER_IMPL_H #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_PLUGIN_MANAGER_RPC_PLUGIN_MANAGER_IMPL_H #include "application_manager/plugin_manager/rpc_plugin_manager.h" +#include "application_manager/application_manager.h" +#include "application_manager/rpc_service.h" +#include "application_manager/hmi_capabilities.h" +#include "application_manager/policies/policy_handler_interface.h" #include "utils/optional.h" + namespace application_manager { namespace plugin_manager { class RPCPluginManagerImpl : public RPCPluginManager { // RPCPluginManager interface public: + RPCPluginManagerImpl(ApplicationManager& app_manager, + rpc_service::RPCService& rpc_service, + HMICapabilities& hmi_capabilities, + policy::PolicyHandlerInterface& policy_handler); + uint32_t LoadPlugins(const std::string& plugins_path) OVERRIDE; std::vector<RPCPluginPtr>& GetPlugins() OVERRIDE; utils::Optional<RPCPlugin> FindPluginToProcess( @@ -16,6 +26,10 @@ class RPCPluginManagerImpl : public RPCPluginManager { private: std::vector<RPCPluginPtr> loaded_plugins_; + ApplicationManager& app_manager_; + rpc_service::RPCService& rpc_service_; + HMICapabilities& hmi_capabilities_; + policy::PolicyHandlerInterface& policy_handler_; }; } // namespace plugin_manager } // namespace application_manager diff --git a/src/components/application_manager/include/application_manager/rpc_service_impl.h b/src/components/application_manager/include/application_manager/rpc_service_impl.h index 847e11669c..bb01912873 100644 --- a/src/components/application_manager/include/application_manager/rpc_service_impl.h +++ b/src/components/application_manager/include/application_manager/rpc_service_impl.h @@ -112,6 +112,9 @@ class RPCServiceImpl : public RPCService, bool final_message = false) OVERRIDE; void SendMessageToHMI(const commands::MessageSharedPtr message) OVERRIDE; + void set_protocol_handler( + protocol_handler::ProtocolHandler* handler) OVERRIDE; + #ifdef SDL_REMOTE_CONTROL void SendPostMessageToMobile(const MessagePtr& message) OVERRIDE; void SendPostMessageToHMI(const MessagePtr& message) OVERRIDE; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/CMakeLists.txt b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/CMakeLists.txt index 730634722d..d367b03136 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/CMakeLists.txt +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/CMakeLists.txt @@ -49,6 +49,7 @@ collect_sources(RPC_PLUGIN_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src") set(LIBRARIES HMI_API MOBILE_API + ApplicationManager v4_protocol_v1_2_no_extra SmartObjects Utils @@ -61,6 +62,15 @@ endif() add_library("sdl_rpc_plugin" SHARED ${MOBILE_COMMANDS} ${HMI_COMMANDS} ${RPC_PLUGIN_SOURCES}) target_link_libraries("sdl_rpc_plugin" ${LIBRARIES}) +set(INSTALL_DESTINATION bin) + +install(TARGETS sdl_rpc_plugin + DESTINATION ${INSTALL_DESTINATION} + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE + GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE +) + if(BUILD_TESTS) add_subdirectory(test) endif() diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/activate_app_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/activate_app_request.h index df5347124b..3676c38c9e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/activate_app_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/activate_app_request.h @@ -30,27 +30,28 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ACTIVATE_APP_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ACTIVATE_APP_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ACTIVATE_APP_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ACTIVATE_APP_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief ActivateAppRequest command class **/ -class ActivateAppRequest : public RequestToHMI { +class ActivateAppRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief ActivateAppRequest class constructor * * @param message Incoming SmartObject message **/ - ActivateAppRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + ActivateAppRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief ActivateAppRequest class destructor @@ -70,4 +71,4 @@ class ActivateAppRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ACTIVATE_APP_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ACTIVATE_APP_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/activate_app_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/activate_app_response.h index ca8115c141..00cc91f1cd 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/activate_app_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/activate_app_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ACTIVATE_APP_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ACTIVATE_APP_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ACTIVATE_APP_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ACTIVATE_APP_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class ActivateAppResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - ActivateAppResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + ActivateAppResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief ActivateAppResponse class destructor @@ -70,4 +71,4 @@ class ActivateAppResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ACTIVATE_APP_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ACTIVATE_APP_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/add_statistics_info_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/add_statistics_info_notification.h index 5744e771ba..def47f3a92 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/add_statistics_info_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/add_statistics_info_notification.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ADD_STATISTICS_INFO_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ADD_STATISTICS_INFO_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ADD_STATISTICS_INFO_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ADD_STATISTICS_INFO_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class AddStatisticsInfoNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - AddStatisticsInfoNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + AddStatisticsInfoNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief AddStatisticsInfoNotification class destructor @@ -70,4 +72,4 @@ class AddStatisticsInfoNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ADD_STATISTICS_INFO_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ADD_STATISTICS_INFO_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_all_apps_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_all_apps_request.h index 0e2acec3db..913c791efb 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_all_apps_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_all_apps_request.h @@ -30,27 +30,28 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ALLOW_ALL_APPS_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ALLOW_ALL_APPS_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ALLOW_ALL_APPS_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ALLOW_ALL_APPS_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief AllowAllAppsRequest command class **/ -class AllowAllAppsRequest : public RequestToHMI { +class AllowAllAppsRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief AllowAllAppsRequest class constructor * * @param message Incoming SmartObject message **/ - AllowAllAppsRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + AllowAllAppsRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief AllowAllAppsRequest class destructor @@ -70,4 +71,4 @@ class AllowAllAppsRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ALLOW_ALL_APPS_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ALLOW_ALL_APPS_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_all_apps_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_all_apps_response.h index 6854ab91a9..cdc58983d8 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_all_apps_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_all_apps_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ALLOW_ALL_APPS_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ALLOW_ALL_APPS_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ALLOW_ALL_APPS_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ALLOW_ALL_APPS_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class AllowAllAppsResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - AllowAllAppsResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + AllowAllAppsResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief AllowAllAppsResponse class destructor @@ -70,4 +71,4 @@ class AllowAllAppsResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ALLOW_ALL_APPS_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ALLOW_ALL_APPS_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_app_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_app_request.h index 4312f01e9c..51cd05a1ed 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_app_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_app_request.h @@ -30,27 +30,28 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ALLOW_APP_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ALLOW_APP_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ALLOW_APP_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ALLOW_APP_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief AllowAppRequest command class **/ -class AllowAppRequest : public RequestToHMI { +class AllowAppRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief AllowAppRequest class constructor * * @param message Incoming SmartObject message **/ - AllowAppRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + AllowAppRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief AllowAppRequest class destructor @@ -70,4 +71,4 @@ class AllowAppRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ALLOW_APP_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ALLOW_APP_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_app_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_app_response.h index 7667860106..ffeb06d61b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_app_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_app_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ALLOW_APP_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ALLOW_APP_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ALLOW_APP_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ALLOW_APP_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class AllowAppResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - AllowAppResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + AllowAppResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief AllowAppResponse class destructor @@ -70,4 +71,4 @@ class AllowAppResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ALLOW_APP_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ALLOW_APP_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_on_awake_sdl.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_on_awake_sdl.h index 919433ad18..679f5df2a8 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_on_awake_sdl.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_on_awake_sdl.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_BASIC_COMMUNICATION_ON_AWAKE_SDL_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_BASIC_COMMUNICATION_ON_AWAKE_SDL_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_BASIC_COMMUNICATION_ON_AWAKE_SDL_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_BASIC_COMMUNICATION_ON_AWAKE_SDL_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class OnAwakeSDLNotification : public NotificationFromHMI { * @param message Incoming SmartObject message * @param application_manager reference to ApplicationManager instance **/ - OnAwakeSDLNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnAwakeSDLNotification(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnAwakeSDLNotification class destructor @@ -70,4 +71,4 @@ class OnAwakeSDLNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_BASIC_COMMUNICATION_ON_AWAKE_SDL_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_BASIC_COMMUNICATION_ON_AWAKE_SDL_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_system_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_system_request.h index 1bf86d9af8..65578feefc 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_system_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_system_request.h @@ -30,27 +30,30 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_BASIC_COMMUNICATION_SYSTEM_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_BASIC_COMMUNICATION_SYSTEM_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_BASIC_COMMUNICATION_SYSTEM_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_BASIC_COMMUNICATION_SYSTEM_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief BasicCommunicationSystemRequest command class **/ -class BasicCommunicationSystemRequest : public RequestToHMI { +class BasicCommunicationSystemRequest + : public app_mngr::commands::RequestToHMI { public: /** * @brief BasicCommunicationSystemRequest class constructor * * @param message Incoming SmartObject message **/ - BasicCommunicationSystemRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + BasicCommunicationSystemRequest( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief BasicCommunicationSystemRequest class destructor @@ -70,4 +73,4 @@ class BasicCommunicationSystemRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_BASIC_COMMUNICATION_SYSTEM_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_BASIC_COMMUNICATION_SYSTEM_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_system_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_system_response.h index 72035f46ff..5d18445369 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_system_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_system_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_BASIC_COMMUNICATION_SYSTEM_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_BASIC_COMMUNICATION_SYSTEM_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_BASIC_COMMUNICATION_SYSTEM_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_BASIC_COMMUNICATION_SYSTEM_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class BasicCommunicationSystemResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - BasicCommunicationSystemResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + BasicCommunicationSystemResponse( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief BasicCommunicationSystemResponse class destructor @@ -70,4 +72,4 @@ class BasicCommunicationSystemResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_BASIC_COMMUNICATION_SYSTEM_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_BASIC_COMMUNICATION_SYSTEM_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/button_get_capabilities_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/button_get_capabilities_request.h index 140498df06..469beb4d53 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/button_get_capabilities_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/button_get_capabilities_request.h @@ -30,27 +30,29 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_BUTTON_GET_CAPABILITIES_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_BUTTON_GET_CAPABILITIES_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_BUTTON_GET_CAPABILITIES_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_BUTTON_GET_CAPABILITIES_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief ButtonGetCapabilitiesRequest command class **/ -class ButtonGetCapabilitiesRequest : public RequestToHMI { +class ButtonGetCapabilitiesRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief ButtonGetCapabilitiesRequest class constructor * * @param message Incoming SmartObject message **/ - ButtonGetCapabilitiesRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + ButtonGetCapabilitiesRequest( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief ButtonGetCapabilitiesRequest class destructor @@ -70,4 +72,4 @@ class ButtonGetCapabilitiesRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_BUTTON_GET_CAPABILITIES_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_BUTTON_GET_CAPABILITIES_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/button_get_capabilities_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/button_get_capabilities_response.h index 639bf0a295..91c85c543f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/button_get_capabilities_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/button_get_capabilities_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_BUTTON_GET_CAPABILITIES_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_BUTTON_GET_CAPABILITIES_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_BUTTON_GET_CAPABILITIES_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_BUTTON_GET_CAPABILITIES_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class ButtonGetCapabilitiesResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - ButtonGetCapabilitiesResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + ButtonGetCapabilitiesResponse( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief ButtonGetCapabilitiesResponse class destructor @@ -70,4 +72,4 @@ class ButtonGetCapabilitiesResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_BUTTON_GET_CAPABILITIES_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_BUTTON_GET_CAPABILITIES_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/close_popup_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/close_popup_request.h index 6af0483cde..7f4a820867 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/close_popup_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/close_popup_request.h @@ -30,27 +30,28 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_CLOSE_POPUP_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_CLOSE_POPUP_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_CLOSE_POPUP_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_CLOSE_POPUP_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief ClosePopupRequest command class **/ -class ClosePopupRequest : public RequestToHMI { +class ClosePopupRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief ClosePopupRequest class constructor * * @param message Incoming SmartObject message **/ - ClosePopupRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + ClosePopupRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief ClosePopupRequest class destructor @@ -70,4 +71,4 @@ class ClosePopupRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_CLOSE_POPUP_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_CLOSE_POPUP_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/close_popup_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/close_popup_response.h index e3dff1eff6..1b3bdb6ef9 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/close_popup_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/close_popup_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_CLOSE_POPUP_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_CLOSE_POPUP_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_CLOSE_POPUP_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_CLOSE_POPUP_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class ClosePopupResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - ClosePopupResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + ClosePopupResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief ClosePopupResponse class destructor @@ -70,4 +71,4 @@ class ClosePopupResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_CLOSE_POPUP_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_CLOSE_POPUP_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/decrypt_certificate_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/decrypt_certificate_request.h index fec98060bf..2eb5671938 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/decrypt_certificate_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/decrypt_certificate_request.h @@ -30,27 +30,28 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_DECRYPT_CERTIFICATE_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_DECRYPT_CERTIFICATE_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_DECRYPT_CERTIFICATE_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_DECRYPT_CERTIFICATE_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief DecryptCertificateRequest command class **/ -class DecryptCertificateRequest : public RequestToHMI { +class DecryptCertificateRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief DecryptCertificateRequest class constructor * * @param message Incoming SmartObject message **/ - DecryptCertificateRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + DecryptCertificateRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief Execute command @@ -65,4 +66,4 @@ class DecryptCertificateRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_DECRYPT_CERTIFICATE_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_DECRYPT_CERTIFICATE_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/decrypt_certificate_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/decrypt_certificate_response.h index 921f50d5f7..cfb8162f4d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/decrypt_certificate_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/decrypt_certificate_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_DECRYPT_CERTIFICATE_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_DECRYPT_CERTIFICATE_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_DECRYPT_CERTIFICATE_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_DECRYPT_CERTIFICATE_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class DecryptCertificateResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - DecryptCertificateResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + DecryptCertificateResponse( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief DecryptCertificateResponse class destructor @@ -70,4 +72,4 @@ class DecryptCertificateResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_DECRYPT_CERTIFICATE_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_DECRYPT_CERTIFICATE_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/dial_number_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/dial_number_request.h index adcb852063..ecbd52bade 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/dial_number_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/dial_number_request.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_DIAL_NUMBER_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_DIAL_NUMBER_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_DIAL_NUMBER_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_DIAL_NUMBER_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -43,15 +44,15 @@ namespace hmi { /** * @brief DialNumberRequest command class **/ -class DialNumberRequest : public RequestToHMI { +class DialNumberRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief DialNumberRequest class constructor * * @param message Incoming SmartObject message **/ - DialNumberRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + DialNumberRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief DialNumberRequest class destructor @@ -73,4 +74,4 @@ class DialNumberRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_DIAL_NUMBER_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_DIAL_NUMBER_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/dial_number_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/dial_number_response.h index 5fbfd0560c..6702c17753 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/dial_number_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/dial_number_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_DIAL_NUMBER_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_DIAL_NUMBER_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_DIAL_NUMBER_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_DIAL_NUMBER_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -51,8 +52,8 @@ class DialNumberResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - DialNumberResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + DialNumberResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief DialNumberResponse class destructor @@ -74,4 +75,4 @@ class DialNumberResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_DIAL_NUMBER_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_DIAL_NUMBER_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_system_info_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_system_info_request.h index 95847f4f85..5d4ccd9125 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_system_info_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_system_info_request.h @@ -30,27 +30,28 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_GET_SYSTEM_INFO_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_GET_SYSTEM_INFO_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_GET_SYSTEM_INFO_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_GET_SYSTEM_INFO_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief GetSystemInfoRequest command class **/ -class GetSystemInfoRequest : public RequestToHMI { +class GetSystemInfoRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief GetSystemInfoRequest class constructor * * @param message Incoming SmartObject message **/ - GetSystemInfoRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + GetSystemInfoRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief GetSystemInfoRequest class destructor @@ -70,4 +71,4 @@ class GetSystemInfoRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_GET_SYSTEM_INFO_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_GET_SYSTEM_INFO_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_system_info_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_system_info_response.h index 410089a53b..eb3556df69 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_system_info_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_system_info_response.h @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_GET_SYSTEM_INFO_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_GET_SYSTEM_INFO_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_GET_SYSTEM_INFO_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_GET_SYSTEM_INFO_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -56,8 +57,8 @@ class GetSystemInfoResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - GetSystemInfoResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + GetSystemInfoResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief GetSystemInfoResponse class destructor @@ -80,4 +81,4 @@ class GetSystemInfoResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_GET_SYSTEM_INFO_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_GET_SYSTEM_INFO_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_urls.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_urls.h index b3d367d66f..d76e2788c8 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_urls.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_urls.h @@ -30,27 +30,28 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_GET_URLS_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_GET_URLS_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_GET_URLS_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_GET_URLS_H_ #include "application_manager/commands/request_from_hmi.h" #include "policy/policy_types.h" #include "smart_objects/smart_object.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief GetUrls command class **/ -class GetUrls : public RequestFromHMI { +class GetUrls : public app_mngr::commands::RequestFromHMI { public: /** * @brief GetUrls class constructor * * @param message Incoming SmartObject message **/ - GetUrls(const MessageSharedPtr& message, - ApplicationManager& application_manager); + GetUrls(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief GetUrls class destructor @@ -89,4 +90,4 @@ class GetUrls : public RequestFromHMI { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_GET_URLS_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_GET_URLS_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_urls_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_urls_response.h index 2b7f006ee1..870aa544e0 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_urls_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_urls_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_GET_URLS_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_GET_URLS_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_GET_URLS_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_GET_URLS_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_to_hmi.h" +#include "application_manager/commands/response_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { class GetUrlsResponse : public ResponseToHMI { @@ -45,8 +46,8 @@ class GetUrlsResponse : public ResponseToHMI { * * @param message Incoming SmartObject message **/ - GetUrlsResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + GetUrlsResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief GetUrlsResponse class destructor @@ -65,4 +66,4 @@ class GetUrlsResponse : public ResponseToHMI { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_GET_URLS_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_GET_URLS_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/mixing_audio_supported_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/mixing_audio_supported_request.h index fa90b81fd6..ca1b2209bc 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/mixing_audio_supported_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/mixing_audio_supported_request.h @@ -30,27 +30,29 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_MIXING_AUDIO_SUPPORTED_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_MIXING_AUDIO_SUPPORTED_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_MIXING_AUDIO_SUPPORTED_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_MIXING_AUDIO_SUPPORTED_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief MixingAudioSupportedRequest command class **/ -class MixingAudioSupportedRequest : public RequestToHMI { +class MixingAudioSupportedRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief MixingAudioSupportedRequest class constructor * * @param message Incoming SmartObject message **/ - MixingAudioSupportedRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + MixingAudioSupportedRequest( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief MixingAudioSupportedRequest class destructor @@ -70,4 +72,4 @@ class MixingAudioSupportedRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_MIXING_AUDIO_SUPPORTED_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_MIXING_AUDIO_SUPPORTED_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/mixing_audio_supported_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/mixing_audio_supported_response.h index a841718628..289378882b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/mixing_audio_supported_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/mixing_audio_supported_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_MIXING_AUDIO_SUPPORTED_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_MIXING_AUDIO_SUPPORTED_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_MIXING_AUDIO_SUPPORTED_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_MIXING_AUDIO_SUPPORTED_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class MixingAudioSupportedResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - MixingAudioSupportedResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + MixingAudioSupportedResponse( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief MixingAudioSupportedResponse class destructor @@ -70,4 +72,4 @@ class MixingAudioSupportedResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_MIXING_AUDIO_SUPPORTED_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_MIXING_AUDIO_SUPPORTED_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_alert_maneuver_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_alert_maneuver_request.h index e6e32318df..1318769578 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_alert_maneuver_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_alert_maneuver_request.h @@ -30,27 +30,28 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_ALERT_MANEUVER_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_ALERT_MANEUVER_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_ALERT_MANEUVER_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_ALERT_MANEUVER_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief NaviAlertManeuverRequest command class **/ -class NaviAlertManeuverRequest : public RequestToHMI { +class NaviAlertManeuverRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief NaviAlertManeuverRequest class constructor * * @param message Incoming SmartObject message **/ - NaviAlertManeuverRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + NaviAlertManeuverRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief NaviAlertManeuverRequest class destructor @@ -70,4 +71,4 @@ class NaviAlertManeuverRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_ALERT_MANEUVER_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_ALERT_MANEUVER_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_alert_maneuver_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_alert_maneuver_response.h index 3abd9153b8..4b9458c815 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_alert_maneuver_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_alert_maneuver_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_ALERT_MANEUVER_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_ALERT_MANEUVER_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_ALERT_MANEUVER_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_ALERT_MANEUVER_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class NaviAlertManeuverResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - NaviAlertManeuverResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + NaviAlertManeuverResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief NaviAlertManeuverResponse class destructor @@ -70,4 +71,4 @@ class NaviAlertManeuverResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_ALERT_MANEUVER_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_ALERT_MANEUVER_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_start_stream_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_start_stream_request.h index 5bf9a90101..27b89c84b9 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_start_stream_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_start_stream_request.h @@ -30,28 +30,29 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_AUDIO_START_STREAM_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_AUDIO_START_STREAM_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_AUDIO_START_STREAM_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_AUDIO_START_STREAM_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief AudioStartStreamRequest command class **/ -class AudioStartStreamRequest : public RequestToHMI, - public event_engine::EventObserver { +class AudioStartStreamRequest : public app_mngr::commands::RequestToHMI, + public app_mngr::event_engine::EventObserver { public: /** * @brief AudioStartStreamRequest class constructor * * @param message Incoming SmartObject message **/ - AudioStartStreamRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + AudioStartStreamRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnNaviStartStreamRequest class destructor @@ -71,7 +72,7 @@ class AudioStartStreamRequest : public RequestToHMI, /** * @brief On event callback **/ - virtual void on_event(const event_engine::Event& event); + virtual void on_event(const app_mngr::event_engine::Event& event); /** * @brief RetryStartSession resend HMI startSession request if needed. @@ -88,4 +89,4 @@ class AudioStartStreamRequest : public RequestToHMI, } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_AUDIO_START_STREAM_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_AUDIO_START_STREAM_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_start_stream_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_start_stream_response.h index ff85217f8d..d5dad29711 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_start_stream_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_start_stream_response.h @@ -29,12 +29,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_AUDIO_START_STREAM_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_AUDIO_START_STREAM_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_AUDIO_START_STREAM_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_AUDIO_START_STREAM_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -48,8 +49,8 @@ class AudioStartStreamResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - AudioStartStreamResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + AudioStartStreamResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief AudioStartStreamResponse class destructor @@ -69,4 +70,4 @@ class AudioStartStreamResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_AUDIO_START_STREAM_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_AUDIO_START_STREAM_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_stop_stream_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_stop_stream_request.h index 15e03ec634..f98663fe97 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_stop_stream_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_stop_stream_request.h @@ -29,27 +29,28 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_AUDIO_STOP_STREAM_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_AUDIO_STOP_STREAM_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_AUDIO_STOP_STREAM_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_AUDIO_STOP_STREAM_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief AudioStopStreamRequest command class **/ -class AudioStopStreamRequest : public RequestToHMI { +class AudioStopStreamRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief AudioStopStreamRequest class constructor * * @param message Incoming SmartObject message **/ - AudioStopStreamRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + AudioStopStreamRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief NaviStopStreamRequest class destructor @@ -69,4 +70,4 @@ class AudioStopStreamRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_AUDIO_STOP_STREAM_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_AUDIO_STOP_STREAM_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_stop_stream_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_stop_stream_response.h index 562a92a165..ed2473199d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_stop_stream_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_stop_stream_response.h @@ -29,12 +29,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_AUDIO_STOP_STREAM_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_AUDIO_STOP_STREAM_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_AUDIO_STOP_STREAM_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_AUDIO_STOP_STREAM_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -48,8 +49,8 @@ class AudioStopStreamResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - AudioStopStreamResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + AudioStopStreamResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnNaviStopStreamResponse class destructor @@ -69,4 +70,4 @@ class AudioStopStreamResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_AUDIO_STOP_STREAM_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_AUDIO_STOP_STREAM_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_get_way_points_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_get_way_points_request.h index a6f30bff6d..bce4cd5e1e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_get_way_points_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_get_way_points_request.h @@ -30,27 +30,28 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_GET_WAY_POINTS_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_GET_WAY_POINTS_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_GET_WAY_POINTS_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_GET_WAY_POINTS_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief NaviGetWayPointsRequest command class **/ -class NaviGetWayPointsRequest : public RequestToHMI { +class NaviGetWayPointsRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief NaviGetWayPointsRequest class constructor * * @param message Incoming SmartObject message **/ - NaviGetWayPointsRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + NaviGetWayPointsRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief NaviGetWayPointsRequest class destructor **/ @@ -68,4 +69,4 @@ class NaviGetWayPointsRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_GET_WAY_POINTS_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_GET_WAY_POINTS_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_get_way_points_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_get_way_points_response.h index ee717eabfe..a5ae3b96c3 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_get_way_points_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_get_way_points_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_GET_WAY_POINTS_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_GET_WAY_POINTS_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_GET_WAY_POINTS_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_GET_WAY_POINTS_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class NaviGetWayPointsResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - NaviGetWayPointsResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + NaviGetWayPointsResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief NaviGetWaypoints class destructor @@ -70,4 +71,4 @@ class NaviGetWayPointsResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_GET_WAY_POINTS_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_GET_WAY_POINTS_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_is_ready_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_is_ready_request.h index 69ada6344d..84c0c21a96 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_is_ready_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_is_ready_request.h @@ -30,28 +30,29 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_IS_READY_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_IS_READY_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_IS_READY_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_IS_READY_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief NaviIsReadyRequest command class **/ -class NaviIsReadyRequest : public RequestToHMI, - public event_engine::EventObserver { +class NaviIsReadyRequest : public app_mngr::commands::RequestToHMI, + public app_mngr::event_engine::EventObserver { public: /** * @brief NaviIsReadyRequest class constructor * * @param message Incoming SmartObject message **/ - NaviIsReadyRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + NaviIsReadyRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief NaviIsReadyRequest class destructor @@ -66,7 +67,7 @@ class NaviIsReadyRequest : public RequestToHMI, /** * @brief On event callback **/ - void on_event(const event_engine::Event& event) OVERRIDE; + void on_event(const app_mngr::event_engine::Event& event) OVERRIDE; private: DISALLOW_COPY_AND_ASSIGN(NaviIsReadyRequest); @@ -76,4 +77,4 @@ class NaviIsReadyRequest : public RequestToHMI, } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_IS_READY_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_IS_READY_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_is_ready_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_is_ready_response.h index c4c1dd9878..daf398fb20 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_is_ready_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_is_ready_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_IS_READY_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_IS_READY_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_IS_READY_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_IS_READY_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class NaviIsReadyResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - NaviIsReadyResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + NaviIsReadyResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief NaviIsReadyResponse class destructor @@ -70,4 +71,4 @@ class NaviIsReadyResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_IS_READY_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_IS_READY_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_send_location_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_send_location_request.h index b716498b14..3a4b8d10ec 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_send_location_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_send_location_request.h @@ -30,27 +30,28 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_SEND_LOCATION_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_SEND_LOCATION_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_SEND_LOCATION_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_SEND_LOCATION_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief NaviSendLocationRequest command class */ -class NaviSendLocationRequest : public RequestToHMI { +class NaviSendLocationRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief NaviSendLocationRequest class constructor * * @param message Incoming SmartObject message */ - NaviSendLocationRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + NaviSendLocationRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief NaviSendLocationRequest class destructor @@ -70,4 +71,4 @@ class NaviSendLocationRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_SEND_LOCATION_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_SEND_LOCATION_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_send_location_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_send_location_response.h index d028116457..9de94ec616 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_send_location_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_send_location_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_SEND_LOCATION_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_SEND_LOCATION_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_SEND_LOCATION_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_SEND_LOCATION_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class NaviSendLocationResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message */ - NaviSendLocationResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + NaviSendLocationResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief NaviSendLocationResponse class destructor @@ -70,4 +71,4 @@ class NaviSendLocationResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_SEND_LOCATION_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_SEND_LOCATION_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_set_video_config_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_set_video_config_request.h index bd76237106..c448c26e6f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_set_video_config_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_set_video_config_request.h @@ -30,20 +30,21 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_SET_VIDEO_CONFIG_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_SET_VIDEO_CONFIG_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_SET_VIDEO_CONFIG_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_SET_VIDEO_CONFIG_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief NaviSetVideoConfigRequest command class **/ -class NaviSetVideoConfigRequest : public RequestToHMI, - public event_engine::EventObserver { +class NaviSetVideoConfigRequest : public app_mngr::commands::RequestToHMI, + public app_mngr::event_engine::EventObserver { public: /** * @brief NaviSetVideoConfigRequest class constructor @@ -51,8 +52,8 @@ class NaviSetVideoConfigRequest : public RequestToHMI, * @param message Incoming SmartObject message * @param application_manager Reference of application manager **/ - NaviSetVideoConfigRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + NaviSetVideoConfigRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief NaviSetVideoConfigRequest class destructor @@ -67,7 +68,7 @@ class NaviSetVideoConfigRequest : public RequestToHMI, /** * @brief On event callback **/ - void on_event(const event_engine::Event& event) OVERRIDE; + void on_event(const app_mngr::event_engine::Event& event) OVERRIDE; /** * @brief onTimeOut callback @@ -82,4 +83,4 @@ class NaviSetVideoConfigRequest : public RequestToHMI, } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_SET_VIDEO_CONFIG_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_SET_VIDEO_CONFIG_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_set_video_config_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_set_video_config_response.h index 248cb4d6fc..1a27b2f1d0 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_set_video_config_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_set_video_config_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_SET_VIDEO_CONFIG_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_SET_VIDEO_CONFIG_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_SET_VIDEO_CONFIG_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_SET_VIDEO_CONFIG_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -50,8 +51,9 @@ class NaviSetVideoConfigResponse : public ResponseFromHMI { * @param message Incoming SmartObject message * @param application_manager Reference of application manager **/ - NaviSetVideoConfigResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + NaviSetVideoConfigResponse( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief NaviSetVideoConfigResponse class destructor @@ -71,4 +73,4 @@ class NaviSetVideoConfigResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_SET_VIDEO_CONFIG_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_SET_VIDEO_CONFIG_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_show_constant_tbt_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_show_constant_tbt_request.h index 63cc0c0b82..ce1d69d034 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_show_constant_tbt_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_show_constant_tbt_request.h @@ -30,27 +30,29 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_SHOW_CONSTANT_TBT_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_SHOW_CONSTANT_TBT_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_SHOW_CONSTANT_TBT_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_SHOW_CONSTANT_TBT_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief NaviShowConstantTBTRequest command class **/ -class NaviShowConstantTBTRequest : public RequestToHMI { +class NaviShowConstantTBTRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief NaviShowConstantTBTRequest class constructor * * @param message Incoming SmartObject message **/ - NaviShowConstantTBTRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + NaviShowConstantTBTRequest( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief NaviShowConstantTBTRequest class destructor @@ -70,4 +72,4 @@ class NaviShowConstantTBTRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_SHOW_CONSTANT_TBT_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_SHOW_CONSTANT_TBT_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_show_constant_tbt_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_show_constant_tbt_response.h index 6116cfb5f9..3ee0201838 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_show_constant_tbt_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_show_constant_tbt_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_SHOW_CONSTANT_TBT_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_SHOW_CONSTANT_TBT_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_SHOW_CONSTANT_TBT_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_SHOW_CONSTANT_TBT_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class NaviShowConstantTBTResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - NaviShowConstantTBTResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + NaviShowConstantTBTResponse( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief NaviShowConstantTBTResponse class destructor @@ -70,4 +72,4 @@ class NaviShowConstantTBTResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_SHOW_CONSTANT_TBT_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_SHOW_CONSTANT_TBT_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_start_stream_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_start_stream_request.h index d95871ea24..2f601435e4 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_start_stream_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_start_stream_request.h @@ -30,28 +30,29 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_START_STREAM_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_START_STREAM_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_START_STREAM_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_START_STREAM_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief NaviStartStreamRequest command class **/ -class NaviStartStreamRequest : public RequestToHMI, - public event_engine::EventObserver { +class NaviStartStreamRequest : public app_mngr::commands::RequestToHMI, + public app_mngr::event_engine::EventObserver { public: /** * @brief NaviStartStreamRequest class constructor * * @param message Incoming SmartObject message **/ - NaviStartStreamRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + NaviStartStreamRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnNaviStartStreamRequest class destructor @@ -66,7 +67,7 @@ class NaviStartStreamRequest : public RequestToHMI, /** * @brief On event callback **/ - virtual void on_event(const event_engine::Event& event); + virtual void on_event(const app_mngr::event_engine::Event& event); /** * @brief onTimeOut from requrst Controller @@ -88,4 +89,4 @@ class NaviStartStreamRequest : public RequestToHMI, } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_START_STREAM_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_START_STREAM_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_start_stream_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_start_stream_response.h index 139d9029d5..9e35e6a314 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_start_stream_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_start_stream_response.h @@ -29,12 +29,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_START_STREAM_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_START_STREAM_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_START_STREAM_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_START_STREAM_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -48,8 +49,8 @@ class NaviStartStreamResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - NaviStartStreamResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + NaviStartStreamResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief NaviStartStreamResponse class destructor @@ -69,4 +70,4 @@ class NaviStartStreamResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_START_STREAM_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_START_STREAM_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_stop_stream_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_stop_stream_request.h index 3d90e35fdc..4468c29957 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_stop_stream_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_stop_stream_request.h @@ -29,27 +29,28 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_STOP_STREAM_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_STOP_STREAM_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_STOP_STREAM_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_STOP_STREAM_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief NaviStopStreamRequest command class **/ -class NaviStopStreamRequest : public RequestToHMI { +class NaviStopStreamRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief NaviStopStreamRequest class constructor * * @param message Incoming SmartObject message **/ - NaviStopStreamRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + NaviStopStreamRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief NaviStopStreamRequest class destructor @@ -69,4 +70,4 @@ class NaviStopStreamRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_STOP_STREAM_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_STOP_STREAM_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_stop_stream_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_stop_stream_response.h index 202761ff6f..60464208fd 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_stop_stream_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_stop_stream_response.h @@ -29,12 +29,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_STOP_STREAM_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_STOP_STREAM_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_STOP_STREAM_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_STOP_STREAM_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -48,8 +49,8 @@ class NaviStopStreamResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - NaviStopStreamResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + NaviStopStreamResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnNaviStopStreamResponse class destructor @@ -69,4 +70,4 @@ class NaviStopStreamResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_STOP_STREAM_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_STOP_STREAM_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_subscribe_way_points_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_subscribe_way_points_request.h index d255ab897e..4c1791e3fa 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_subscribe_way_points_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_subscribe_way_points_request.h @@ -30,27 +30,29 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_SUBSCRIBE_WAY_POINTS_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_SUBSCRIBE_WAY_POINTS_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_SUBSCRIBE_WAY_POINTS_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_SUBSCRIBE_WAY_POINTS_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief NaviSubscribeWayPointsRequest command class **/ -class NaviSubscribeWayPointsRequest : public RequestToHMI { +class NaviSubscribeWayPointsRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief NaviSubscribeWayPointsRequest class constructor * * @param message Incoming SmartObject message **/ - NaviSubscribeWayPointsRequest(const MessageSharedPtr& messag, - ApplicationManager& application_manager); + NaviSubscribeWayPointsRequest( + const app_mngr::commands::MessageSharedPtr& messag, + app_mngr::ApplicationManager& application_manager); /** * @brief NaviSubscribeWayPointsRequest class destructor **/ @@ -68,4 +70,4 @@ class NaviSubscribeWayPointsRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_SUBSCRIBE_WAY_POINTS_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_SUBSCRIBE_WAY_POINTS_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_subscribe_way_points_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_subscribe_way_points_response.h index ac1e2407f4..aaa798cc7f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_subscribe_way_points_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_subscribe_way_points_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_SUBSCRIBE_WAY_POINTS_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_SUBSCRIBE_WAY_POINTS_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_SUBSCRIBE_WAY_POINTS_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_SUBSCRIBE_WAY_POINTS_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class NaviSubscribeWayPointsResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - NaviSubscribeWayPointsResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + NaviSubscribeWayPointsResponse( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief NaviSubscribeWaypoints class destructor @@ -70,4 +72,4 @@ class NaviSubscribeWayPointsResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_SUBSCRIBE_WAY_POINTS_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_SUBSCRIBE_WAY_POINTS_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_unsubscribe_way_points_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_unsubscribe_way_points_request.h index 9e10918f2e..21d3784ee5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_unsubscribe_way_points_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_unsubscribe_way_points_request.h @@ -30,27 +30,30 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_UNSUBSCRIBE_WAY_POINTS_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_UNSUBSCRIBE_WAY_POINTS_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_UNSUBSCRIBE_WAY_POINTS_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_UNSUBSCRIBE_WAY_POINTS_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief NaviSubscribeWayPointsRequest command class **/ -class NaviUnSubscribeWayPointsRequest : public RequestToHMI { +class NaviUnSubscribeWayPointsRequest + : public app_mngr::commands::RequestToHMI { public: /** * @brief NaviUnSubscribeWayPointsRequest class constructor * * @param message Incoming SmartObject message **/ - NaviUnSubscribeWayPointsRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + NaviUnSubscribeWayPointsRequest( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief NaviUnSubscribeWayPointsRequest class destructor **/ @@ -68,4 +71,4 @@ class NaviUnSubscribeWayPointsRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_UNSUBSCRIBE_WAY_POINTS_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_UNSUBSCRIBE_WAY_POINTS_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_unsubscribe_way_points_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_unsubscribe_way_points_response.h index 9f8965004e..cfc842f8e4 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_unsubscribe_way_points_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_unsubscribe_way_points_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_UNSUBSCRIBE_WAY_POINTS_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_UNSUBSCRIBE_WAY_POINTS_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_UNSUBSCRIBE_WAY_POINTS_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_UNSUBSCRIBE_WAY_POINTS_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class NaviUnsubscribeWayPointsResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - NaviUnsubscribeWayPointsResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + NaviUnsubscribeWayPointsResponse( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief NaviUnSubscribeWaypoints class destructor @@ -69,4 +71,4 @@ class NaviUnsubscribeWayPointsResponse : public ResponseFromHMI { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_UNSUBSCRIBE_WAY_POINTS_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_UNSUBSCRIBE_WAY_POINTS_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_update_turn_list_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_update_turn_list_request.h index bbb1149c64..0188b87418 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_update_turn_list_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_update_turn_list_request.h @@ -30,27 +30,28 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_UPDATE_TURN_LIST_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_UPDATE_TURN_LIST_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_UPDATE_TURN_LIST_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_UPDATE_TURN_LIST_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief NaviUpdateTurnListRequest command class **/ -class NaviUpdateTurnListRequest : public RequestToHMI { +class NaviUpdateTurnListRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief NaviUpdateTurnListRequest class constructor * * @param message Incoming SmartObject message **/ - NaviUpdateTurnListRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + NaviUpdateTurnListRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief NaviUpdateTurnListRequest class destructor @@ -70,4 +71,4 @@ class NaviUpdateTurnListRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_UPDATE_TURN_LIST_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_UPDATE_TURN_LIST_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_update_turn_list_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_update_turn_list_response.h index b927514cad..7170fe7fde 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_update_turn_list_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_update_turn_list_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_UPDATE_TURN_LIST_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_UPDATE_TURN_LIST_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_UPDATE_TURN_LIST_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_UPDATE_TURN_LIST_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class NaviUpdateTurnListResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - NaviUpdateTurnListResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + NaviUpdateTurnListResponse( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief NaviUpdateTurnListResponse class destructor @@ -70,4 +72,4 @@ class NaviUpdateTurnListResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_UPDATE_TURN_LIST_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_UPDATE_TURN_LIST_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/notification_from_hmi.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/notification_from_hmi.h index ccf3e6d7f3..6f8bf3a76b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/notification_from_hmi.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/notification_from_hmi.h @@ -30,26 +30,28 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NOTIFICATION_FROM_HMI_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NOTIFICATION_FROM_HMI_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NOTIFICATION_FROM_HMI_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NOTIFICATION_FROM_HMI_H_ #include "application_manager/commands/command_impl.h" #include "interfaces/HMI_API.h" #include "smart_objects/smart_object.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { -class NotificationFromHMI : public CommandImpl { +class NotificationFromHMI : public app_mngr::commands::CommandImpl { public: - NotificationFromHMI(const MessageSharedPtr& message, - ApplicationManager& application_manager); + NotificationFromHMI(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); virtual ~NotificationFromHMI(); virtual bool Init(); virtual bool CleanUp(); virtual void Run(); - void SendNotificationToMobile(const MessageSharedPtr& message); + void SendNotificationToMobile( + const app_mngr::commands::MessageSharedPtr& message); void CreateHMIRequest(const hmi_apis::FunctionID::eType& function_id, const smart_objects::SmartObject& msg_params) const; @@ -61,4 +63,4 @@ class NotificationFromHMI : public CommandImpl { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NOTIFICATION_FROM_HMI_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NOTIFICATION_FROM_HMI_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/notification_to_hmi.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/notification_to_hmi.h index dd2db8804a..3f59ae6234 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/notification_to_hmi.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/notification_to_hmi.h @@ -30,19 +30,20 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NOTIFICATION_TO_HMI_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NOTIFICATION_TO_HMI_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NOTIFICATION_TO_HMI_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NOTIFICATION_TO_HMI_H_ #include "application_manager/commands/command_impl.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { -class NotificationToHMI : public CommandImpl { +class NotificationToHMI : public app_mngr::commands::CommandImpl { public: - NotificationToHMI(const MessageSharedPtr& message, - ApplicationManager& application_manager); + NotificationToHMI(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); virtual ~NotificationToHMI(); virtual bool Init(); virtual bool CleanUp(); @@ -57,4 +58,4 @@ class NotificationToHMI : public CommandImpl { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NOTIFICATION_TO_HMI_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NOTIFICATION_TO_HMI_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_allow_sdl_functionality_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_allow_sdl_functionality_notification.h index a85fc23531..c8693b09bc 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_allow_sdl_functionality_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_allow_sdl_functionality_notification.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_ALLOW_SDL_FUNCTIONALITY_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_ALLOW_SDL_FUNCTIONALITY_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_ALLOW_SDL_FUNCTIONALITY_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_ALLOW_SDL_FUNCTIONALITY_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class OnAllowSDLFunctionalityNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnAllowSDLFunctionalityNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnAllowSDLFunctionalityNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnAllowSDLFunctionalityNotification class destructor @@ -70,4 +72,4 @@ class OnAllowSDLFunctionalityNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_ALLOW_SDL_FUNCTIONALITY_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_ALLOW_SDL_FUNCTIONALITY_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_activated_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_activated_notification.h index 05a6192a08..ed810bd9b7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_activated_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_activated_notification.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_APP_ACTIVATED_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_APP_ACTIVATED_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_APP_ACTIVATED_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_APP_ACTIVATED_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class OnAppActivatedNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnAppActivatedNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnAppActivatedNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnAppActivatedNotification class destructor @@ -70,4 +72,4 @@ class OnAppActivatedNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_APP_ACTIVATED_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_APP_ACTIVATED_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_deactivated_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_deactivated_notification.h index cb4886e87a..5c7de717ec 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_deactivated_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_deactivated_notification.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_APP_DEACTIVATED_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_APP_DEACTIVATED_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_APP_DEACTIVATED_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_APP_DEACTIVATED_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class OnAppDeactivatedNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnAppDeactivatedNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnAppDeactivatedNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnAppDeactivatedNotification class destructor @@ -70,4 +72,4 @@ class OnAppDeactivatedNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_APP_DEACTIVATED_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_APP_DEACTIVATED_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_permission_changed_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_permission_changed_notification.h index 26160d1e8e..f55e539179 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_permission_changed_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_permission_changed_notification.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_APP_PERMISSION_CHANGED_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_APP_PERMISSION_CHANGED_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_APP_PERMISSION_CHANGED_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_APP_PERMISSION_CHANGED_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_to_hmi.h" +#include "application_manager/commands/notification_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class OnAppPermissionChangedNotification : public NotificationToHMI { * * @param message Incoming SmartObject message **/ - OnAppPermissionChangedNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnAppPermissionChangedNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnAppPermissionChangedNotification class destructor @@ -70,4 +72,4 @@ class OnAppPermissionChangedNotification : public NotificationToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_APP_PERMISSION_CHANGED_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_APP_PERMISSION_CHANGED_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_permission_consent_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_permission_consent_notification.h index 6282c5b508..02d4379e78 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_permission_consent_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_permission_consent_notification.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_APP_PERMISSION_CONSENT_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_APP_PERMISSION_CONSENT_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_APP_PERMISSION_CONSENT_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_APP_PERMISSION_CONSENT_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class OnAppPermissionConsentNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnAppPermissionConsentNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnAppPermissionConsentNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnAppPermissionConsentNotification class destructor @@ -70,4 +72,4 @@ class OnAppPermissionConsentNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_APP_PERMISSION_CONSENT_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_APP_PERMISSION_CONSENT_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_registered_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_registered_notification.h index e38b353683..98f5cc291a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_registered_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_registered_notification.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_APP_REGISTERED_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_APP_REGISTERED_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_APP_REGISTERED_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_APP_REGISTERED_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_to_hmi.h" +#include "application_manager/commands/notification_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class OnAppRegisteredNotification : public NotificationToHMI { * * @param message Incoming SmartObject message **/ - OnAppRegisteredNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnAppRegisteredNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnAppRegisteredNotification class destructor @@ -70,4 +72,4 @@ class OnAppRegisteredNotification : public NotificationToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_APP_REGISTERED_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_APP_REGISTERED_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_unregistered_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_unregistered_notification.h index 052cfa316a..ba3322080e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_unregistered_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_unregistered_notification.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_APP_UNREGISTERED_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_APP_UNREGISTERED_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_APP_UNREGISTERED_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_APP_UNREGISTERED_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_to_hmi.h" +#include "application_manager/commands/notification_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class OnAppUnregisteredNotification : public NotificationToHMI { * * @param message Incoming SmartObject message **/ - OnAppUnregisteredNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnAppUnregisteredNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnAppUnregisteredNotification class destructor @@ -80,4 +82,4 @@ class OnAppUnregisteredNotification : public NotificationToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_APP_UNREGISTERED_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_APP_UNREGISTERED_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_audio_data_streaming_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_audio_data_streaming_notification.h index 26f54cab12..b09b2e5b4d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_audio_data_streaming_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_audio_data_streaming_notification.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_AUDIO_DATA_STREAMING_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_AUDIO_DATA_STREAMING_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_AUDIO_DATA_STREAMING_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_AUDIO_DATA_STREAMING_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_to_hmi.h" +#include "application_manager/commands/notification_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class OnAudioDataStreamingNotification : public NotificationToHMI { * * @param message Incoming SmartObject message **/ - OnAudioDataStreamingNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnAudioDataStreamingNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnAudioDataStreamingNotification class destructor @@ -70,4 +72,4 @@ class OnAudioDataStreamingNotification : public NotificationToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_AUDIO_DATA_STREAMING_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_AUDIO_DATA_STREAMING_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_event_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_event_notification.h index 6ccef64dad..9c535c4593 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_event_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_event_notification.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_BUTTON_EVENT_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_BUTTON_EVENT_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_BUTTON_EVENT_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_BUTTON_EVENT_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; class Application; @@ -53,8 +54,8 @@ class OnButtonEventNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnButtonEventNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnButtonEventNotification(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief Execute command @@ -71,4 +72,4 @@ class OnButtonEventNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_BUTTON_EVENT_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_BUTTON_EVENT_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_press_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_press_notification.h index b9ce3dafb4..7222213769 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_press_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_press_notification.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_BUTTON_PRESS_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_BUTTON_PRESS_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_BUTTON_PRESS_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_BUTTON_PRESS_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; class Application; @@ -53,8 +54,8 @@ class OnButtonPressNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnButtonPressNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnButtonPressNotification(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief Execute command @@ -71,4 +72,4 @@ class OnButtonPressNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_BUTTON_PRESS_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_BUTTON_PRESS_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_subscription_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_subscription_notification.h index 40a566c6ea..6a80bdb92d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_subscription_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_subscription_notification.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_BUTTON_SUBSCRIPTION_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_BUTTON_SUBSCRIPTION_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_BUTTON_SUBSCRIPTION_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_BUTTON_SUBSCRIPTION_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_to_hmi.h" +#include "application_manager/commands/notification_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -51,8 +52,9 @@ class OnButtonSubscriptionNotification : public NotificationToHMI { * * @param message Incoming SmartObject message **/ - OnButtonSubscriptionNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnButtonSubscriptionNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnButtonSubscriptionNotification class destructor @@ -74,4 +76,4 @@ class OnButtonSubscriptionNotification : public NotificationToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_BUTTON_SUBSCRIPTION_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_BUTTON_SUBSCRIPTION_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_device_chosen_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_device_chosen_notification.h index 8eecaf9e0d..9b7c233b55 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_device_chosen_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_device_chosen_notification.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_DEVICE_CHOSEN_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_DEVICE_CHOSEN_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_DEVICE_CHOSEN_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_DEVICE_CHOSEN_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class OnDeviceChosenNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnDeviceChosenNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnDeviceChosenNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnDeviceChosenNotification class destructor @@ -70,4 +72,4 @@ class OnDeviceChosenNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_DEVICE_CHOSEN_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_DEVICE_CHOSEN_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_device_state_changed_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_device_state_changed_notification.h index 1fbd2d3feb..f2e55a29d6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_device_state_changed_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_device_state_changed_notification.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_DEVICE_STATE_CHANGED_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_DEVICE_STATE_CHANGED_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_DEVICE_STATE_CHANGED_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_DEVICE_STATE_CHANGED_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class OnDeviceStateChangedNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnDeviceStateChangedNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnDeviceStateChangedNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnDeviceStateChangedNotification class destructor @@ -70,4 +72,4 @@ class OnDeviceStateChangedNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_DEVICE_STATE_CHANGED_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_DEVICE_STATE_CHANGED_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_driver_distraction_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_driver_distraction_notification.h index 66fa285ccc..8ae67ebe60 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_driver_distraction_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_driver_distraction_notification.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_DRIVER_DISTRACTION_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_DRIVER_DISTRACTION_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_DRIVER_DISTRACTION_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_DRIVER_DISTRACTION_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; class Application; @@ -53,8 +54,9 @@ class OnDriverDistractionNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnDriverDistractionNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnDriverDistractionNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnDriverDistractionNotification class destructor @@ -76,4 +78,4 @@ class OnDriverDistractionNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_DRIVER_DISTRACTION_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_DRIVER_DISTRACTION_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_event_changed_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_event_changed_notification.h index 02fa2d95a7..d725e42468 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_event_changed_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_event_changed_notification.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_EVENT_CHANGED_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_EVENT_CHANGED_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_EVENT_CHANGED_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_EVENT_CHANGED_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class OnEventChangedNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnEventChangedNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnEventChangedNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnEventChangedNotification class destructor @@ -70,4 +72,4 @@ class OnEventChangedNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_EVENT_CHANGED_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_EVENT_CHANGED_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_exit_all_applications_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_exit_all_applications_notification.h index e5a4520771..91185b28dd 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_exit_all_applications_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_exit_all_applications_notification.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_EXIT_ALL_APPLICATIONS_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_EXIT_ALL_APPLICATIONS_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_EXIT_ALL_APPLICATIONS_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_EXIT_ALL_APPLICATIONS_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class OnExitAllApplicationsNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnExitAllApplicationsNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnExitAllApplicationsNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnExitAllApplicationsNotification class destructor @@ -75,4 +77,4 @@ class OnExitAllApplicationsNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_EXIT_ALL_APPLICATIONS_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_EXIT_ALL_APPLICATIONS_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_exit_application_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_exit_application_notification.h index e021df4762..52007fcb93 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_exit_application_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_exit_application_notification.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_EXIT_APPLICATION_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_EXIT_APPLICATION_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_EXIT_APPLICATION_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_EXIT_APPLICATION_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class OnExitApplicationNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnExitApplicationNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnExitApplicationNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnExitApplicationNotification class destructor @@ -70,4 +72,4 @@ class OnExitApplicationNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_EXIT_APPLICATION_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_EXIT_APPLICATION_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_file_removed_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_file_removed_notification.h index a688e1c103..31d4c47b70 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_file_removed_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_file_removed_notification.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_FILE_REMOVED_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_FILE_REMOVED_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_FILE_REMOVED_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_FILE_REMOVED_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_to_hmi.h" +#include "application_manager/commands/notification_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class OnFileRemovedNotification : public NotificationToHMI { * * @param message Incoming SmartObject message **/ - OnFileRemovedNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnFileRemovedNotification(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnFileRemovedNotification class destructor @@ -70,4 +71,4 @@ class OnFileRemovedNotification : public NotificationToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_FILE_REMOVED_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_FILE_REMOVED_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_find_applications.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_find_applications.h index c8e95996e7..7a78899285 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_find_applications.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_find_applications.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_FIND_APPLICATIONS_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_FIND_APPLICATIONS_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_FIND_APPLICATIONS_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_FIND_APPLICATIONS_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class OnFindApplications : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnFindApplications(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnFindApplications(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnFindApplications class destructor @@ -70,4 +71,4 @@ class OnFindApplications : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_FIND_APPLICATIONS_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_FIND_APPLICATIONS_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ignition_cycle_over_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ignition_cycle_over_notification.h index d42c09a539..1c589a44e2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ignition_cycle_over_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ignition_cycle_over_notification.h @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_IGNITION_CYCLE_OVER_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_IGNITION_CYCLE_OVER_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_IGNITION_CYCLE_OVER_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_IGNITION_CYCLE_OVER_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_impl.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -50,8 +51,9 @@ class OnIgnitionCycleOverNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnIgnitionCycleOverNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnIgnitionCycleOverNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnIgnitionCycleOverNotification class destructor @@ -71,4 +73,4 @@ class OnIgnitionCycleOverNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_IGNITION_CYCLE_OVER_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_IGNITION_CYCLE_OVER_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_navi_tbt_client_state_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_navi_tbt_client_state_notification.h index 888cc1931e..4f18301740 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_navi_tbt_client_state_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_navi_tbt_client_state_notification.h @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_NAVI_TBT_CLIENT_STATE_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_NAVI_TBT_CLIENT_STATE_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_NAVI_TBT_CLIENT_STATE_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_NAVI_TBT_CLIENT_STATE_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -50,8 +51,9 @@ class OnNaviTBTClientStateNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnNaviTBTClientStateNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnNaviTBTClientStateNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnNaviTBTClientStateNotification class destructor @@ -71,4 +73,4 @@ class OnNaviTBTClientStateNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_NAVI_TBT_CLIENT_STATE_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_NAVI_TBT_CLIENT_STATE_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_navi_way_point_change_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_navi_way_point_change_notification.h index 555f7060ab..b5b128bd9f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_navi_way_point_change_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_navi_way_point_change_notification.h @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_NAVI_WAY_POINT_CHANGE_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_NAVI_WAY_POINT_CHANGE_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_NAVI_WAY_POINT_CHANGE_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_NAVI_WAY_POINT_CHANGE_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -50,8 +51,9 @@ class OnNaviWayPointChangeNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnNaviWayPointChangeNotification(const MessageSharedPtr& message, - ApplicationManager& app_man); + OnNaviWayPointChangeNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& app_man); /** * @brief OnNaviWayPointChangeNotification class destructor @@ -70,4 +72,4 @@ class OnNaviWayPointChangeNotification : public NotificationFromHMI { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_NAVI_WAY_POINT_CHANGE_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_NAVI_WAY_POINT_CHANGE_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_policy_update.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_policy_update.h index 405e3715fb..46d31e0b7f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_policy_update.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_policy_update.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_POLICY_UPDATE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_POLICY_UPDATE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_POLICY_UPDATE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_POLICY_UPDATE_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { class OnPolicyUpdate : public NotificationFromHMI { @@ -45,8 +46,8 @@ class OnPolicyUpdate : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnPolicyUpdate(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnPolicyUpdate(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnPolicyUpdate class destructor @@ -64,4 +65,4 @@ class OnPolicyUpdate : public NotificationFromHMI { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_POLICY_UPDATE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_POLICY_UPDATE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_put_file_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_put_file_notification.h index 909309034f..312b890971 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_put_file_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_put_file_notification.h @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_PUT_FILE_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_PUT_FILE_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_PUT_FILE_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_PUT_FILE_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_to_hmi.h" +#include "application_manager/commands/notification_to_hmi.h" #include "application_manager/application_impl.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -50,8 +51,8 @@ class OnPutFileNotification : public NotificationToHMI { * * @param message Incoming SmartObject message **/ - OnPutFileNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnPutFileNotification(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnPutFileNotification class destructor @@ -71,4 +72,4 @@ class OnPutFileNotification : public NotificationToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_PUT_FILE_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_PUT_FILE_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ready_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ready_notification.h index 7a801216ff..ffeed1bb84 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ready_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ready_notification.h @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_READY_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_READY_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_READY_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_READY_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -50,8 +51,8 @@ class OnReadyNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnReadyNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnReadyNotification(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnReadyNotification class destructor @@ -71,4 +72,4 @@ class OnReadyNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_READY_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_READY_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_received_policy_update.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_received_policy_update.h index 10ad91e2ad..0fc82e29e9 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_received_policy_update.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_received_policy_update.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_RECEIVED_POLICY_UPDATE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_RECEIVED_POLICY_UPDATE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_RECEIVED_POLICY_UPDATE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_RECEIVED_POLICY_UPDATE_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -46,8 +47,8 @@ class OnReceivedPolicyUpdate : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnReceivedPolicyUpdate(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnReceivedPolicyUpdate(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnReceivedPolicyUpdate class destructor @@ -67,4 +68,4 @@ class OnReceivedPolicyUpdate : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_RECEIVED_POLICY_UPDATE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_RECEIVED_POLICY_UPDATE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_record_start_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_record_start_notification.h index afaa2f2821..15ae5c4120 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_record_start_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_record_start_notification.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_RECORD_START_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_RECORD_START_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_RECORD_START_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_RECORD_START_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_to_hmi.h" +#include "application_manager/commands/notification_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class OnRecordStartdNotification : public NotificationToHMI { * * @param message Incoming SmartObject message **/ - OnRecordStartdNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnRecordStartdNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnRecordStartdNotification class destructor @@ -70,4 +72,4 @@ class OnRecordStartdNotification : public NotificationToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_RECORD_START_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_RECORD_START_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_resume_audio_source_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_resume_audio_source_notification.h index 690bb2d820..86b0908350 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_resume_audio_source_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_resume_audio_source_notification.h @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_RESUME_AUDIO_SOURCE_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_RESUME_AUDIO_SOURCE_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_RESUME_AUDIO_SOURCE_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_RESUME_AUDIO_SOURCE_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_to_hmi.h" +#include "application_manager/commands/notification_to_hmi.h" #include "application_manager/application_impl.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -50,8 +51,9 @@ class OnResumeAudioSourceNotification : public NotificationToHMI { * * @param message Incoming SmartObject message **/ - OnResumeAudioSourceNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnResumeAudioSourceNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnResumeAudioSourceNotification class destructor @@ -71,4 +73,4 @@ class OnResumeAudioSourceNotification : public NotificationToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_RESUME_AUDIO_SOURCE_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_RESUME_AUDIO_SOURCE_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_close_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_close_notification.h index a55ca4bdb1..e95dfbafbf 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_close_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_close_notification.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_SDL_CLOSE_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_SDL_CLOSE_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_SDL_CLOSE_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_SDL_CLOSE_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_to_hmi.h" +#include "application_manager/commands/notification_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class OnSDLCloseNotification : public NotificationToHMI { * * @param message Incoming SmartObject message **/ - OnSDLCloseNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnSDLCloseNotification(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnSdlCloseNotification class destructor @@ -70,4 +71,4 @@ class OnSDLCloseNotification : public NotificationToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_SDL_CLOSE_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_SDL_CLOSE_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_consent_needed_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_consent_needed_notification.h index 079d78f3fa..be3f8b4333 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_consent_needed_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_consent_needed_notification.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_SDL_CONSENT_NEEDED_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_SDL_CONSENT_NEEDED_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_SDL_CONSENT_NEEDED_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_SDL_CONSENT_NEEDED_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_to_hmi.h" +#include "application_manager/commands/notification_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class OnSDLConsentNeededNotification : public NotificationToHMI { * * @param message Incoming SmartObject message **/ - OnSDLConsentNeededNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnSDLConsentNeededNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnSDLConsentNeededNotification class destructor @@ -70,4 +72,4 @@ class OnSDLConsentNeededNotification : public NotificationToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_SDL_CONSENT_NEEDED_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_SDL_CONSENT_NEEDED_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_persistence_complete_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_persistence_complete_notification.h index a30aaa1734..e810979be2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_persistence_complete_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_persistence_complete_notification.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_SDL_PERSISTENCE_COMPLETE_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_SDL_PERSISTENCE_COMPLETE_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_SDL_PERSISTENCE_COMPLETE_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_SDL_PERSISTENCE_COMPLETE_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_to_hmi.h" +#include "application_manager/commands/notification_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class OnSDLPersistenceCompleteNotification : public NotificationToHMI { * * @param message Incoming SmartObject message **/ - OnSDLPersistenceCompleteNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnSDLPersistenceCompleteNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnSDLPersistenceCompleteNotification class destructor @@ -70,4 +72,4 @@ class OnSDLPersistenceCompleteNotification : public NotificationToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_SDL_PERSISTENCE_COMPLETE_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_SDL_PERSISTENCE_COMPLETE_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_start_device_discovery.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_start_device_discovery.h index 5c3967e5dc..184f0c479f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_start_device_discovery.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_start_device_discovery.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_START_DEVICE_DISCOVERY_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_START_DEVICE_DISCOVERY_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_START_DEVICE_DISCOVERY_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_START_DEVICE_DISCOVERY_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class OnStartDeviceDiscovery : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnStartDeviceDiscovery(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnStartDeviceDiscovery(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnStartDeviceDiscovery class destructor @@ -70,4 +71,4 @@ class OnStartDeviceDiscovery : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_START_DEVICE_DISCOVERY_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_START_DEVICE_DISCOVERY_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_status_update_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_status_update_notification.h index 4e7b9a0ae3..d84e4f6736 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_status_update_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_status_update_notification.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_STATUS_UPDATE_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_STATUS_UPDATE_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_STATUS_UPDATE_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_STATUS_UPDATE_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_to_hmi.h" +#include "application_manager/commands/notification_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class OnStatusUpdateNotification : public NotificationToHMI { * * @param message Incoming SmartObject message **/ - OnStatusUpdateNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnStatusUpdateNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnGetStatusUpdateNotification class destructor @@ -70,4 +72,4 @@ class OnStatusUpdateNotification : public NotificationToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_STATUS_UPDATE_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_STATUS_UPDATE_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_context_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_context_notification.h index 73c29956bf..66ed2f4659 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_context_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_context_notification.h @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_SYSTEM_CONTEXT_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_SYSTEM_CONTEXT_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_SYSTEM_CONTEXT_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_SYSTEM_CONTEXT_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -51,8 +52,9 @@ class OnSystemContextNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnSystemContextNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnSystemContextNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnSystemContextNotification class destructor @@ -72,4 +74,4 @@ class OnSystemContextNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_SYSTEM_CONTEXT_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_SYSTEM_CONTEXT_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_error_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_error_notification.h index 60100e15d0..1582fcedb8 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_error_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_error_notification.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_SYSTEM_ERROR_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_SYSTEM_ERROR_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_SYSTEM_ERROR_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_SYSTEM_ERROR_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class OnSystemErrorNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnSystemErrorNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnSystemErrorNotification(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnSystemErrorNotification class destructor @@ -70,4 +71,4 @@ class OnSystemErrorNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_SYSTEM_ERROR_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_SYSTEM_ERROR_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_info_changed_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_info_changed_notification.h index 2a539b4e17..c159621f6f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_info_changed_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_info_changed_notification.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_SYSTEM_INFO_CHANGED_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_SYSTEM_INFO_CHANGED_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_SYSTEM_INFO_CHANGED_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_SYSTEM_INFO_CHANGED_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class OnSystemInfoChangedNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnSystemInfoChangedNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnSystemInfoChangedNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnSystemInfoChangedNotification class destructor @@ -70,4 +72,4 @@ class OnSystemInfoChangedNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_SYSTEM_INFO_CHANGED_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_SYSTEM_INFO_CHANGED_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_request_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_request_notification.h index 5b906faf10..c25d6dbb40 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_request_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_request_notification.h @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_SYSTEM_REQUEST_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_SYSTEM_REQUEST_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_SYSTEM_REQUEST_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_SYSTEM_REQUEST_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_impl.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -50,8 +51,9 @@ class OnSystemRequestNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnSystemRequestNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnSystemRequestNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnSystemRequestNotification class destructor @@ -71,4 +73,4 @@ class OnSystemRequestNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_SYSTEM_REQUEST_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_SYSTEM_REQUEST_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_language_change_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_language_change_notification.h index 0f2dfa7a20..120b885340 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_language_change_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_language_change_notification.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_TTS_LANGUAGE_CHANGE_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_TTS_LANGUAGE_CHANGE_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_TTS_LANGUAGE_CHANGE_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_TTS_LANGUAGE_CHANGE_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class OnTTSLanguageChangeNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnTTSLanguageChangeNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnTTSLanguageChangeNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnTTSLanguageChangeNotification class destructor @@ -70,4 +72,4 @@ class OnTTSLanguageChangeNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_TTS_LANGUAGE_CHANGE_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_TTS_LANGUAGE_CHANGE_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_reset_timeout_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_reset_timeout_notification.h index 61be7ef438..597c43b978 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_reset_timeout_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_reset_timeout_notification.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_TTS_RESET_TIMEOUT_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_TTS_RESET_TIMEOUT_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_TTS_RESET_TIMEOUT_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_TTS_RESET_TIMEOUT_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -51,8 +52,9 @@ class OnTTSResetTimeoutNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnTTSResetTimeoutNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnTTSResetTimeoutNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnTTSResetTimeoutNotification class destructor @@ -74,4 +76,4 @@ class OnTTSResetTimeoutNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_TTS_RESET_TIMEOUT_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_TTS_RESET_TIMEOUT_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_started_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_started_notification.h index 9874c11c2e..33cc18cdb7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_started_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_started_notification.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_TTS_STARTED_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_TTS_STARTED_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_TTS_STARTED_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_TTS_STARTED_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class OnTTSStartedNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnTTSStartedNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnTTSStartedNotification(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnTTSStartedNotification class destructor @@ -70,4 +71,4 @@ class OnTTSStartedNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_TTS_STARTED_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_TTS_STARTED_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_stopped_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_stopped_notification.h index 47abaa9ad3..5f59d79c2a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_stopped_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_stopped_notification.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_TTS_STOPPED_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_TTS_STOPPED_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_TTS_STOPPED_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_TTS_STOPPED_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class OnTTSStoppedNotification : public NotificationFromHMI { * * @param message Incoming SmartObject OnTTSStartedNotificationmessage **/ - OnTTSStoppedNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnTTSStoppedNotification(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnTTSStoppedNotification class destructor @@ -70,4 +71,4 @@ class OnTTSStoppedNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_TTS_STOPPED_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_TTS_STOPPED_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_command_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_command_notification.h index 5b8e802f3f..af1e396ede 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_command_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_command_notification.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_UI_COMMAND_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_UI_COMMAND_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_UI_COMMAND_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_UI_COMMAND_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class OnUICommandNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnUICommandNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnUICommandNotification(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnUICommandNotification class destructor @@ -70,4 +71,4 @@ class OnUICommandNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_UI_COMMAND_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_UI_COMMAND_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_keyboard_input_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_keyboard_input_notification.h index d9cf9c783f..427e4726a0 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_keyboard_input_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_keyboard_input_notification.h @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_UI_KEYBOARD_INPUT_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_UI_KEYBOARD_INPUT_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_UI_KEYBOARD_INPUT_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_UI_KEYBOARD_INPUT_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -52,8 +53,9 @@ class OnUIKeyBoardInputNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnUIKeyBoardInputNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnUIKeyBoardInputNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnUIKeyBoardInputNotification class destructor @@ -75,4 +77,4 @@ class OnUIKeyBoardInputNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_UI_KEYBOARD_INPUT_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_UI_KEYBOARD_INPUT_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_language_change_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_language_change_notification.h index 6707c5344f..b9ffb972fc 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_language_change_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_language_change_notification.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_UI_LANGUAGE_CHANGE_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_UI_LANGUAGE_CHANGE_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_UI_LANGUAGE_CHANGE_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_UI_LANGUAGE_CHANGE_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class OnUILanguageChangeNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnUILanguageChangeNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnUILanguageChangeNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnUILanguageChangeNotification class destructor @@ -70,4 +72,4 @@ class OnUILanguageChangeNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_UI_LANGUAGE_CHANGE_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_UI_LANGUAGE_CHANGE_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_reset_timeout_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_reset_timeout_notification.h index e9f0dc4f88..e7190b0bea 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_reset_timeout_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_reset_timeout_notification.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_UI_RESET_TIMEOUT_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_UI_RESET_TIMEOUT_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_UI_RESET_TIMEOUT_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_UI_RESET_TIMEOUT_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -51,8 +52,9 @@ class OnUIResetTimeoutNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnUIResetTimeoutNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnUIResetTimeoutNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnUIResetTimeoutNotification class destructor @@ -74,4 +76,4 @@ class OnUIResetTimeoutNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_UI_RESET_TIMEOUT_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_UI_RESET_TIMEOUT_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_touch_event_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_touch_event_notification.h index e60cfc7791..6538c4b12a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_touch_event_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_touch_event_notification.h @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_UI_TOUCH_EVENT_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_UI_TOUCH_EVENT_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_UI_TOUCH_EVENT_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_UI_TOUCH_EVENT_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -52,8 +53,9 @@ class OnUITouchEventNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnUITouchEventNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnUITouchEventNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnUITouchEventNotification class destructor @@ -75,4 +77,4 @@ class OnUITouchEventNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_UI_TOUCH_EVENT_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_UI_TOUCH_EVENT_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_update_device_list.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_update_device_list.h index 6ea0d9e215..f2cbf370c3 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_update_device_list.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_update_device_list.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_UPDATE_DEVICE_LIST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_UPDATE_DEVICE_LIST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_UPDATE_DEVICE_LIST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_UPDATE_DEVICE_LIST_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class OnUpdateDeviceList : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnUpdateDeviceList(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnUpdateDeviceList(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnUpdateDeviceList class destructor @@ -70,4 +71,4 @@ class OnUpdateDeviceList : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_UPDATE_DEVICE_LIST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_UPDATE_DEVICE_LIST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_acc_pedal_position_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_acc_pedal_position_notification.h index 4d03aeeb0e..636cd91d06 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_acc_pedal_position_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_acc_pedal_position_notification.h @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_ACC_PEDAL_POSITION_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_ACC_PEDAL_POSITION_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_ACC_PEDAL_POSITION_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_ACC_PEDAL_POSITION_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -50,8 +51,9 @@ class OnVIAccPedalPositionNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVIAccPedalPositionNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnVIAccPedalPositionNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnVIAccPedalPositionNotification class destructor @@ -71,4 +73,4 @@ class OnVIAccPedalPositionNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_ACC_PEDAL_POSITION_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_ACC_PEDAL_POSITION_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_belt_status_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_belt_status_notification.h index a1ef83fdbf..c240e15f17 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_belt_status_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_belt_status_notification.h @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_BELT_STATUS_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_BELT_STATUS_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_BELT_STATUS_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_BELT_STATUS_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -50,8 +51,9 @@ class OnVIBeltStatusNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVIBeltStatusNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnVIBeltStatusNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnVIBeltStatusNotification class destructor @@ -71,4 +73,4 @@ class OnVIBeltStatusNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_BELT_STATUS_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_BELT_STATUS_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_body_information_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_body_information_notification.h index dc6da5b17b..a47c07b803 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_body_information_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_body_information_notification.h @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_BODY_INFORMATION_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_BODY_INFORMATION_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_BODY_INFORMATION_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_BODY_INFORMATION_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -50,8 +51,9 @@ class OnVIBodyInformationNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVIBodyInformationNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnVIBodyInformationNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnVIBodyInformationNotification class destructor @@ -71,4 +73,4 @@ class OnVIBodyInformationNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_BODY_INFORMATION_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_BODY_INFORMATION_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_device_status_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_device_status_notification.h index 81a7f878d4..6a7ca2b561 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_device_status_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_device_status_notification.h @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_DEVICE_STATUS_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_DEVICE_STATUS_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_DEVICE_STATUS_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_DEVICE_STATUS_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -50,8 +51,9 @@ class OnVIDeviceStatusNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVIDeviceStatusNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnVIDeviceStatusNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnVIDeviceStatusNotification class destructor @@ -71,4 +73,4 @@ class OnVIDeviceStatusNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_DEVICE_STATUS_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_DEVICE_STATUS_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_driver_braking_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_driver_braking_notification.h index 4a0f225355..130afb7940 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_driver_braking_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_driver_braking_notification.h @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_DRIVER_BRAKING_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_DRIVER_BRAKING_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_DRIVER_BRAKING_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_DRIVER_BRAKING_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -50,8 +51,9 @@ class OnVIDriverBrakingNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVIDriverBrakingNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnVIDriverBrakingNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnVIDriverBrakingNotification class destructor @@ -71,4 +73,4 @@ class OnVIDriverBrakingNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_DRIVER_BRAKING_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_DRIVER_BRAKING_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_engine_torque_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_engine_torque_notification.h index 0822529cc1..2becf3f9f8 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_engine_torque_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_engine_torque_notification.h @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_ENGINE_TORQUE_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_ENGINE_TORQUE_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_ENGINE_TORQUE_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_ENGINE_TORQUE_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -50,8 +51,9 @@ class OnVIEngineTorqueNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVIEngineTorqueNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnVIEngineTorqueNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnVIEngineTorqueNotification class destructor @@ -71,4 +73,4 @@ class OnVIEngineTorqueNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_ENGINE_TORQUE_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_ENGINE_TORQUE_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_external_temperature_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_external_temperature_notification.h index 22a35bef02..0440478181 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_external_temperature_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_external_temperature_notification.h @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_EXTERNAL_TEMPERATURE_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_EXTERNAL_TEMPERATURE_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_EXTERNAL_TEMPERATURE_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_EXTERNAL_TEMPERATURE_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -50,8 +51,9 @@ class OnVIExternalTemperatureNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVIExternalTemperatureNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnVIExternalTemperatureNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnVIExternalTemperatureNotification class destructor @@ -71,4 +73,4 @@ class OnVIExternalTemperatureNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_EXTERNAL_TEMPERATURE_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_EXTERNAL_TEMPERATURE_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_fuel_level_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_fuel_level_notification.h index f6ebab6f84..21021deb80 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_fuel_level_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_fuel_level_notification.h @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_FUEL_LEVEL_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_FUEL_LEVEL_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_FUEL_LEVEL_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_FUEL_LEVEL_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -50,8 +51,8 @@ class OnVIFuelLevelNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVIFuelLevelNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnVIFuelLevelNotification(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnVIFuelLevelNotification class destructor @@ -71,4 +72,4 @@ class OnVIFuelLevelNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_FUEL_LEVEL_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_FUEL_LEVEL_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_fuel_level_state_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_fuel_level_state_notification.h index 29eae2f70f..ccf87e4129 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_fuel_level_state_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_fuel_level_state_notification.h @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_FUEL_LEVEL_STATE_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_FUEL_LEVEL_STATE_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_FUEL_LEVEL_STATE_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_FUEL_LEVEL_STATE_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -50,8 +51,9 @@ class OnVIFuelLevelStateNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVIFuelLevelStateNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnVIFuelLevelStateNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnVIFuelLevelStateNotification class destructor @@ -71,4 +73,4 @@ class OnVIFuelLevelStateNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_FUEL_LEVEL_STATE_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_FUEL_LEVEL_STATE_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_gps_data_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_gps_data_notification.h index 7aeba4b9e6..6ddbc0ce5f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_gps_data_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_gps_data_notification.h @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_GPS_DATA_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_GPS_DATA_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_GPS_DATA_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_GPS_DATA_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -50,8 +51,8 @@ class OnVIGpsDataNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVIGpsDataNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnVIGpsDataNotification(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnVIGpsDataNotification class destructor @@ -71,4 +72,4 @@ class OnVIGpsDataNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_GPS_DATA_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_GPS_DATA_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_head_lamp_status_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_head_lamp_status_notification.h index 8fe9c23e86..4f03c68fdf 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_head_lamp_status_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_head_lamp_status_notification.h @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_HEAD_LAMP_STATUS_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_HEAD_LAMP_STATUS_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_HEAD_LAMP_STATUS_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_HEAD_LAMP_STATUS_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -50,8 +51,9 @@ class OnVIHeadLampStatusNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVIHeadLampStatusNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnVIHeadLampStatusNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnVIHeadLampStatusNotification class destructor @@ -71,4 +73,4 @@ class OnVIHeadLampStatusNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_HEAD_LAMP_STATUS_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_HEAD_LAMP_STATUS_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_instant_fuel_consumption_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_instant_fuel_consumption_notification.h index 3daf28b3c5..b8b1cc1dc1 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_instant_fuel_consumption_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_instant_fuel_consumption_notification.h @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_INSTANT_FUEL_CONSUMPTION_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_INSTANT_FUEL_CONSUMPTION_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_INSTANT_FUEL_CONSUMPTION_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_INSTANT_FUEL_CONSUMPTION_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -51,7 +52,8 @@ class OnVIInstantFuelConsumptionNotification : public NotificationFromHMI { * @param message Incoming SmartObject message **/ OnVIInstantFuelConsumptionNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager); + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnVIInstantFuelConsumptionNotification class destructor @@ -71,4 +73,4 @@ class OnVIInstantFuelConsumptionNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_INSTANT_FUEL_CONSUMPTION_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_INSTANT_FUEL_CONSUMPTION_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_my_key_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_my_key_notification.h index c10f18f648..51cc80a259 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_my_key_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_my_key_notification.h @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_MY_KEY_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_MY_KEY_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_MY_KEY_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_MY_KEY_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -50,8 +51,8 @@ class OnVIMyKeyNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVIMyKeyNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnVIMyKeyNotification(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnVIMyKeyNotification class destructor @@ -71,4 +72,4 @@ class OnVIMyKeyNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_MY_KEY_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_MY_KEY_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_odometer_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_odometer_notification.h index 2bd14fae7d..dafb4c8313 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_odometer_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_odometer_notification.h @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_ODOMETER_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_ODOMETER_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_ODOMETER_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_ODOMETER_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -50,8 +51,8 @@ class OnVIOdometerNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVIOdometerNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnVIOdometerNotification(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnVIOdometerNotification class destructor @@ -71,4 +72,4 @@ class OnVIOdometerNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_ODOMETER_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_ODOMETER_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_prndl_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_prndl_notification.h index 8e8763fd81..bb86cb579b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_prndl_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_prndl_notification.h @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_PRNDL_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_PRNDL_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_PRNDL_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_PRNDL_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -50,8 +51,8 @@ class OnVIPrndlNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVIPrndlNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnVIPrndlNotification(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnVIPrndlNotification class destructor @@ -71,4 +72,4 @@ class OnVIPrndlNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_PRNDL_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_PRNDL_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_rpm_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_rpm_notification.h index c6a8f242fe..2347a7286d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_rpm_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_rpm_notification.h @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_RPM_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_RPM_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_RPM_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_RPM_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -50,8 +51,8 @@ class OnVIRpmNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVIRpmNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnVIRpmNotification(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnVIRpmNotification class destructor @@ -71,4 +72,4 @@ class OnVIRpmNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_RPM_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_RPM_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_speed_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_speed_notification.h index 55e5972077..38726bcf76 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_speed_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_speed_notification.h @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_SPEED_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_SPEED_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_SPEED_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_SPEED_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -50,8 +51,8 @@ class OnVISpeedNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVISpeedNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnVISpeedNotification(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnVISpeedNotification class destructor @@ -71,4 +72,4 @@ class OnVISpeedNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_SPEED_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_SPEED_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_steering_wheel_angle_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_steering_wheel_angle_notification.h index b65e32d79c..e06f1157ba 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_steering_wheel_angle_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_steering_wheel_angle_notification.h @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_STEERING_WHEEL_ANGLE_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_STEERING_WHEEL_ANGLE_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_STEERING_WHEEL_ANGLE_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_STEERING_WHEEL_ANGLE_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -50,8 +51,9 @@ class OnVISteeringWheelAngleNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVISteeringWheelAngleNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnVISteeringWheelAngleNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnVISteeringWheelAngleNotification class destructor @@ -71,4 +73,4 @@ class OnVISteeringWheelAngleNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_STEERING_WHEEL_ANGLE_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_STEERING_WHEEL_ANGLE_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_tire_pressure_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_tire_pressure_notification.h index 7a270038c9..cbf3ee9b0b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_tire_pressure_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_tire_pressure_notification.h @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_TIRE_PRESSURE_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_TIRE_PRESSURE_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_TIRE_PRESSURE_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_TIRE_PRESSURE_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -50,8 +51,9 @@ class OnVITirePressureNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVITirePressureNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnVITirePressureNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnVITirePressureNotification class destructor @@ -71,4 +73,4 @@ class OnVITirePressureNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_TIRE_PRESSURE_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_TIRE_PRESSURE_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_vehicle_data_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_vehicle_data_notification.h index c853db1809..47126f8404 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_vehicle_data_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_vehicle_data_notification.h @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_VEHICLE_DATA_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_VEHICLE_DATA_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_VEHICLE_DATA_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_VEHICLE_DATA_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -51,8 +52,9 @@ class OnVIVehicleDataNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVIVehicleDataNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnVIVehicleDataNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnVIVehicleDataNotification class destructor @@ -72,4 +74,4 @@ class OnVIVehicleDataNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_VEHICLE_DATA_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_VEHICLE_DATA_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_vin_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_vin_notification.h index 931f8a6047..35761dadef 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_vin_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_vin_notification.h @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_VIN_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_VIN_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_VIN_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_VIN_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -50,8 +51,8 @@ class OnVIVinNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVIVinNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnVIVinNotification(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnVIVinNotification class destructor @@ -71,4 +72,4 @@ class OnVIVinNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_VIN_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_VIN_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_wiper_status_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_wiper_status_notification.h index 1feec3e58c..7a8f536104 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_wiper_status_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_wiper_status_notification.h @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_WIPER_STATUS_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_WIPER_STATUS_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_WIPER_STATUS_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_WIPER_STATUS_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -50,8 +51,9 @@ class OnVIWiperStatusNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVIWiperStatusNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnVIWiperStatusNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnVIWiperStatusNotification class destructor @@ -71,4 +73,4 @@ class OnVIWiperStatusNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_WIPER_STATUS_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_WIPER_STATUS_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_video_data_streaming_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_video_data_streaming_notification.h index df225e3a62..5e0bd1a3d9 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_video_data_streaming_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_video_data_streaming_notification.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VIDEO_DATA_STREAMING_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VIDEO_DATA_STREAMING_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VIDEO_DATA_STREAMING_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VIDEO_DATA_STREAMING_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_to_hmi.h" +#include "application_manager/commands/notification_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class OnVideoDataStreamingNotification : public NotificationToHMI { * * @param message Incoming SmartObject message **/ - OnVideoDataStreamingNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnVideoDataStreamingNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnVideoDataStreamingNotification class destructor @@ -70,4 +72,4 @@ class OnVideoDataStreamingNotification : public NotificationToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VIDEO_DATA_STREAMING_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VIDEO_DATA_STREAMING_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_command_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_command_notification.h index ca4b280255..8c25309f72 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_command_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_command_notification.h @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VR_COMMAND_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VR_COMMAND_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VR_COMMAND_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VR_COMMAND_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_impl.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -50,8 +51,8 @@ class OnVRCommandNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVRCommandNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnVRCommandNotification(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnVRCommandNotification class destructor @@ -71,4 +72,4 @@ class OnVRCommandNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VR_COMMAND_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VR_COMMAND_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_language_change_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_language_change_notification.h index 9f930f3376..05aea94ace 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_language_change_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_language_change_notification.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VR_LANGUAGE_CHANGE_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VR_LANGUAGE_CHANGE_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VR_LANGUAGE_CHANGE_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VR_LANGUAGE_CHANGE_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class OnVRLanguageChangeNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVRLanguageChangeNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnVRLanguageChangeNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnVRLanguageChangeNotification class destructor @@ -70,4 +72,4 @@ class OnVRLanguageChangeNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VR_LANGUAGE_CHANGE_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VR_LANGUAGE_CHANGE_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_started_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_started_notification.h index b02df519b3..ff191c62db 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_started_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_started_notification.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VR_STARTED_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VR_STARTED_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VR_STARTED_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VR_STARTED_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class OnVRStartedNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVRStartedNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnVRStartedNotification(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnVRStartedNotification class destructor @@ -70,4 +71,4 @@ class OnVRStartedNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VR_STARTED_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VR_STARTED_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_stopped_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_stopped_notification.h index 167488528b..1a9660dc3a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_stopped_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_stopped_notification.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VR_STOPPED_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VR_STOPPED_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VR_STOPPED_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VR_STOPPED_NOTIFICATION_H_ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class OnVRStoppedNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVRStoppedNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnVRStoppedNotification(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnVRStoppedNotification class destructor @@ -70,4 +71,4 @@ class OnVRStoppedNotification : public NotificationFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VR_STOPPED_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VR_STOPPED_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_get_capabilities_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_get_capabilities_request.h index b28001babf..b57dd5ea35 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_get_capabilities_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_get_capabilities_request.h @@ -30,27 +30,28 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_RC_GET_CAPABILITIES_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_RC_GET_CAPABILITIES_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_RC_GET_CAPABILITIES_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_RC_GET_CAPABILITIES_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief RCGetCapabilitiesRequest command class **/ -class RCGetCapabilitiesRequest : public RequestToHMI { +class RCGetCapabilitiesRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief RCGetCapabilitiesRequest class constructor * * @param message Incoming SmartObject message **/ - RCGetCapabilitiesRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + RCGetCapabilitiesRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief RCGetCapabilitiesRequest class destructor @@ -70,4 +71,4 @@ class RCGetCapabilitiesRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_RC_GET_CAPABILITIES_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_RC_GET_CAPABILITIES_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_get_capabilities_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_get_capabilities_response.h index 3a6d0bdd7c..66e1d7c055 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_get_capabilities_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_get_capabilities_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_RC_GET_CAPABILITIES_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_RC_GET_CAPABILITIES_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_RC_GET_CAPABILITIES_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_RC_GET_CAPABILITIES_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class RCGetCapabilitiesResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - RCGetCapabilitiesResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + RCGetCapabilitiesResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief RCGetCapabilitiesResponse class destructor @@ -70,4 +71,4 @@ class RCGetCapabilitiesResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_RC_GET_CAPABILITIES_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_RC_GET_CAPABILITIES_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_is_ready_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_is_ready_request.h index 5223e639ff..d41052b0a4 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_is_ready_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_is_ready_request.h @@ -30,29 +30,30 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_RC_IS_READY_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_RC_IS_READY_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_RC_IS_READY_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_RC_IS_READY_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" #include "application_manager/message_helper.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief RCIsReadyRequest command class **/ -class RCIsReadyRequest : public RequestToHMI, - public event_engine::EventObserver { +class RCIsReadyRequest : public app_mngr::commands::RequestToHMI, + public app_mngr::event_engine::EventObserver { public: /** * @brief RCIsReadyRequest class constructor * * @param message Incoming SmartObject message **/ - RCIsReadyRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + RCIsReadyRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief RCIsReadyRequest class destructor @@ -67,7 +68,7 @@ class RCIsReadyRequest : public RequestToHMI, /** * @brief On event callback **/ - void on_event(const event_engine::Event& event) OVERRIDE; + void on_event(const app_mngr::event_engine::Event& event) OVERRIDE; /** * @brief onTimeOut from requrst Controller @@ -87,4 +88,4 @@ class RCIsReadyRequest : public RequestToHMI, } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_RC_IS_READY_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_RC_IS_READY_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_is_ready_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_is_ready_response.h index 04915f9327..f39c0be2ba 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_is_ready_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_is_ready_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_RC_IS_READY_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_RC_IS_READY_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_RC_IS_READY_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_RC_IS_READY_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class RCIsReadyResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - RCIsReadyResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + RCIsReadyResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief RCIsReadyResponse class destructor @@ -70,4 +71,4 @@ class RCIsReadyResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_RC_IS_READY_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_RC_IS_READY_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/response_from_hmi.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/response_from_hmi.h index 05fd23adf0..3006054d29 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/response_from_hmi.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/response_from_hmi.h @@ -30,27 +30,28 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_RESPONSE_FROM_HMI_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_RESPONSE_FROM_HMI_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_RESPONSE_FROM_HMI_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_RESPONSE_FROM_HMI_H_ #include "application_manager/commands/command_impl.h" #include "application_manager/application_manager.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { -class ResponseFromHMI : public CommandImpl { +class ResponseFromHMI : public app_mngr::commands::CommandImpl { public: - ResponseFromHMI(const MessageSharedPtr& message, - ApplicationManager& application_manager); + ResponseFromHMI(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); virtual ~ResponseFromHMI(); virtual bool Init(); virtual bool CleanUp(); virtual void Run(); - void SendResponseToMobile(const MessageSharedPtr& message, - ApplicationManager& application_manager); + void SendResponseToMobile(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /* * @brief Creates HMI request @@ -69,4 +70,4 @@ class ResponseFromHMI : public CommandImpl { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_RESPONSE_FROM_HMI_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_RESPONSE_FROM_HMI_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/response_to_hmi.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/response_to_hmi.h index 1dd0657815..47b09ef535 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/response_to_hmi.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/response_to_hmi.h @@ -31,23 +31,24 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_RESPONSE_TO_HMI_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_RESPONSE_TO_HMI_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_RESPONSE_TO_HMI_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_RESPONSE_TO_HMI_H_ #include "application_manager/commands/command_impl.h" #include "interfaces/HMI_API.h" #include "smart_objects/smart_object.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { namespace NsSmart = NsSmartDeviceLink::NsSmartObjects; -class ResponseToHMI : public CommandImpl { +class ResponseToHMI : public app_mngr::commands::CommandImpl { public: - ResponseToHMI(const MessageSharedPtr& message, - ApplicationManager& application_manager); + ResponseToHMI(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); virtual ~ResponseToHMI(); virtual bool Init(); virtual bool CleanUp(); @@ -60,4 +61,4 @@ class ResponseToHMI : public CommandImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_RESPONSE_TO_HMI_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_RESPONSE_TO_HMI_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_activate_app_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_activate_app_request.h index 2ae00a0015..9d192a16ba 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_activate_app_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_activate_app_request.h @@ -30,20 +30,21 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_SDL_ACTIVATE_APP_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_SDL_ACTIVATE_APP_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_ACTIVATE_APP_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_ACTIVATE_APP_REQUEST_H_ #include "application_manager/commands/request_from_hmi.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief SDLActivateAppRequest command class **/ -class SDLActivateAppRequest : public RequestFromHMI { +class SDLActivateAppRequest : public app_mngr::commands::RequestFromHMI { public: /** * @brief Applications registered over protocol v4 @@ -55,8 +56,8 @@ class SDLActivateAppRequest : public RequestFromHMI { * * @param message Incoming SmartObject message **/ - SDLActivateAppRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + SDLActivateAppRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief SDLActivateAppRequest class destructor @@ -79,7 +80,7 @@ class SDLActivateAppRequest : public RequestFromHMI { * * @param event event type that current request subscribed on. */ - void on_event(const event_engine::Event& event) OVERRIDE; + void on_event(const app_mngr::event_engine::Event& event) OVERRIDE; private: uint32_t app_id() const; @@ -98,7 +99,7 @@ class SDLActivateAppRequest : public RequestFromHMI { * @param handle Device * @return Pointer to application or empty pointer */ - ApplicationSharedPtr get_foreground_app( + app_mngr::ApplicationSharedPtr get_foreground_app( const connection_handler::DeviceHandle handle) const; DISALLOW_COPY_AND_ASSIGN(SDLActivateAppRequest); @@ -107,4 +108,4 @@ class SDLActivateAppRequest : public RequestFromHMI { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_SDL_ACTIVATE_APP_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_ACTIVATE_APP_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_activate_app_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_activate_app_response.h index e354999f2d..bd794cdfcd 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_activate_app_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_activate_app_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_SDL_ACTIVATE_APP_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_SDL_ACTIVATE_APP_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_ACTIVATE_APP_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_ACTIVATE_APP_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_to_hmi.h" +#include "application_manager/commands/response_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class SDLActivateAppResponse : public ResponseToHMI { * * @param message Incoming SmartObject message **/ - SDLActivateAppResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + SDLActivateAppResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief SDLActivateAppResponse class destructor @@ -69,4 +70,4 @@ class SDLActivateAppResponse : public ResponseToHMI { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_SDL_ACTIVATE_APP_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_ACTIVATE_APP_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_list_of_permissions_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_list_of_permissions_request.h index 9e3f97e0a1..0ff170307b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_list_of_permissions_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_list_of_permissions_request.h @@ -30,27 +30,30 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_SDL_GET_LIST_OF_PERMISSIONS_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_SDL_GET_LIST_OF_PERMISSIONS_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_GET_LIST_OF_PERMISSIONS_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_GET_LIST_OF_PERMISSIONS_REQUEST_H_ #include "application_manager/commands/request_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief SDLGetListOfPermissionsRequest command class **/ -class SDLGetListOfPermissionsRequest : public RequestFromHMI { +class SDLGetListOfPermissionsRequest + : public app_mngr::commands::RequestFromHMI { public: /** * @brief SDLGetListOfPermissionsRequest class constructor * * @param message Incoming SmartObject message **/ - SDLGetListOfPermissionsRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + SDLGetListOfPermissionsRequest( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief SDLGetListOfPermissionsRequest class destructor @@ -69,4 +72,4 @@ class SDLGetListOfPermissionsRequest : public RequestFromHMI { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_SDL_GET_LIST_OF_PERMISSIONS_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_GET_LIST_OF_PERMISSIONS_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_list_of_permissions_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_list_of_permissions_response.h index aec098d57f..bac2586526 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_list_of_permissions_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_list_of_permissions_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_SDL_GET_LIST_OF_PERMISSIONS_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_SDL_GET_LIST_OF_PERMISSIONS_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_GET_LIST_OF_PERMISSIONS_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_GET_LIST_OF_PERMISSIONS_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_to_hmi.h" +#include "application_manager/commands/response_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class SDLGetListOfPermissionsResponse : public ResponseToHMI { * * @param message Incoming SmartObject message **/ - SDLGetListOfPermissionsResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + SDLGetListOfPermissionsResponse( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief SDLGetListOfPermissionsResponse class destructor @@ -70,4 +72,4 @@ class SDLGetListOfPermissionsResponse : public ResponseToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_SDL_GET_LIST_OF_PERMISSIONS_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_GET_LIST_OF_PERMISSIONS_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_status_update_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_status_update_request.h index f9c9baa0c8..168371e289 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_status_update_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_status_update_request.h @@ -30,27 +30,28 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_SDL_GET_STATUS_UPDATE_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_SDL_GET_STATUS_UPDATE_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_GET_STATUS_UPDATE_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_GET_STATUS_UPDATE_REQUEST_H_ #include "application_manager/commands/request_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief SDLGetStatusUpdateRequest command class **/ -class SDLGetStatusUpdateRequest : public RequestFromHMI { +class SDLGetStatusUpdateRequest : public app_mngr::commands::RequestFromHMI { public: /** * @brief SDLGetStatusUpdateRequest class constructor * * @param message Incoming SmartObject message **/ - SDLGetStatusUpdateRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + SDLGetStatusUpdateRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief SDLGetStatusUpdateRequest class destructor @@ -69,4 +70,4 @@ class SDLGetStatusUpdateRequest : public RequestFromHMI { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_SDL_GET_STATUS_UPDATE_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_GET_STATUS_UPDATE_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_status_update_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_status_update_response.h index 832b585609..6d0c02e882 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_status_update_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_status_update_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_SDL_GET_STATUS_UPDATE_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_SDL_GET_STATUS_UPDATE_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_GET_STATUS_UPDATE_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_GET_STATUS_UPDATE_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_to_hmi.h" +#include "application_manager/commands/response_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class SDLGetStatusUpdateResponse : public ResponseToHMI { * * @param message Incoming SmartObject message **/ - SDLGetStatusUpdateResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + SDLGetStatusUpdateResponse( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief SDLGetStatusUpdateResponse class destructor @@ -69,4 +71,4 @@ class SDLGetStatusUpdateResponse : public ResponseToHMI { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_SDL_GET_STATUS_UPDATE_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_GET_STATUS_UPDATE_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_user_friendly_message_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_user_friendly_message_request.h index d08be88bb1..dc3c3d5511 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_user_friendly_message_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_user_friendly_message_request.h @@ -30,28 +30,31 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_SDL_GET_USER_FRIENDLY_MESSAGE_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_SDL_GET_USER_FRIENDLY_MESSAGE_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_GET_USER_FRIENDLY_MESSAGE_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_GET_USER_FRIENDLY_MESSAGE_REQUEST_H_ #include "application_manager/commands/request_from_hmi.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief SDLGetUserFriendlyMessageRequest command class **/ -class SDLGetUserFriendlyMessageRequest : public RequestFromHMI { +class SDLGetUserFriendlyMessageRequest + : public app_mngr::commands::RequestFromHMI { public: /** * @brief SDLGetUserFriendlyMessageRequest class constructor * * @param message Incoming SmartObject message **/ - SDLGetUserFriendlyMessageRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + SDLGetUserFriendlyMessageRequest( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief SDLGetUserFriendlyMessageRequest class destructor @@ -70,4 +73,4 @@ class SDLGetUserFriendlyMessageRequest : public RequestFromHMI { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_SDL_GET_USER_FRIENDLY_MESSAGE_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_GET_USER_FRIENDLY_MESSAGE_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_user_friendly_message_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_user_friendly_message_response.h index 52b5ec1852..6e1dc76d60 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_user_friendly_message_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_user_friendly_message_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_SDL_GET_USER_FRIENDLY_MESSAGE_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_SDL_GET_USER_FRIENDLY_MESSAGE_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_GET_USER_FRIENDLY_MESSAGE_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_GET_USER_FRIENDLY_MESSAGE_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_to_hmi.h" +#include "application_manager/commands/response_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class SDLGetUserFriendlyMessageResponse : public ResponseToHMI { * * @param message Incoming SmartObject message **/ - SDLGetUserFriendlyMessageResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + SDLGetUserFriendlyMessageResponse( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief SDLGetUserFriendlyMessageResponse class destructor @@ -70,4 +72,4 @@ class SDLGetUserFriendlyMessageResponse : public ResponseToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_SDL_GET_USER_FRIENDLY_MESSAGE_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_GET_USER_FRIENDLY_MESSAGE_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_policy_update.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_policy_update.h index 627bbeab56..418c519b3b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_policy_update.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_policy_update.h @@ -30,24 +30,25 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_SDL_POLICY_UPDATE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_SDL_POLICY_UPDATE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_POLICY_UPDATE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_POLICY_UPDATE_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { -class SDLPolicyUpdate : public RequestToHMI { +class SDLPolicyUpdate : public app_mngr::commands::RequestToHMI { public: /** * @brief SDLPolicyUpdate class constructor * * @param message Incoming SmartObject message **/ - SDLPolicyUpdate(const MessageSharedPtr& message, - ApplicationManager& application_manager); + SDLPolicyUpdate(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); ~SDLPolicyUpdate() OVERRIDE; @@ -64,4 +65,4 @@ class SDLPolicyUpdate : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_SDL_POLICY_UPDATE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_POLICY_UPDATE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_policy_update_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_policy_update_response.h index ce901aca22..e97e61db66 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_policy_update_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_policy_update_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_SDL_POLICY_UPDATE_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_SDL_POLICY_UPDATE_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_POLICY_UPDATE_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_POLICY_UPDATE_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -46,8 +47,8 @@ class SDLPolicyUpdateResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - SDLPolicyUpdateResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + SDLPolicyUpdateResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief SDLPolicyUpdateResponse class destructor @@ -67,4 +68,4 @@ class SDLPolicyUpdateResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_SDL_POLICY_UPDATE_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_POLICY_UPDATE_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_change_registration_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_change_registration_request.h index e6a828e372..6d1b8c2ddf 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_change_registration_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_change_registration_request.h @@ -30,27 +30,29 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_CHANGE_REGISTRATION_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_CHANGE_REGISTRATION_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_CHANGE_REGISTRATION_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_CHANGE_REGISTRATION_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief TTSChangeRegistrationRequest command class **/ -class TTSChangeRegistrationRequest : public RequestToHMI { +class TTSChangeRegistrationRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief TTSChangeRegistrationRequest class constructor * * @param message Incoming SmartObject message **/ - TTSChangeRegistrationRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + TTSChangeRegistrationRequest( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief TTSChangeRegistrationRequest class destructor @@ -70,4 +72,4 @@ class TTSChangeRegistrationRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_CHANGE_REGISTRATION_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_CHANGE_REGISTRATION_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_change_registration_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_change_registration_response.h index 3f2de0b8be..491f331272 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_change_registration_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_change_registration_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_CHANGE_REGISTRATION_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_CHANGE_REGISTRATION_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_CHANGE_REGISTRATION_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_CHANGE_REGISTRATION_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class TTSChangeRegistratioResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - TTSChangeRegistratioResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + TTSChangeRegistratioResponse( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief TTSChangeRegistratioResponse class destructor @@ -70,4 +72,4 @@ class TTSChangeRegistratioResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_CHANGE_REGISTRATION_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_CHANGE_REGISTRATION_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_capabilities_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_capabilities_request.h index 2ebdb5e069..bc172a7a9c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_capabilities_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_capabilities_request.h @@ -30,27 +30,28 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_GET_CAPABILITIES_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_GET_CAPABILITIES_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_GET_CAPABILITIES_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_GET_CAPABILITIES_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief TTSGetCapabilitiesRequest command class **/ -class TTSGetCapabilitiesRequest : public RequestToHMI { +class TTSGetCapabilitiesRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief TTSGetCapabilitiesRequest class constructor * * @param message Incoming SmartObject message **/ - TTSGetCapabilitiesRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + TTSGetCapabilitiesRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief TTSGetCapabilitiesRequest class destructor @@ -70,4 +71,4 @@ class TTSGetCapabilitiesRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_GET_CAPABILITIES_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_GET_CAPABILITIES_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_capabilities_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_capabilities_response.h index c9f55f46e3..701935ca82 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_capabilities_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_capabilities_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_GET_CAPABILITIES_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_GET_CAPABILITIES_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_GET_CAPABILITIES_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_GET_CAPABILITIES_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class TTSGetCapabilitiesResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - TTSGetCapabilitiesResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + TTSGetCapabilitiesResponse( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief TTSGetCapabilitiesResponse class destructor @@ -70,4 +72,4 @@ class TTSGetCapabilitiesResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_GET_CAPABILITIES_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_GET_CAPABILITIES_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_language_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_language_request.h index d543be2b00..bfe88da42e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_language_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_language_request.h @@ -30,27 +30,28 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_GET_LANGUAGE_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_GET_LANGUAGE_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_GET_LANGUAGE_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_GET_LANGUAGE_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief TTSGetLanguageRequest command class **/ -class TTSGetLanguageRequest : public RequestToHMI { +class TTSGetLanguageRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief TTSGetLanguageRequest class constructor * * @param message Incoming SmartObject message **/ - TTSGetLanguageRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + TTSGetLanguageRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief TTSGetLanguageRequest class destructor @@ -70,4 +71,4 @@ class TTSGetLanguageRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_GET_LANGUAGE_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_GET_LANGUAGE_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_language_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_language_response.h index 40f92468bd..8624fb0b47 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_language_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_language_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_GET_LANGUAGE_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_GET_LANGUAGE_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_GET_LANGUAGE_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_GET_LANGUAGE_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class TTSGetLanguageResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - TTSGetLanguageResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + TTSGetLanguageResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief TTSGetLanguageResponse class destructor @@ -70,4 +71,4 @@ class TTSGetLanguageResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_GET_LANGUAGE_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_GET_LANGUAGE_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_supported_languages_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_supported_languages_request.h index 2dc1129e50..0c152c1930 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_supported_languages_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_supported_languages_request.h @@ -30,27 +30,30 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_GET_SUPPORTED_LANGUAGES_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_GET_SUPPORTED_LANGUAGES_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_GET_SUPPORTED_LANGUAGES_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_GET_SUPPORTED_LANGUAGES_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief TTSGetSupportedLanguagesRequest command class **/ -class TTSGetSupportedLanguagesRequest : public RequestToHMI { +class TTSGetSupportedLanguagesRequest + : public app_mngr::commands::RequestToHMI { public: /** * @brief TTSGetSupportedLanguagesRequest class constructor * * @param message Incoming SmartObject message **/ - TTSGetSupportedLanguagesRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + TTSGetSupportedLanguagesRequest( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief TTSGetSupportedLanguagesRequest class destructor @@ -70,4 +73,4 @@ class TTSGetSupportedLanguagesRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_GET_SUPPORTED_LANGUAGES_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_GET_SUPPORTED_LANGUAGES_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_supported_languages_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_supported_languages_response.h index 0041c88f04..89c4da94a1 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_supported_languages_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_supported_languages_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_GET_SUPPORTED_LANGUAGES_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_GET_SUPPORTED_LANGUAGES_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_GET_SUPPORTED_LANGUAGES_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_GET_SUPPORTED_LANGUAGES_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class TTSGetSupportedLanguagesResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - TTSGetSupportedLanguagesResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + TTSGetSupportedLanguagesResponse( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief TTSGetSupportedLanguagesResponse class destructor @@ -70,4 +72,4 @@ class TTSGetSupportedLanguagesResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_GET_SUPPORTED_LANGUAGES_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_GET_SUPPORTED_LANGUAGES_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_is_ready_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_is_ready_request.h index 299c2f44af..49584f5e8d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_is_ready_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_is_ready_request.h @@ -30,28 +30,29 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_IS_READY_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_IS_READY_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_IS_READY_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_IS_READY_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief TTSIsReadyRequest command class **/ -class TTSIsReadyRequest : public RequestToHMI, - public event_engine::EventObserver { +class TTSIsReadyRequest : public app_mngr::commands::RequestToHMI, + public app_mngr::event_engine::EventObserver { public: /** * @brief TTSIsReadyRequest class constructor * * @param message Incoming SmartObject message **/ - TTSIsReadyRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + TTSIsReadyRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief TTSIsReadyRequest class destructor @@ -66,7 +67,7 @@ class TTSIsReadyRequest : public RequestToHMI, /** * @brief On event callback **/ - void on_event(const event_engine::Event& event) OVERRIDE; + void on_event(const app_mngr::event_engine::Event& event) OVERRIDE; /** * @brief onTimeOut from requrst Controller @@ -86,4 +87,4 @@ class TTSIsReadyRequest : public RequestToHMI, } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_IS_READY_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_IS_READY_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_is_ready_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_is_ready_response.h index 83392088e1..5e9b0ae8fc 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_is_ready_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_is_ready_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_IS_READY_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_IS_READY_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_IS_READY_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_IS_READY_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class TTSIsReadyResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - TTSIsReadyResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + TTSIsReadyResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief TTSIsReadyResponse class destructor @@ -70,4 +71,4 @@ class TTSIsReadyResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_IS_READY_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_IS_READY_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_set_global_properties_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_set_global_properties_request.h index d2ecb8cac1..64dcfb3e69 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_set_global_properties_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_set_global_properties_request.h @@ -30,27 +30,29 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_SET_GLOBAL_PROPERTIES_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_SET_GLOBAL_PROPERTIES_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_SET_GLOBAL_PROPERTIES_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_SET_GLOBAL_PROPERTIES_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief TTSSetGlobalPropertiesRequest command class **/ -class TTSSetGlobalPropertiesRequest : public RequestToHMI { +class TTSSetGlobalPropertiesRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief TTSSetGlobalPropertiesRequest class constructor * * @param message Incoming SmartObject message **/ - TTSSetGlobalPropertiesRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + TTSSetGlobalPropertiesRequest( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief TTSSetGlobalPropertiesRequest class destructor @@ -70,4 +72,4 @@ class TTSSetGlobalPropertiesRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_SET_GLOBAL_PROPERTIES_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_SET_GLOBAL_PROPERTIES_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_set_global_properties_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_set_global_properties_response.h index 88d5143c8b..81ff2a9b6c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_set_global_properties_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_set_global_properties_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_SET_GLOBAL_PROPERTIES_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_SET_GLOBAL_PROPERTIES_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_SET_GLOBAL_PROPERTIES_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_SET_GLOBAL_PROPERTIES_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class TTSSetGlobalPropertiesResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - TTSSetGlobalPropertiesResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + TTSSetGlobalPropertiesResponse( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief TTSSetGlobalPropertiesResponse class destructor @@ -70,4 +72,4 @@ class TTSSetGlobalPropertiesResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_SET_GLOBAL_PROPERTIES_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_SET_GLOBAL_PROPERTIES_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_speak_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_speak_request.h index 1d10d8fd7a..b06c2d43ba 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_speak_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_speak_request.h @@ -30,27 +30,28 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_SPEAK_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_SPEAK_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_SPEAK_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_SPEAK_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief TTSSpeakRequest command class **/ -class TTSSpeakRequest : public RequestToHMI { +class TTSSpeakRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief TTSSpeakRequest class constructor * * @param message Incoming SmartObject message **/ - TTSSpeakRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + TTSSpeakRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief TTSSpeakRequest class destructor @@ -70,4 +71,4 @@ class TTSSpeakRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_SPEAK_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_SPEAK_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_speak_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_speak_response.h index aa87860e72..03715e0cb4 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_speak_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_speak_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_SPEAK_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_SPEAK_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_SPEAK_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_SPEAK_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class TTSSpeakResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - TTSSpeakResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + TTSSpeakResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief TTSSpeakResponse class destructor @@ -70,4 +71,4 @@ class TTSSpeakResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_SPEAK_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_SPEAK_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_stop_speaking_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_stop_speaking_request.h index 26a02ae3e0..b99bc300fc 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_stop_speaking_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_stop_speaking_request.h @@ -30,27 +30,28 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_STOP_SPEAKING_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_STOP_SPEAKING_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_STOP_SPEAKING_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_STOP_SPEAKING_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief TTSStopSpeakingRequest command class **/ -class TTSStopSpeakingRequest : public RequestToHMI { +class TTSStopSpeakingRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief TTSStopSpeakingRequest class constructor * * @param message Incoming SmartObject message **/ - TTSStopSpeakingRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + TTSStopSpeakingRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief TTSStopSpeakingRequest class destructor @@ -70,4 +71,4 @@ class TTSStopSpeakingRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_STOP_SPEAKING_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_STOP_SPEAKING_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_stop_speaking_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_stop_speaking_response.h index bc47317c32..94f657a01f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_stop_speaking_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_stop_speaking_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_STOP_SPEAKING_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_STOP_SPEAKING_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_STOP_SPEAKING_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_STOP_SPEAKING_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class TTSStopSpeakingResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - TTSStopSpeakingResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + TTSStopSpeakingResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief TTSStopSpeakingResponse class destructor @@ -70,4 +71,4 @@ class TTSStopSpeakingResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_STOP_SPEAKING_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_STOP_SPEAKING_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_command_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_command_request.h index ca4281da28..66d6f50a45 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_command_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_command_request.h @@ -30,27 +30,28 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_ADD_COMMAND_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_ADD_COMMAND_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_ADD_COMMAND_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_ADD_COMMAND_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief UIAddCommandRequest command class **/ -class UIAddCommandRequest : public RequestToHMI { +class UIAddCommandRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief UIAddCommandRequest class constructor * * @param message Incoming SmartObject message **/ - UIAddCommandRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UIAddCommandRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UIAddCommandRequest class destructor @@ -70,4 +71,4 @@ class UIAddCommandRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_ADD_COMMAND_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_ADD_COMMAND_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_command_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_command_response.h index 1fd6730d46..bfcf93afc9 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_command_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_command_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_ADD_COMMAND_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_ADD_COMMAND_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_ADD_COMMAND_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_ADD_COMMAND_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class UIAddCommandResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - UIAddCommandResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UIAddCommandResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UIAddCommandResponse class destructor @@ -70,4 +71,4 @@ class UIAddCommandResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_ADD_COMMAND_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_ADD_COMMAND_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_request.h index d5f9ed3caa..816596055d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_request.h @@ -30,27 +30,28 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_ADD_SUBMENU_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_ADD_SUBMENU_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_ADD_SUBMENU_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_ADD_SUBMENU_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief UIAddSubmenuRequest command class **/ -class UIAddSubmenuRequest : public RequestToHMI { +class UIAddSubmenuRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief UIAddSubmenuRequest class constructor * * @param message Incoming SmartObject message **/ - UIAddSubmenuRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UIAddSubmenuRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UIAddSubmenuRequest class destructor @@ -70,4 +71,4 @@ class UIAddSubmenuRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_ADD_SUBMENU_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_ADD_SUBMENU_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_response.h index aeb08f2522..5f403703fe 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_ADD_SUBMENU_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_ADD_SUBMENU_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_ADD_SUBMENU_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_ADD_SUBMENU_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class UIAddSubmenuResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - UIAddSubmenuResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UIAddSubmenuResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UIAddSubmenuResponse class destructor @@ -70,4 +71,4 @@ class UIAddSubmenuResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_ADD_SUBMENU_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_ADD_SUBMENU_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_alert_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_alert_request.h index 14e5af00a7..9223244600 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_alert_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_alert_request.h @@ -30,27 +30,28 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_ALERT_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_ALERT_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_ALERT_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_ALERT_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief UIAlertRequest command class **/ -class UIAlertRequest : public RequestToHMI { +class UIAlertRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief UIAlertRequest class constructor * * @param message Incoming SmartObject message **/ - UIAlertRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UIAlertRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UIAlertRequest class destructor @@ -70,4 +71,4 @@ class UIAlertRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_ALERT_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_ALERT_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_alert_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_alert_response.h index fc27f3454a..2feb080332 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_alert_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_alert_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_ALERT_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_ALERT_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_ALERT_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_ALERT_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class UIAlertResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - UIAlertResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UIAlertResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UIAlertResponse class destructor @@ -70,4 +71,4 @@ class UIAlertResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_ALERT_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_ALERT_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_change_registration_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_change_registration_request.h index 109db0ee20..fb4b8b119e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_change_registration_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_change_registration_request.h @@ -30,27 +30,29 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_CHANGE_REGISTRATION_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_CHANGE_REGISTRATION_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_CHANGE_REGISTRATION_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_CHANGE_REGISTRATION_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief UIChangeRegistrationRequest command class **/ -class UIChangeRegistrationRequest : public RequestToHMI { +class UIChangeRegistrationRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief UIChangeRegistrationRequest class constructor * * @param message Incoming SmartObject message **/ - UIChangeRegistrationRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UIChangeRegistrationRequest( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UIChangeRegistrationRequest class destructor @@ -70,4 +72,4 @@ class UIChangeRegistrationRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_CHANGE_REGISTRATION_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_CHANGE_REGISTRATION_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_change_registration_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_change_registration_response.h index 526892f4e6..8c5105c6d3 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_change_registration_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_change_registration_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_CHANGE_REGISTRATION_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_CHANGE_REGISTRATION_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_CHANGE_REGISTRATION_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_CHANGE_REGISTRATION_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class UIChangeRegistratioResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - UIChangeRegistratioResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UIChangeRegistratioResponse( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UIChangeRegistratioResponse class destructor @@ -70,4 +72,4 @@ class UIChangeRegistratioResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_CHANGE_REGISTRATION_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_CHANGE_REGISTRATION_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_command_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_command_request.h index 51357eac17..82f563639d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_command_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_command_request.h @@ -30,27 +30,28 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_DELETE_COMMAND_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_DELETE_COMMAND_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_DELETE_COMMAND_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_DELETE_COMMAND_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief UIDeleteCommandRequest command class **/ -class UIDeleteCommandRequest : public RequestToHMI { +class UIDeleteCommandRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief UIDeleteCommandRequest class constructor * * @param message Incoming SmartObject message **/ - UIDeleteCommandRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UIDeleteCommandRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UIDeleteCommandRequest class destructor @@ -70,4 +71,4 @@ class UIDeleteCommandRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_DELETE_COMMAND_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_DELETE_COMMAND_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_command_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_command_response.h index da58aab33b..3956c5382f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_command_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_command_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_DELETE_COMMAND_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_DELETE_COMMAND_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_DELETE_COMMAND_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_DELETE_COMMAND_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class UIDeleteCommandResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - UIDeleteCommandResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UIDeleteCommandResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UIDeleteCommandResponse class destructor @@ -70,4 +71,4 @@ class UIDeleteCommandResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_DELETE_COMMAND_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_DELETE_COMMAND_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_submenu_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_submenu_request.h index 3e3203f530..87d12505d4 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_submenu_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_submenu_request.h @@ -30,27 +30,28 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_DELETE_SUBMENU_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_DELETE_SUBMENU_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_DELETE_SUBMENU_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_DELETE_SUBMENU_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief UIAddSubmenuRequest command class **/ -class UIDeleteSubmenuRequest : public RequestToHMI { +class UIDeleteSubmenuRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief UIDeleteSubmenuRequest class constructor * * @param message Incoming SmartObject message **/ - UIDeleteSubmenuRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UIDeleteSubmenuRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UIDeleteSubmenuRequest class destructor @@ -70,4 +71,4 @@ class UIDeleteSubmenuRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_DELETE_SUBMENU_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_DELETE_SUBMENU_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_submenu_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_submenu_response.h index 31127f786a..457031a1b0 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_submenu_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_submenu_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_DELETE_SUBMENU_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_DELETE_SUBMENU_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_DELETE_SUBMENU_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_DELETE_SUBMENU_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class UIDeleteSubmenuResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - UIDeleteSubmenuResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UIDeleteSubmenuResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UIDeleteSubmenuResponse class destructor @@ -70,4 +71,4 @@ class UIDeleteSubmenuResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_DELETE_SUBMENU_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_DELETE_SUBMENU_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_end_audio_pass_thru_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_end_audio_pass_thru_request.h index d7de9ce17c..4f13f04f11 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_end_audio_pass_thru_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_end_audio_pass_thru_request.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_END_AUDIO_PASS_THRU_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_END_AUDIO_PASS_THRU_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_END_AUDIO_PASS_THRU_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_END_AUDIO_PASS_THRU_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -43,15 +44,15 @@ namespace commands { * @brief UIEndAudioPassThruRequest command class * When this request is invoked, the audio capture stops **/ -class UIEndAudioPassThruRequest : public RequestToHMI { +class UIEndAudioPassThruRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief UIEndAudioPassThruRequest class constructor * * @param message Incoming SmartObject message **/ - UIEndAudioPassThruRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UIEndAudioPassThruRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UIEndAudioPassThruRequest class destructor @@ -71,4 +72,4 @@ class UIEndAudioPassThruRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_END_AUDIO_PASS_THRU_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_END_AUDIO_PASS_THRU_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_end_audio_pass_thru_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_end_audio_pass_thru_response.h index 6db27ec42b..433156f4f5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_end_audio_pass_thru_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_end_audio_pass_thru_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_END_AUDIO_PASS_THRU_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_END_AUDIO_PASS_THRU_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_END_AUDIO_PASS_THRU_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_END_AUDIO_PASS_THRU_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class UIEndAudioPassThruResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - UIEndAudioPassThruResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UIEndAudioPassThruResponse( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UIEndAudioPassThruResponse class destructor @@ -70,4 +72,4 @@ class UIEndAudioPassThruResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_END_AUDIO_PASS_THRU_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_END_AUDIO_PASS_THRU_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_capabilities_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_capabilities_request.h index 573a47d437..225998c5de 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_capabilities_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_capabilities_request.h @@ -30,27 +30,28 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_GET_CAPABILITIES_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_GET_CAPABILITIES_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_GET_CAPABILITIES_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_GET_CAPABILITIES_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief UIGetCapabilitiesRequest command class **/ -class UIGetCapabilitiesRequest : public RequestToHMI { +class UIGetCapabilitiesRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief UIGetCapabilitiesRequest class constructor * * @param message Incoming SmartObject message **/ - UIGetCapabilitiesRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UIGetCapabilitiesRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UIGetCapabilitiesRequest class destructor @@ -70,4 +71,4 @@ class UIGetCapabilitiesRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_GET_CAPABILITIES_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_GET_CAPABILITIES_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_capabilities_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_capabilities_response.h index 16fbd4db4f..fc5f4a0f0c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_capabilities_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_capabilities_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_GET_CAPABILITIES_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_GET_CAPABILITIES_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_GET_CAPABILITIES_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_GET_CAPABILITIES_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class UIGetCapabilitiesResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - UIGetCapabilitiesResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UIGetCapabilitiesResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UIGetCapabilitiesResponse class destructor @@ -70,4 +71,4 @@ class UIGetCapabilitiesResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_GET_CAPABILITIES_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_GET_CAPABILITIES_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_language_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_language_request.h index df97353a93..31549a4483 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_language_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_language_request.h @@ -30,27 +30,28 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_GET_LANGUAGE_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_GET_LANGUAGE_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_GET_LANGUAGE_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_GET_LANGUAGE_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief UIGetLanguageRequest command class **/ -class UIGetLanguageRequest : public RequestToHMI { +class UIGetLanguageRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief UIGetLanguageRequest class constructor * * @param message Incoming SmartObject message **/ - UIGetLanguageRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UIGetLanguageRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UIGetLanguageRequest class destructor @@ -70,4 +71,4 @@ class UIGetLanguageRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_GET_LANGUAGE_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_GET_LANGUAGE_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_language_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_language_response.h index 213b95188a..6d0a9c28cb 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_language_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_language_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_GET_LANGUAGE_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_GET_LANGUAGE_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_GET_LANGUAGE_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_GET_LANGUAGE_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class UIGetLanguageResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - UIGetLanguageResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UIGetLanguageResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UIGetLanguageResponse class destructor @@ -70,4 +71,4 @@ class UIGetLanguageResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_GET_LANGUAGE_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_GET_LANGUAGE_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_supported_languages_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_supported_languages_request.h index 7e77d82648..b276bdc94f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_supported_languages_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_supported_languages_request.h @@ -30,27 +30,29 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_GET_SUPPORTED_LANGUAGES_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_GET_SUPPORTED_LANGUAGES_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_GET_SUPPORTED_LANGUAGES_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_GET_SUPPORTED_LANGUAGES_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief UIGetSupportedLanguagesRequest command class **/ -class UIGetSupportedLanguagesRequest : public RequestToHMI { +class UIGetSupportedLanguagesRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief UIGetSupportedLanguagesRequest class constructor * * @param message Incoming SmartObject message **/ - UIGetSupportedLanguagesRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UIGetSupportedLanguagesRequest( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UIGetSupportedLanguagesRequest class destructor @@ -70,4 +72,4 @@ class UIGetSupportedLanguagesRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_GET_SUPPORTED_LANGUAGES_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_GET_SUPPORTED_LANGUAGES_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_supported_languages_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_supported_languages_response.h index 822e86ee50..6b9801efd0 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_supported_languages_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_supported_languages_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_GET_SUPPORTED_LANGUAGES_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_GET_SUPPORTED_LANGUAGES_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_GET_SUPPORTED_LANGUAGES_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_GET_SUPPORTED_LANGUAGES_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class UIGetSupportedLanguagesResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - UIGetSupportedLanguagesResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UIGetSupportedLanguagesResponse( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UIGetSupportedLanguagesResponse class destructor @@ -70,4 +72,4 @@ class UIGetSupportedLanguagesResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_GET_SUPPORTED_LANGUAGES_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_GET_SUPPORTED_LANGUAGES_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_is_ready_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_is_ready_request.h index c8af41834e..c2a56f11cd 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_is_ready_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_is_ready_request.h @@ -30,28 +30,29 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_IS_READY_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_IS_READY_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_IS_READY_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_IS_READY_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief UIIsReadyRequest command class **/ -class UIIsReadyRequest : public RequestToHMI, - public event_engine::EventObserver { +class UIIsReadyRequest : public app_mngr::commands::RequestToHMI, + public app_mngr::event_engine::EventObserver { public: /** * @brief UIIsReadyRequest class constructor * * @param message Incoming SmartObject message **/ - UIIsReadyRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UIIsReadyRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UIIsReadyRequest class destructor @@ -66,7 +67,7 @@ class UIIsReadyRequest : public RequestToHMI, /** * @brief On event callback **/ - void on_event(const event_engine::Event& event) OVERRIDE; + void on_event(const app_mngr::event_engine::Event& event) OVERRIDE; /** * @brief onTimeOut from requrst Controller @@ -86,4 +87,4 @@ class UIIsReadyRequest : public RequestToHMI, } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_IS_READY_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_IS_READY_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_is_ready_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_is_ready_response.h index 572143df64..145ab45a16 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_is_ready_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_is_ready_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_IS_READY_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_IS_READY_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_IS_READY_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_IS_READY_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class UIIsReadyResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - UIIsReadyResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UIIsReadyResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UIIsReadyResponse class destructor @@ -70,4 +71,4 @@ class UIIsReadyResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_IS_READY_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_IS_READY_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_audio_pass_thru_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_audio_pass_thru_request.h index d23278f00c..66ceab5d6e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_audio_pass_thru_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_audio_pass_thru_request.h @@ -30,27 +30,29 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_PERFORM_AUDIO_PASS_THRU_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_PERFORM_AUDIO_PASS_THRU_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_PERFORM_AUDIO_PASS_THRU_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_PERFORM_AUDIO_PASS_THRU_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief UIPerformAudioPassThruRequest command class **/ -class UIPerformAudioPassThruRequest : public RequestToHMI { +class UIPerformAudioPassThruRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief UIPerformAudioPassThruRequest class constructor * * @param message Incoming SmartObject message **/ - UIPerformAudioPassThruRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UIPerformAudioPassThruRequest( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UIPerformAudioPassThruRequest class destructor @@ -70,4 +72,4 @@ class UIPerformAudioPassThruRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_PERFORM_AUDIO_PASS_THRU_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_PERFORM_AUDIO_PASS_THRU_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_audio_pass_thru_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_audio_pass_thru_response.h index b7f85d995f..345c91d54c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_audio_pass_thru_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_audio_pass_thru_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_PERFORM_AUDIO_PASS_THRU_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_PERFORM_AUDIO_PASS_THRU_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_PERFORM_AUDIO_PASS_THRU_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_PERFORM_AUDIO_PASS_THRU_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class UIPerformAudioPassThruResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - UIPerformAudioPassThruResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UIPerformAudioPassThruResponse( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UIPerformAudioPassThruResponse class destructor @@ -70,4 +72,4 @@ class UIPerformAudioPassThruResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_PERFORM_AUDIO_PASS_THRU_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_PERFORM_AUDIO_PASS_THRU_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_interaction_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_interaction_request.h index 4053e14380..42eb807cc0 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_interaction_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_interaction_request.h @@ -30,27 +30,29 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_PERFORM_INTERACTION_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_PERFORM_INTERACTION_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_PERFORM_INTERACTION_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_PERFORM_INTERACTION_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief UIPerformInteractionRequest command class **/ -class UIPerformInteractionRequest : public RequestToHMI { +class UIPerformInteractionRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief UIPerformInteractionRequest class constructor * * @param message Incoming SmartObject message **/ - UIPerformInteractionRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UIPerformInteractionRequest( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UIPerformInteractionRequest class destructor @@ -70,4 +72,4 @@ class UIPerformInteractionRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_PERFORM_INTERACTION_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_PERFORM_INTERACTION_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_interaction_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_interaction_response.h index 1e2ea4b4d2..f3a0bd7f7a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_interaction_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_interaction_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_PERFORM_INTERACTION_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_PERFORM_INTERACTION_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_PERFORM_INTERACTION_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_PERFORM_INTERACTION_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class UIPerformInteractionResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - UIPerformInteractionResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UIPerformInteractionResponse( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UIPerformInteractionResponse class destructor @@ -70,4 +72,4 @@ class UIPerformInteractionResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_PERFORM_INTERACTION_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_PERFORM_INTERACTION_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_scrollable_message_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_scrollable_message_request.h index f4ec558b2a..de1c3b12c8 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_scrollable_message_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_scrollable_message_request.h @@ -30,27 +30,29 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SCROLLABLE_MESSAGE_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SCROLLABLE_MESSAGE_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SCROLLABLE_MESSAGE_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SCROLLABLE_MESSAGE_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief UIScrollableMessageRequest command class **/ -class UIScrollableMessageRequest : public RequestToHMI { +class UIScrollableMessageRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief UIScrollableMessageRequest class constructor * * @param message Incoming SmartObject message **/ - UIScrollableMessageRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UIScrollableMessageRequest( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UIScrollableMessageRequest class destructor @@ -70,4 +72,4 @@ class UIScrollableMessageRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SCROLLABLE_MESSAGE_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SCROLLABLE_MESSAGE_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_scrollable_message_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_scrollable_message_response.h index eae1d43aa8..4c9eb24374 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_scrollable_message_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_scrollable_message_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SCROLLABLE_MESSAGE_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SCROLLABLE_MESSAGE_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SCROLLABLE_MESSAGE_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SCROLLABLE_MESSAGE_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class UIScrollableMessageResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - UIScrollableMessageResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UIScrollableMessageResponse( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UIScrollableMessageResponse class destructor @@ -70,4 +72,4 @@ class UIScrollableMessageResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SCROLLABLE_MESSAGE_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SCROLLABLE_MESSAGE_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_send_haptic_data_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_send_haptic_data_request.h index fd4e3da739..b043a771db 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_send_haptic_data_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_send_haptic_data_request.h @@ -30,19 +30,20 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SEND_HAPTIC_DATA_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SEND_HAPTIC_DATA_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SEND_HAPTIC_DATA_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SEND_HAPTIC_DATA_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief UISendHapticDataRequest command class **/ -class UISendHapticDataRequest : public RequestToHMI { +class UISendHapticDataRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief UISendHapticDataRequest class constructor @@ -50,8 +51,8 @@ class UISendHapticDataRequest : public RequestToHMI { * @param message Incoming SmartObject message * @param application_manager Reference of application manager **/ - UISendHapticDataRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UISendHapticDataRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UISendHapticDataRequest class destructor @@ -71,4 +72,4 @@ class UISendHapticDataRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SEND_HAPTIC_DATA_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SEND_HAPTIC_DATA_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_send_haptic_data_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_send_haptic_data_response.h index 1fd2b82e7c..0a74057f82 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_send_haptic_data_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_send_haptic_data_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SEND_HAPTIC_DATA_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SEND_HAPTIC_DATA_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SEND_HAPTIC_DATA_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SEND_HAPTIC_DATA_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -50,8 +51,8 @@ class UISendHapticDataResponse : public ResponseFromHMI { * @param message Incoming SmartObject message * @param application_manager Reference of application manager **/ - UISendHapticDataResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UISendHapticDataResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UISendHapticDataResponse class destructor @@ -71,4 +72,4 @@ class UISendHapticDataResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SEND_HAPTIC_DATA_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SEND_HAPTIC_DATA_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_app_icon_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_app_icon_request.h index b790623019..9744bd0c89 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_app_icon_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_app_icon_request.h @@ -30,27 +30,28 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SET_APP_ICON_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SET_APP_ICON_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SET_APP_ICON_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SET_APP_ICON_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief UISetIconRequest command class **/ -class UISetAppIconRequest : public RequestToHMI { +class UISetAppIconRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief UISetIconRequest class constructor * * @param message Incoming SmartObject message **/ - UISetAppIconRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UISetAppIconRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UISetIconRequest class destructor @@ -70,4 +71,4 @@ class UISetAppIconRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SET_APP_ICON_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SET_APP_ICON_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_app_icon_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_app_icon_response.h index add258dd92..5bdb3597d5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_app_icon_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_app_icon_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SET_APP_ICON_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SET_APP_ICON_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SET_APP_ICON_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SET_APP_ICON_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class UISetAppIconResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - UISetAppIconResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UISetAppIconResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UISetIconResponse class destructor @@ -70,4 +71,4 @@ class UISetAppIconResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SET_APP_ICON_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SET_APP_ICON_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_display_layout_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_display_layout_request.h index 83eb37cd8c..bb31ba341c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_display_layout_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_display_layout_request.h @@ -29,27 +29,28 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SET_DISPLAY_LAYOUT_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SET_DISPLAY_LAYOUT_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SET_DISPLAY_LAYOUT_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SET_DISPLAY_LAYOUT_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief UiSetDisplayLayoutRequest command class **/ -class UiSetDisplayLayoutRequest : public RequestToHMI { +class UiSetDisplayLayoutRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief UiSetDisplayLayoutRequest class constructor * * @param message Incoming SmartObject message **/ - UiSetDisplayLayoutRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UiSetDisplayLayoutRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UiSetDisplayLayoutRequest class destructor @@ -69,4 +70,4 @@ class UiSetDisplayLayoutRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SET_DISPLAY_LAYOUT_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SET_DISPLAY_LAYOUT_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_display_layout_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_display_layout_response.h index 87531ae763..630e40662d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_display_layout_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_display_layout_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SET_DISPLAY_LAYOUT_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SET_DISPLAY_LAYOUT_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SET_DISPLAY_LAYOUT_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SET_DISPLAY_LAYOUT_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class UiSetDisplayLayoutResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - UiSetDisplayLayoutResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UiSetDisplayLayoutResponse( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UiSetDisplayLayoutResponse class destructor @@ -70,4 +72,4 @@ class UiSetDisplayLayoutResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SET_DISPLAY_LAYOUT_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SET_DISPLAY_LAYOUT_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_global_properties_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_global_properties_request.h index a1550e4168..91bbc78c06 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_global_properties_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_global_properties_request.h @@ -30,27 +30,29 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SET_GLOBAL_PROPERTIES_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SET_GLOBAL_PROPERTIES_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SET_GLOBAL_PROPERTIES_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SET_GLOBAL_PROPERTIES_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief UISetGlobalPropertiesRequest command class **/ -class UISetGlobalPropertiesRequest : public RequestToHMI { +class UISetGlobalPropertiesRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief UISetGlobalPropertiesRequest class constructor * * @param message Incoming SmartObject message **/ - UISetGlobalPropertiesRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UISetGlobalPropertiesRequest( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UIShowRequest class destructor @@ -70,4 +72,4 @@ class UISetGlobalPropertiesRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SET_GLOBAL_PROPERTIES_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SET_GLOBAL_PROPERTIES_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_global_properties_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_global_properties_response.h index 6cb64cd4dc..1beeca6eb9 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_global_properties_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_global_properties_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SET_GLOBAL_PROPERTIES_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SET_GLOBAL_PROPERTIES_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SET_GLOBAL_PROPERTIES_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SET_GLOBAL_PROPERTIES_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class UISetGlobalPropertiesResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - UISetGlobalPropertiesResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UISetGlobalPropertiesResponse( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UISetGlobalPropertiesResponse class destructor @@ -70,4 +72,4 @@ class UISetGlobalPropertiesResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SET_GLOBAL_PROPERTIES_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SET_GLOBAL_PROPERTIES_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_icon_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_icon_request.h index ef547b7a88..dd0c449818 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_icon_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_icon_request.h @@ -30,27 +30,28 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SET_ICON_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SET_ICON_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SET_ICON_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SET_ICON_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief UISetIconRequest command class **/ -class UISetIconRequest : public RequestToHMI { +class UISetIconRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief UISetIconRequest class constructor * * @param message Incoming SmartObject message **/ - UISetIconRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UISetIconRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UISetIconRequest class destructor @@ -70,4 +71,4 @@ class UISetIconRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SET_ICON_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SET_ICON_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_icon_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_icon_response.h index 3848e3614c..86b3ecd825 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_icon_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_icon_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SET_ICON_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SET_ICON_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SET_ICON_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SET_ICON_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,7 +50,7 @@ class UISetIconResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - UISetIconResponse(const MessageSharedPtr& message); + UISetIconResponse(const app_mngr::commands::MessageSharedPtr& message); /** * @brief UISetIconResponse class destructor @@ -69,4 +70,4 @@ class UISetIconResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SET_ICON_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SET_ICON_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_media_clock_timer_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_media_clock_timer_request.h index 5f09f4a76e..4765612de6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_media_clock_timer_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_media_clock_timer_request.h @@ -30,27 +30,29 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SET_MEDIA_CLOCK_TIMER_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SET_MEDIA_CLOCK_TIMER_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SET_MEDIA_CLOCK_TIMER_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SET_MEDIA_CLOCK_TIMER_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief UISetMediaClockTimerRequest command class **/ -class UISetMediaClockTimerRequest : public RequestToHMI { +class UISetMediaClockTimerRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief UISetMediaClockTimerRequest class constructor * * @param message Incoming SmartObject message **/ - UISetMediaClockTimerRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UISetMediaClockTimerRequest( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UISetMediaClockTimerRequest class destructor @@ -70,4 +72,4 @@ class UISetMediaClockTimerRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SET_MEDIA_CLOCK_TIMER_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SET_MEDIA_CLOCK_TIMER_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_media_clock_timer_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_media_clock_timer_response.h index 13d1884cf5..c8f4d5dbe1 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_media_clock_timer_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_media_clock_timer_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SET_MEDIA_CLOCK_TIMER_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SET_MEDIA_CLOCK_TIMER_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SET_MEDIA_CLOCK_TIMER_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SET_MEDIA_CLOCK_TIMER_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class UISetMediaClockTimerResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - UISetMediaClockTimerResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UISetMediaClockTimerResponse( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UISetMediaClockTimerResponse class destructor @@ -70,4 +72,4 @@ class UISetMediaClockTimerResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SET_MEDIA_CLOCK_TIMER_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SET_MEDIA_CLOCK_TIMER_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_show_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_show_request.h index e8b5861336..92e40493a6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_show_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_show_request.h @@ -30,27 +30,28 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SHOW_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SHOW_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SHOW_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SHOW_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief UIShowRequest command class **/ -class UIShowRequest : public RequestToHMI { +class UIShowRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief UIShowRequest class constructor * * @param message Incoming SmartObject message **/ - UIShowRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UIShowRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UIShowRequest class destructor @@ -70,4 +71,4 @@ class UIShowRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SHOW_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SHOW_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_show_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_show_response.h index 0b3ed18fd1..fd142fe527 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_show_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_show_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SHOW_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SHOW_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SHOW_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SHOW_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class UIShowResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - UIShowResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UIShowResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UIShowResponse class destructor @@ -70,4 +71,4 @@ class UIShowResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SHOW_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SHOW_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_slider_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_slider_request.h index aa336d24f6..4591ccaad2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_slider_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_slider_request.h @@ -30,27 +30,28 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SLIDER_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SLIDER_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SLIDER_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SLIDER_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief ButtonGetCapabilitiesRequest command class **/ -class UISliderRequest : public RequestToHMI { +class UISliderRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief UISliderRequest class constructor * * @param message Incoming SmartObject message **/ - UISliderRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UISliderRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UISliderRequest class destructor @@ -70,4 +71,4 @@ class UISliderRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SLIDER_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SLIDER_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_slider_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_slider_response.h index cb1379b97f..223bba1315 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_slider_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_slider_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SLIDER_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SLIDER_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SLIDER_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SLIDER_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class UISliderResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - UISliderResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UISliderResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UISliderResponse class destructor @@ -70,4 +71,4 @@ class UISliderResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_SLIDER_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SLIDER_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_app_list_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_app_list_request.h index 6e0d8f1317..51bb09049b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_app_list_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_app_list_request.h @@ -30,27 +30,28 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UPDATE_APP_LIST_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UPDATE_APP_LIST_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UPDATE_APP_LIST_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UPDATE_APP_LIST_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief UpdateAppListRequest command class **/ -class UpdateAppListRequest : public RequestToHMI { +class UpdateAppListRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief UpdateAppListRequest class constructor * * @param message Incoming SmartObject message **/ - UpdateAppListRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UpdateAppListRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UpdateAppListRequest class destructor @@ -70,4 +71,4 @@ class UpdateAppListRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UPDATE_APP_LIST_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UPDATE_APP_LIST_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_app_list_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_app_list_response.h index 4074b8506e..5f4d19efa4 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_app_list_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_app_list_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UPDATE_APP_LIST_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UPDATE_APP_LIST_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UPDATE_APP_LIST_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UPDATE_APP_LIST_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class UpdateAppListResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - UpdateAppListResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UpdateAppListResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UpdateAppListResponse class destructor @@ -70,4 +71,4 @@ class UpdateAppListResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UPDATE_APP_LIST_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UPDATE_APP_LIST_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_device_list_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_device_list_request.h index fdef31d4cb..95b4e8ace8 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_device_list_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_device_list_request.h @@ -30,31 +30,32 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UPDATE_DEVICE_LIST_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UPDATE_DEVICE_LIST_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UPDATE_DEVICE_LIST_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UPDATE_DEVICE_LIST_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" #include "application_manager/event_engine/event_observer.h" #include "utils/lock.h" #include "utils/conditional_variable.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief UpdateDeviceListRequest command class **/ -class UpdateDeviceListRequest : public RequestToHMI, - public event_engine::EventObserver { +class UpdateDeviceListRequest : public app_mngr::commands::RequestToHMI, + public app_mngr::event_engine::EventObserver { public: /** * @brief UpdateDeviceListRequest class constructor * * @param message Incoming SmartObject message **/ - UpdateDeviceListRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UpdateDeviceListRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UpdateDeviceListRequest class destructor @@ -72,7 +73,7 @@ class UpdateDeviceListRequest : public RequestToHMI, * when HMI will be ready * @param event The received event */ - virtual void on_event(const event_engine::Event& event); + virtual void on_event(const app_mngr::event_engine::Event& event); /** * @brief Need to stop execution StopMethod if HMI did not started @@ -90,4 +91,4 @@ class UpdateDeviceListRequest : public RequestToHMI, } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UPDATE_DEVICE_LIST_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UPDATE_DEVICE_LIST_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_device_list_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_device_list_response.h index 180d87568f..a97560309a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_device_list_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_device_list_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UPDATE_DEVICE_LIST_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UPDATE_DEVICE_LIST_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UPDATE_DEVICE_LIST_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UPDATE_DEVICE_LIST_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class UpdateDeviceListResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - UpdateDeviceListResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UpdateDeviceListResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UpdateDeviceListResponse class destructor @@ -70,4 +71,4 @@ class UpdateDeviceListResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UPDATE_DEVICE_LIST_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UPDATE_DEVICE_LIST_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_sdl_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_sdl_request.h index 84885d13b0..677d7043ff 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_sdl_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_sdl_request.h @@ -30,28 +30,29 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UPDATE_SDL_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UPDATE_SDL_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UPDATE_SDL_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UPDATE_SDL_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief UpdateSDLRequest command class **/ -class UpdateSDLRequest : public RequestToHMI { +class UpdateSDLRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief UpdateSDLRequest class constructor * * @param message Incoming SmartObject message **/ - UpdateSDLRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UpdateSDLRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UpdateSDLRequest class destructor @@ -71,4 +72,4 @@ class UpdateSDLRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UPDATE_SDL_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UPDATE_SDL_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_sdl_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_sdl_response.h index e1a545363e..6901105792 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_sdl_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_sdl_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UPDATE_SDL_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UPDATE_SDL_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UPDATE_SDL_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UPDATE_SDL_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class UpdateSDLResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - UpdateSDLResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UpdateSDLResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UpdateSDLResponse class destructor @@ -70,4 +71,4 @@ class UpdateSDLResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UPDATE_SDL_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UPDATE_SDL_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_diagnostic_message_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_diagnostic_message_request.h index 8bdc218141..b07ff5c660 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_diagnostic_message_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_diagnostic_message_request.h @@ -30,27 +30,29 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_DIAGNOSTIC_MESSAGE_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_DIAGNOSTIC_MESSAGE_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_DIAGNOSTIC_MESSAGE_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_DIAGNOSTIC_MESSAGE_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief VIDiagnosticMessageRequest command class **/ -class VIDiagnosticMessageRequest : public RequestToHMI { +class VIDiagnosticMessageRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief VIDiagnosticMessageRequest class constructor * * @param message Incoming SmartObject message **/ - VIDiagnosticMessageRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + VIDiagnosticMessageRequest( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief VIDiagnosticMessageRequest class destructor @@ -70,4 +72,4 @@ class VIDiagnosticMessageRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_DIAGNOSTIC_MESSAGE_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_DIAGNOSTIC_MESSAGE_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_diagnostic_message_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_diagnostic_message_response.h index e2e1744278..130763049f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_diagnostic_message_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_diagnostic_message_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_DIAGNOSTIC_MESSAGE_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_DIAGNOSTIC_MESSAGE_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_DIAGNOSTIC_MESSAGE_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_DIAGNOSTIC_MESSAGE_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class VIDiagnosticMessageResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - VIDiagnosticMessageResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + VIDiagnosticMessageResponse( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief VIDiagnosticMessageResponse class destructor @@ -70,4 +72,4 @@ class VIDiagnosticMessageResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_DIAGNOSTIC_MESSAGE_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_DIAGNOSTIC_MESSAGE_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_dtcs_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_dtcs_request.h index 54845b3cef..cdad4abaf1 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_dtcs_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_dtcs_request.h @@ -30,27 +30,28 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_GET_DTCS_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_GET_DTCS_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_GET_DTCS_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_GET_DTCS_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief VIGetDTCsRequest command class **/ -class VIGetDTCsRequest : public RequestToHMI { +class VIGetDTCsRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief VIGetDTCsRequest class constructor * * @param message Incoming SmartObject message **/ - VIGetDTCsRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + VIGetDTCsRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief VIGetDTCsRequest class destructor @@ -70,4 +71,4 @@ class VIGetDTCsRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_GET_DTCS_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_GET_DTCS_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_dtcs_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_dtcs_response.h index bb50a5a5b9..e7a98a5a42 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_dtcs_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_dtcs_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_GET_DTCS_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_GET_DTCS_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_GET_DTCS_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_GET_DTCS_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class VIGetDTCsResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - VIGetDTCsResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + VIGetDTCsResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief VIGetDTCsResponse class destructor @@ -70,4 +71,4 @@ class VIGetDTCsResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_GET_DTCS_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_GET_DTCS_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_vehicle_data_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_vehicle_data_request.h index 739b766626..33cb376129 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_vehicle_data_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_vehicle_data_request.h @@ -30,27 +30,28 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_GET_VEHICLE_DATA_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_GET_VEHICLE_DATA_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_GET_VEHICLE_DATA_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_GET_VEHICLE_DATA_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief VIGetVehicleDataRequest command class **/ -class VIGetVehicleDataRequest : public RequestToHMI { +class VIGetVehicleDataRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief VIGetVehicleDataRequest class constructor * * @param message Incoming SmartObject message **/ - VIGetVehicleDataRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + VIGetVehicleDataRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief VIGetVehicleDataRequest class destructor @@ -70,4 +71,4 @@ class VIGetVehicleDataRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_GET_VEHICLE_DATA_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_GET_VEHICLE_DATA_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_vehicle_data_request_template.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_vehicle_data_request_template.h index 6eb6f55d7d..d71914ab21 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_vehicle_data_request_template.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_vehicle_data_request_template.h @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_GET_VEHICLE_DATA_REQUEST_TEMPLATE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_GET_VEHICLE_DATA_REQUEST_TEMPLATE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_GET_VEHICLE_DATA_REQUEST_TEMPLATE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_GET_VEHICLE_DATA_REQUEST_TEMPLATE_H_ #include "application_manager/event_engine/event.h" #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** @@ -45,15 +46,17 @@ namespace commands { * Template class for sending 1 subscribe thin request **/ template <event_engine::Event::EventID eventID> -class VIGetVehicleDataRequestTemplate : public RequestToHMI { +class VIGetVehicleDataRequestTemplate + : public app_mngr::commands::RequestToHMI { public: /** * @brief VIGetVehicleDataRequestTemplate class constructor * * @param message Incoming SmartObject message **/ - VIGetVehicleDataRequestTemplate(const MessageSharedPtr& message, - ApplicationManager& application_manager) + VIGetVehicleDataRequestTemplate( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} /** @@ -70,4 +73,4 @@ class VIGetVehicleDataRequestTemplate : public RequestToHMI { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_GET_VEHICLE_DATA_REQUEST_TEMPLATE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_GET_VEHICLE_DATA_REQUEST_TEMPLATE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_vehicle_data_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_vehicle_data_response.h index 17df106d2b..24c7a4b3ef 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_vehicle_data_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_vehicle_data_response.h @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_GET_VEHICLE_DATA_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_GET_VEHICLE_DATA_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_GET_VEHICLE_DATA_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_GET_VEHICLE_DATA_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -50,8 +51,8 @@ class VIGetVehicleDataResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - VIGetVehicleDataResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + VIGetVehicleDataResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief VIGetVehicleDataResponse class destructor @@ -71,4 +72,4 @@ class VIGetVehicleDataResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_GET_VEHICLE_DATA_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_GET_VEHICLE_DATA_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_vehicle_data_response_template.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_vehicle_data_response_template.h index 78aeb63f62..23564d42b9 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_vehicle_data_response_template.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_vehicle_data_response_template.h @@ -30,14 +30,15 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_GET_VEHICLE_DATA_RESPONSE_TEMPLATE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_GET_VEHICLE_DATA_RESPONSE_TEMPLATE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_GET_VEHICLE_DATA_RESPONSE_TEMPLATE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_GET_VEHICLE_DATA_RESPONSE_TEMPLATE_H_ #include "application_manager/event_engine/event.h" -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** @@ -51,8 +52,9 @@ class VIGetVehicleDataResponseTemplate : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - VIGetVehicleDataResponseTemplate(const MessageSharedPtr& message, - ApplicationManager& application_manager) + VIGetVehicleDataResponseTemplate( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} /** @@ -71,4 +73,4 @@ class VIGetVehicleDataResponseTemplate : public ResponseFromHMI { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_GET_VEHICLE_DATA_RESPONSE_TEMPLATE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_GET_VEHICLE_DATA_RESPONSE_TEMPLATE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_vehicle_type_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_vehicle_type_request.h index a87605366d..81d0b30ec1 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_vehicle_type_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_vehicle_type_request.h @@ -30,27 +30,28 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_GET_VEHICLE_TYPE_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_GET_VEHICLE_TYPE_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_GET_VEHICLE_TYPE_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_GET_VEHICLE_TYPE_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief VIGetVehicleTypeRequest command class **/ -class VIGetVehicleTypeRequest : public RequestToHMI { +class VIGetVehicleTypeRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief VIGetVehicleTypeRequest class constructor * * @param message Incoming SmartObject message **/ - VIGetVehicleTypeRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + VIGetVehicleTypeRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief VIGetVehicleTypeRequest class destructor @@ -70,4 +71,4 @@ class VIGetVehicleTypeRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_GET_VEHICLE_TYPE_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_GET_VEHICLE_TYPE_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_vehicle_type_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_vehicle_type_response.h index 486ac32a54..47539d7a43 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_vehicle_type_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_vehicle_type_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_GET_VEHICLE_TYPE_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_GET_VEHICLE_TYPE_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_GET_VEHICLE_TYPE_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_GET_VEHICLE_TYPE_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class VIGetVehicleTypeResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - VIGetVehicleTypeResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + VIGetVehicleTypeResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief VIGetVehicleTypeResponse class destructor @@ -70,4 +71,4 @@ class VIGetVehicleTypeResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_GET_VEHICLE_TYPE_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_GET_VEHICLE_TYPE_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_is_ready_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_is_ready_request.h index 8b6687d2ac..c9fe964894 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_is_ready_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_is_ready_request.h @@ -30,28 +30,29 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_IS_READY_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_IS_READY_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_IS_READY_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_IS_READY_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief VIIsReadyRequest command class **/ -class VIIsReadyRequest : public RequestToHMI, - public event_engine::EventObserver { +class VIIsReadyRequest : public app_mngr::commands::RequestToHMI, + public app_mngr::event_engine::EventObserver { public: /** * @brief VIIsReadyRequest class constructor * * @param message Incoming SmartObject message **/ - VIIsReadyRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + VIIsReadyRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief VIIsReadyRequest class destructor @@ -66,7 +67,7 @@ class VIIsReadyRequest : public RequestToHMI, /** * @brief On event callback **/ - void on_event(const event_engine::Event& event) OVERRIDE; + void on_event(const app_mngr::event_engine::Event& event) OVERRIDE; /** * @brief onTimeOut from requrst Controller @@ -86,4 +87,4 @@ class VIIsReadyRequest : public RequestToHMI, } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_IS_READY_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_IS_READY_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_is_ready_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_is_ready_response.h index 10cda513e7..2244db2139 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_is_ready_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_is_ready_response.h @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_IS_READY_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_IS_READY_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_IS_READY_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_IS_READY_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -50,8 +51,8 @@ class VIIsReadyResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - VIIsReadyResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + VIIsReadyResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief VIIsReadyResponse class destructor @@ -71,4 +72,4 @@ class VIIsReadyResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_IS_READY_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_IS_READY_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_read_did_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_read_did_request.h index 885897dad7..43f8308c77 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_read_did_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_read_did_request.h @@ -30,27 +30,28 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_READ_DID_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_READ_DID_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_READ_DID_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_READ_DID_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief VIReadDIDRequest command class **/ -class VIReadDIDRequest : public RequestToHMI { +class VIReadDIDRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief VIReadDIDRequest class constructor * * @param message Incoming SmartObject message **/ - VIReadDIDRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + VIReadDIDRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief VIReadDIDRequest class destructor @@ -70,4 +71,4 @@ class VIReadDIDRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_READ_DID_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_READ_DID_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_read_did_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_read_did_response.h index e887ba2cde..2689fd203e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_read_did_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_read_did_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_READ_DID_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_READ_DID_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_READ_DID_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_READ_DID_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class VIReadDIDResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - VIReadDIDResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + VIReadDIDResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief VIReadDIDResponse class destructor @@ -70,4 +71,4 @@ class VIReadDIDResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_READ_DID_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_READ_DID_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_subscribe_vehicle_data_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_subscribe_vehicle_data_request.h index fa01e26b3a..d1f5fb1c6e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_subscribe_vehicle_data_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_subscribe_vehicle_data_request.h @@ -30,27 +30,29 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_SUBSCRIBE_VEHICLE_DATA_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_SUBSCRIBE_VEHICLE_DATA_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_SUBSCRIBE_VEHICLE_DATA_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_SUBSCRIBE_VEHICLE_DATA_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief VISubscribeVehicleDataRequest command class **/ -class VISubscribeVehicleDataRequest : public RequestToHMI { +class VISubscribeVehicleDataRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief VISubscribeVehicleDataRequest class constructor * * @param message Incoming SmartObject message **/ - VISubscribeVehicleDataRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + VISubscribeVehicleDataRequest( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief VISubscribeVehicleDataRequest class destructor @@ -70,4 +72,4 @@ class VISubscribeVehicleDataRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_SUBSCRIBE_VEHICLE_DATA_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_SUBSCRIBE_VEHICLE_DATA_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_subscribe_vehicle_data_request_template.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_subscribe_vehicle_data_request_template.h index fbd9b284e7..c9d61be36c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_subscribe_vehicle_data_request_template.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_subscribe_vehicle_data_request_template.h @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_SUBSCRIBE_VEHICLE_DATA_REQUEST_TEMPLATE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_SUBSCRIBE_VEHICLE_DATA_REQUEST_TEMPLATE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_SUBSCRIBE_VEHICLE_DATA_REQUEST_TEMPLATE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_SUBSCRIBE_VEHICLE_DATA_REQUEST_TEMPLATE_H_ #include "application_manager/event_engine/event.h" #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** @@ -45,15 +46,17 @@ namespace commands { * Template class for sending 1 subscribe thin request **/ template <event_engine::Event::EventID eventID> -class VISubscribeVehicleDataRequestTemplate : public RequestToHMI { +class VISubscribeVehicleDataRequestTemplate + : public app_mngr::commands::RequestToHMI { public: /** * @brief VISubscriveVehicleDataRequestTemplate class constructor * * @param message Incoming SmartObject message **/ - VISubscribeVehicleDataRequestTemplate(const MessageSharedPtr& message, - ApplicationManager& application_manager) + VISubscribeVehicleDataRequestTemplate( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} /** @@ -70,4 +73,4 @@ class VISubscribeVehicleDataRequestTemplate : public RequestToHMI { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_SUBSCRIBE_VEHICLE_DATA_REQUEST_TEMPLATE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_SUBSCRIBE_VEHICLE_DATA_REQUEST_TEMPLATE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_subscribe_vehicle_data_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_subscribe_vehicle_data_response.h index 522a25126b..5f5b02da8c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_subscribe_vehicle_data_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_subscribe_vehicle_data_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_SUBSCRIBE_VEHICLE_DATA_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_SUBSCRIBE_VEHICLE_DATA_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_SUBSCRIBE_VEHICLE_DATA_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_SUBSCRIBE_VEHICLE_DATA_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class VISubscribeVehicleDataResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - VISubscribeVehicleDataResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + VISubscribeVehicleDataResponse( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief VISubscribeVehicleDataResponse class destructor @@ -70,4 +72,4 @@ class VISubscribeVehicleDataResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_SUBSCRIBE_VEHICLE_DATA_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_SUBSCRIBE_VEHICLE_DATA_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_subscribe_vehicle_data_response_template.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_subscribe_vehicle_data_response_template.h index 76dac1a21e..7c1080880f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_subscribe_vehicle_data_response_template.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_subscribe_vehicle_data_response_template.h @@ -30,14 +30,15 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_SUBSCRIBE_VEHICLE_DATA_RESPONSE_TEMPLATE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_SUBSCRIBE_VEHICLE_DATA_RESPONSE_TEMPLATE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_SUBSCRIBE_VEHICLE_DATA_RESPONSE_TEMPLATE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_SUBSCRIBE_VEHICLE_DATA_RESPONSE_TEMPLATE_H_ #include "application_manager/event_engine/event.h" -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief VISubscriveVehicleDataResponseTemplate command class @@ -51,7 +52,8 @@ class VISubscribeVehicleDataResponseTemplate : public ResponseFromHMI { * @param message Incoming SmartObject message **/ VISubscribeVehicleDataResponseTemplate( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} /** @@ -70,4 +72,4 @@ class VISubscribeVehicleDataResponseTemplate : public ResponseFromHMI { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_SUBSCRIBE_VEHICLE_DATA_RESPONSE_TEMPLATE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_SUBSCRIBE_VEHICLE_DATA_RESPONSE_TEMPLATE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_unsubscribe_vehicle_data_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_unsubscribe_vehicle_data_request.h index 015bf06747..612e1f6bfb 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_unsubscribe_vehicle_data_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_unsubscribe_vehicle_data_request.h @@ -30,27 +30,30 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_UNSUBSCRIBE_VEHICLE_DATA_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_UNSUBSCRIBE_VEHICLE_DATA_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_UNSUBSCRIBE_VEHICLE_DATA_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_UNSUBSCRIBE_VEHICLE_DATA_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief VIUnsubscribeVehicleDataRequest command class **/ -class VIUnsubscribeVehicleDataRequest : public RequestToHMI { +class VIUnsubscribeVehicleDataRequest + : public app_mngr::commands::RequestToHMI { public: /** * @brief VIUnsubscribeVehicleDataRequest class constructor * * @param message Incoming SmartObject message **/ - VIUnsubscribeVehicleDataRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + VIUnsubscribeVehicleDataRequest( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief VIUnsubscribeVehicleDataRequest class destructor @@ -70,4 +73,4 @@ class VIUnsubscribeVehicleDataRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_UNSUBSCRIBE_VEHICLE_DATA_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_UNSUBSCRIBE_VEHICLE_DATA_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_unsubscribe_vehicle_data_request_template.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_unsubscribe_vehicle_data_request_template.h index 03c100aeec..eb92ed972b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_unsubscribe_vehicle_data_request_template.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_unsubscribe_vehicle_data_request_template.h @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_UNSUBSCRIBE_VEHICLE_DATA_REQUEST_TEMPLATE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_UNSUBSCRIBE_VEHICLE_DATA_REQUEST_TEMPLATE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_UNSUBSCRIBE_VEHICLE_DATA_REQUEST_TEMPLATE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_UNSUBSCRIBE_VEHICLE_DATA_REQUEST_TEMPLATE_H_ #include "application_manager/event_engine/event.h" #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** @@ -45,7 +46,8 @@ namespace commands { * Template class for sending 1 unsubscribe thin request **/ template <event_engine::Event::EventID eventID> -class VIUnsubscribeVehicleDataRequestTemplate : public RequestToHMI { +class VIUnsubscribeVehicleDataRequestTemplate + : public app_mngr::commands::RequestToHMI { public: /** * @brief VIUnsubscriveVehicleDataRequestTemplate class constructor @@ -53,7 +55,8 @@ class VIUnsubscribeVehicleDataRequestTemplate : public RequestToHMI { * @param message Incoming SmartObject message **/ VIUnsubscribeVehicleDataRequestTemplate( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} /** @@ -70,4 +73,4 @@ class VIUnsubscribeVehicleDataRequestTemplate : public RequestToHMI { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_UNSUBSCRIBE_VEHICLE_DATA_REQUEST_TEMPLATE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_UNSUBSCRIBE_VEHICLE_DATA_REQUEST_TEMPLATE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_unsubscribe_vehicle_data_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_unsubscribe_vehicle_data_response.h index c28f32ce5f..6d3523cd4e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_unsubscribe_vehicle_data_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_unsubscribe_vehicle_data_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_UNSUBSCRIBE_VEHICLE_DATA_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_UNSUBSCRIBE_VEHICLE_DATA_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_UNSUBSCRIBE_VEHICLE_DATA_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_UNSUBSCRIBE_VEHICLE_DATA_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class VIUnsubscribeVehicleDataResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - VIUnsubscribeVehicleDataResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + VIUnsubscribeVehicleDataResponse( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief VIUnsubscribeVehicleDataResponse class destructor @@ -70,4 +72,4 @@ class VIUnsubscribeVehicleDataResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_UNSUBSCRIBE_VEHICLE_DATA_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_UNSUBSCRIBE_VEHICLE_DATA_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_unsubscribe_vehicle_data_response_template.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_unsubscribe_vehicle_data_response_template.h index 9ae011890f..9717d1b6d2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_unsubscribe_vehicle_data_response_template.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_unsubscribe_vehicle_data_response_template.h @@ -30,14 +30,15 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_UNSUBSCRIBE_VEHICLE_DATA_RESPONSE_TEMPLATE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_UNSUBSCRIBE_VEHICLE_DATA_RESPONSE_TEMPLATE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_UNSUBSCRIBE_VEHICLE_DATA_RESPONSE_TEMPLATE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_UNSUBSCRIBE_VEHICLE_DATA_RESPONSE_TEMPLATE_H_ #include "application_manager/event_engine/event.h" -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** @@ -52,7 +53,8 @@ class VIUnsubscribeVehicleDataResponseTemplate : public ResponseFromHMI { * @param message Incoming SmartObject message **/ VIUnsubscribeVehicleDataResponseTemplate( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} /** @@ -72,4 +74,4 @@ class VIUnsubscribeVehicleDataResponseTemplate : public ResponseFromHMI { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_UNSUBSCRIBE_VEHICLE_DATA_RESPONSE_TEMPLATE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_UNSUBSCRIBE_VEHICLE_DATA_RESPONSE_TEMPLATE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_add_command_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_add_command_request.h index f75d3cdacb..ab9d404120 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_add_command_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_add_command_request.h @@ -30,27 +30,28 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_ADD_COMMAND_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_ADD_COMMAND_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_ADD_COMMAND_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_ADD_COMMAND_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief VRAddCommandRequest command class **/ -class VRAddCommandRequest : public RequestToHMI { +class VRAddCommandRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief VRAddCommandRequest class constructor * * @param message Incoming SmartObject message **/ - VRAddCommandRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + VRAddCommandRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief VRAddCommandRequest class destructor @@ -70,4 +71,4 @@ class VRAddCommandRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_ADD_COMMAND_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_ADD_COMMAND_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_add_command_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_add_command_response.h index 5bc6ccd381..bd8c38af5f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_add_command_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_add_command_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_ADD_COMMAND_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_ADD_COMMAND_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_ADD_COMMAND_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_ADD_COMMAND_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class VRAddCommandResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - VRAddCommandResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + VRAddCommandResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief VRAddCommandResponse class destructor @@ -70,4 +71,4 @@ class VRAddCommandResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_ADD_COMMAND_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_ADD_COMMAND_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_change_registration_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_change_registration_request.h index ea71f491f3..6eb58dba9d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_change_registration_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_change_registration_request.h @@ -30,27 +30,29 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_CHANGE_REGISTRATION_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_CHANGE_REGISTRATION_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_CHANGE_REGISTRATION_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_CHANGE_REGISTRATION_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief VRChangeRegistrationRequest command class **/ -class VRChangeRegistrationRequest : public RequestToHMI { +class VRChangeRegistrationRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief VRChangeRegistrationRequest class constructor * * @param message Incoming SmartObject message **/ - VRChangeRegistrationRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + VRChangeRegistrationRequest( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief VRChangeRegistrationRequest class destructor @@ -70,4 +72,4 @@ class VRChangeRegistrationRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_CHANGE_REGISTRATION_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_CHANGE_REGISTRATION_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_change_registration_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_change_registration_response.h index 50a5570f10..76bcb23d47 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_change_registration_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_change_registration_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_CHANGE_REGISTRATION_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_CHANGE_REGISTRATION_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_CHANGE_REGISTRATION_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_CHANGE_REGISTRATION_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class VRChangeRegistrationResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - VRChangeRegistrationResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + VRChangeRegistrationResponse( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief VRChangeRegistrationResponse class destructor @@ -70,4 +72,4 @@ class VRChangeRegistrationResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_CHANGE_REGISTRATION_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_CHANGE_REGISTRATION_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_delete_command_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_delete_command_request.h index 1d394b5c93..4812eef8b3 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_delete_command_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_delete_command_request.h @@ -30,27 +30,28 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_DELETE_COMMAND_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_DELETE_COMMAND_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_DELETE_COMMAND_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_DELETE_COMMAND_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief VRDeleteCommandRequest command class **/ -class VRDeleteCommandRequest : public RequestToHMI { +class VRDeleteCommandRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief VRDeleteCommandRequest class constructor * * @param message Incoming SmartObject message **/ - VRDeleteCommandRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + VRDeleteCommandRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief VRDeleteCommandRequest class destructor @@ -70,4 +71,4 @@ class VRDeleteCommandRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_DELETE_COMMAND_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_DELETE_COMMAND_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_delete_command_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_delete_command_response.h index 0102232bb3..b955616fbb 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_delete_command_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_delete_command_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_DELETE_COMMAND_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_DELETE_COMMAND_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_DELETE_COMMAND_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_DELETE_COMMAND_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class VRDeleteCommandResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - VRDeleteCommandResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + VRDeleteCommandResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief VRDeleteCommandResponse class destructor @@ -70,4 +71,4 @@ class VRDeleteCommandResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_DELETE_COMMAND_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_DELETE_COMMAND_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_capabilities_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_capabilities_request.h index ca9b211436..a68ae89a98 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_capabilities_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_capabilities_request.h @@ -30,27 +30,28 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_GET_CAPABILITIES_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_GET_CAPABILITIES_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_GET_CAPABILITIES_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_GET_CAPABILITIES_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief VRGetCapabilitiesRequest command class **/ -class VRGetCapabilitiesRequest : public RequestToHMI { +class VRGetCapabilitiesRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief VRGetCapabilitiesRequest class constructor * * @param message Incoming SmartObject message **/ - VRGetCapabilitiesRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + VRGetCapabilitiesRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief VRGetCapabilitiesRequest class destructor @@ -70,4 +71,4 @@ class VRGetCapabilitiesRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_GET_CAPABILITIES_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_GET_CAPABILITIES_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_capabilities_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_capabilities_response.h index 5c7297fd53..ae23e6c121 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_capabilities_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_capabilities_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_GET_CAPABILITIES_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_GET_CAPABILITIES_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_GET_CAPABILITIES_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_GET_CAPABILITIES_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class VRGetCapabilitiesResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - VRGetCapabilitiesResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + VRGetCapabilitiesResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief VRGetCapabilitiesResponse class destructor @@ -70,4 +71,4 @@ class VRGetCapabilitiesResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_GET_CAPABILITIES_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_GET_CAPABILITIES_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_language_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_language_request.h index 60103d8e40..58f2615fe0 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_language_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_language_request.h @@ -30,27 +30,28 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_GET_LANGUAGE_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_GET_LANGUAGE_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_GET_LANGUAGE_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_GET_LANGUAGE_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief VRGetLanguageRequest command class **/ -class VRGetLanguageRequest : public RequestToHMI { +class VRGetLanguageRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief VRGetLanguageRequest class constructor * * @param message Incoming SmartObject message **/ - VRGetLanguageRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + VRGetLanguageRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief VRGetLanguageRequest class destructor @@ -70,4 +71,4 @@ class VRGetLanguageRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_GET_LANGUAGE_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_GET_LANGUAGE_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_language_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_language_response.h index 21e36f7fa7..24fd906c0b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_language_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_language_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_GET_LANGUAGE_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_GET_LANGUAGE_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_GET_LANGUAGE_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_GET_LANGUAGE_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class VRGetLanguageResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - VRGetLanguageResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + VRGetLanguageResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief VRGetLanguageResponse class destructor @@ -70,4 +71,4 @@ class VRGetLanguageResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_GET_LANGUAGE_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_GET_LANGUAGE_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_supported_languages_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_supported_languages_request.h index 44207dc26f..3da4328821 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_supported_languages_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_supported_languages_request.h @@ -30,27 +30,29 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_GET_SUPPORTED_LANGUAGES_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_GET_SUPPORTED_LANGUAGES_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_GET_SUPPORTED_LANGUAGES_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_GET_SUPPORTED_LANGUAGES_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief VRGetSupportedLanguagesRequest command class **/ -class VRGetSupportedLanguagesRequest : public RequestToHMI { +class VRGetSupportedLanguagesRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief VRGetSupportedLanguagesRequest class constructor * * @param message Incoming SmartObject message **/ - VRGetSupportedLanguagesRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + VRGetSupportedLanguagesRequest( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief VRGetSupportedLanguagesRequest class destructor @@ -70,4 +72,4 @@ class VRGetSupportedLanguagesRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_GET_SUPPORTED_LANGUAGES_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_GET_SUPPORTED_LANGUAGES_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_supported_languages_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_supported_languages_response.h index a1fb4d8c92..fe6440cd27 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_supported_languages_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_supported_languages_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_GET_SUPPORTED_LANGUAGES_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_GET_SUPPORTED_LANGUAGES_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_GET_SUPPORTED_LANGUAGES_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_GET_SUPPORTED_LANGUAGES_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class VRGetSupportedLanguagesResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - VRGetSupportedLanguagesResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + VRGetSupportedLanguagesResponse( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief VRGetSupportedLanguagesResponse class destructor @@ -70,4 +72,4 @@ class VRGetSupportedLanguagesResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_GET_SUPPORTED_LANGUAGES_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_GET_SUPPORTED_LANGUAGES_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_is_ready_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_is_ready_request.h index 271f6134cc..988f4a8a8e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_is_ready_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_is_ready_request.h @@ -30,29 +30,30 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_IS_READY_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_IS_READY_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_IS_READY_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_IS_READY_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" #include "application_manager/message_helper.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief VRIsReadyRequest command class **/ -class VRIsReadyRequest : public RequestToHMI, - public event_engine::EventObserver { +class VRIsReadyRequest : public app_mngr::commands::RequestToHMI, + public app_mngr::event_engine::EventObserver { public: /** * @brief VRIsReadyRequest class constructor * * @param message Incoming SmartObject message **/ - VRIsReadyRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + VRIsReadyRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief VRIsReadyRequest class destructor @@ -67,7 +68,7 @@ class VRIsReadyRequest : public RequestToHMI, /** * @brief On event callback **/ - void on_event(const event_engine::Event& event) OVERRIDE; + void on_event(const app_mngr::event_engine::Event& event) OVERRIDE; /** * @brief onTimeOut from requrst Controller @@ -87,4 +88,4 @@ class VRIsReadyRequest : public RequestToHMI, } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_IS_READY_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_IS_READY_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_is_ready_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_is_ready_response.h index c4ca0bc154..a66757d916 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_is_ready_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_is_ready_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_IS_READY_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_IS_READY_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_IS_READY_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_IS_READY_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,8 @@ class VRIsReadyResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - VRIsReadyResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + VRIsReadyResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief VRIsReadyResponse class destructor @@ -70,4 +71,4 @@ class VRIsReadyResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_IS_READY_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_IS_READY_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_perform_interaction_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_perform_interaction_request.h index fe4e94bf1c..4d1801db5c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_perform_interaction_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_perform_interaction_request.h @@ -30,27 +30,29 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_PERFORM_INTERACTION_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_PERFORM_INTERACTION_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_PERFORM_INTERACTION_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_PERFORM_INTERACTION_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief VRPerformInteractionRequest command class **/ -class VRPerformInteractionRequest : public RequestToHMI { +class VRPerformInteractionRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief VRPerformInteractionRequest class constructor * * @param message Incoming SmartObject message **/ - VRPerformInteractionRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + VRPerformInteractionRequest( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief VRPerformInteractionRequest class destructor @@ -70,4 +72,4 @@ class VRPerformInteractionRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_PERFORM_INTERACTION_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_PERFORM_INTERACTION_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_perform_interaction_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_perform_interaction_response.h index d7c5a438a2..ece5069d7d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_perform_interaction_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_perform_interaction_response.h @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_PERFORM_INTERACTION_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_PERFORM_INTERACTION_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_PERFORM_INTERACTION_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_PERFORM_INTERACTION_RESPONSE_H_ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -49,8 +50,9 @@ class VRPerformInteractionResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - VRPerformInteractionResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + VRPerformInteractionResponse( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief TTSPerformInteractionResponse class destructor @@ -70,4 +72,4 @@ class VRPerformInteractionResponse : public ResponseFromHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_PERFORM_INTERACTION_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_PERFORM_INTERACTION_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/add_command_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/add_command_request.h index 2aed94c448..ec51263f87 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/add_command_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/add_command_request.h @@ -31,8 +31,8 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ADD_COMMAND_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ADD_COMMAND_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ADD_COMMAND_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ADD_COMMAND_REQUEST_H_ #include <string> @@ -40,22 +40,23 @@ #include "application_manager/commands/command_request_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief AddCommandRequest command class **/ -class AddCommandRequest : public CommandRequestImpl { +class AddCommandRequest : public app_mngr::commands::CommandRequestImpl { public: /** * @brief AddCommandRequest class constructor * * @param message Incoming SmartObject message **/ - AddCommandRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + AddCommandRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief AddCommandRequest class destructor @@ -72,7 +73,7 @@ class AddCommandRequest : public CommandRequestImpl { * * @param event The received event */ - void on_event(const event_engine::Event& event) FINAL; + void on_event(const app_mngr::event_engine::Event& event) FINAL; /** * @brief Function is called by RequestController when request execution time @@ -94,7 +95,7 @@ class AddCommandRequest : public CommandRequestImpl { * * @return TRUE on success, otherwise FALSE */ - bool CheckCommandName(ApplicationConstSharedPtr app); + bool CheckCommandName(app_mngr::ApplicationConstSharedPtr app); /* * @brief Check if command VR synonyms doesn't exist in application commands @@ -104,7 +105,7 @@ class AddCommandRequest : public CommandRequestImpl { * * @return TRUE on success, otherwise FALSE */ - bool CheckCommandVRSynonym(ApplicationConstSharedPtr app); + bool CheckCommandVRSynonym(app_mngr::ApplicationConstSharedPtr app); /* * @brief Check if command parent ID exists in submenu map @@ -113,7 +114,7 @@ class AddCommandRequest : public CommandRequestImpl { * * @return TRUE on success, otherwise FALSE */ - bool CheckCommandParentId(ApplicationConstSharedPtr app); + bool CheckCommandParentId(app_mngr::ApplicationConstSharedPtr app); /** * @brief Removes command from list when HMI sends negative response or @@ -162,4 +163,4 @@ class AddCommandRequest : public CommandRequestImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ADD_COMMAND_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ADD_COMMAND_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/add_command_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/add_command_response.h index b385b3bc5c..7cc4ebd32c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/add_command_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/add_command_response.h @@ -31,28 +31,29 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ADD_COMMAND_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ADD_COMMAND_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ADD_COMMAND_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ADD_COMMAND_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief AddCommandResponse command class **/ -class AddCommandResponse : public CommandResponseImpl { +class AddCommandResponse : public app_mngr::commands::CommandResponseImpl { public: /** * @brief AddCommandResponse class constructor * * @param message Incoming SmartObject message **/ - AddCommandResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + AddCommandResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief AddCommandResponse class destructor @@ -71,4 +72,4 @@ class AddCommandResponse : public CommandResponseImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ADD_COMMAND_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ADD_COMMAND_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/add_sub_menu_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/add_sub_menu_request.h index 36b0b38464..7cd3b3ac26 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/add_sub_menu_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/add_sub_menu_request.h @@ -31,28 +31,29 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ADD_SUB_MENU_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ADD_SUB_MENU_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ADD_SUB_MENU_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ADD_SUB_MENU_REQUEST_H_ #include "application_manager/commands/command_request_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief AddSubMenuRequest command class **/ -class AddSubMenuRequest : public CommandRequestImpl { +class AddSubMenuRequest : public app_mngr::commands::CommandRequestImpl { public: /** * @brief AddSubMenuRequest class constructor * * @param message Incoming SmartObject message **/ - AddSubMenuRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + AddSubMenuRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief AddSubMenuRequest class destructor @@ -69,7 +70,7 @@ class AddSubMenuRequest : public CommandRequestImpl { * * @param event The received event */ - void on_event(const event_engine::Event& event) FINAL; + void on_event(const app_mngr::event_engine::Event& event) FINAL; /** * @brief Init sets hash update mode for request @@ -90,4 +91,4 @@ class AddSubMenuRequest : public CommandRequestImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ADD_SUB_MENU_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ADD_SUB_MENU_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/add_sub_menu_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/add_sub_menu_response.h index b09254369f..50ab55995e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/add_sub_menu_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/add_sub_menu_response.h @@ -31,28 +31,29 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ADD_SUB_MENU_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ADD_SUB_MENU_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ADD_SUB_MENU_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ADD_SUB_MENU_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief AddSubMenuResponse command class **/ -class AddSubMenuResponse : public CommandResponseImpl { +class AddSubMenuResponse : public app_mngr::commands::CommandResponseImpl { public: /** * @brief AddSubMenuResponse class constructor * * @param message Incoming SmartObject message **/ - AddSubMenuResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + AddSubMenuResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief AddSubMenuResponse class destructor @@ -71,4 +72,4 @@ class AddSubMenuResponse : public CommandResponseImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ADD_SUB_MENU_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ADD_SUB_MENU_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/alert_maneuver_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/alert_maneuver_request.h index 17ad75b7a6..a0a0f66232 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/alert_maneuver_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/alert_maneuver_request.h @@ -31,30 +31,31 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ALERT_MANEUVER_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ALERT_MANEUVER_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ALERT_MANEUVER_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ALERT_MANEUVER_REQUEST_H_ #include "application_manager/commands/command_request_impl.h" #include "application_manager/commands/pending.h" #include "interfaces/MOBILE_API.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief AlertManeuverRequest command class **/ -class AlertManeuverRequest : public CommandRequestImpl { +class AlertManeuverRequest : public app_mngr::commands::CommandRequestImpl { public: /** * @brief AlertManeuverRequest class constructor * * @param message Incoming SmartObject message **/ - AlertManeuverRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + AlertManeuverRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief AlertManeuverRequest class destructor @@ -71,7 +72,7 @@ class AlertManeuverRequest : public CommandRequestImpl { * * @param event The received event */ - virtual void on_event(const event_engine::Event& event); + virtual void on_event(const app_mngr::event_engine::Event& event); private: /** @@ -95,7 +96,7 @@ class AlertManeuverRequest : public CommandRequestImpl { hmi_apis::Common_Result::eType navi_alert_maneuver_result_code_; std::string info_navi_; std::string info_tts_; - Pending pending_requests_; + app_mngr::commands::Pending pending_requests_; DISALLOW_COPY_AND_ASSIGN(AlertManeuverRequest); }; @@ -103,4 +104,4 @@ class AlertManeuverRequest : public CommandRequestImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ALERT_MANEUVER_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ALERT_MANEUVER_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/alert_maneuver_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/alert_maneuver_response.h index 2d45435a8b..ca475c40a7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/alert_maneuver_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/alert_maneuver_response.h @@ -31,28 +31,29 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ALERT_MANEUVER_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ALERT_MANEUVER_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ALERT_MANEUVER_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ALERT_MANEUVER_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief AlertManeuverResponse command class **/ -class AlertManeuverResponse : public CommandResponseImpl { +class AlertManeuverResponse : public app_mngr::commands::CommandResponseImpl { public: /** * @brief AlertManeuverResponse class constructor * * @param message Incoming SmartObject message **/ - AlertManeuverResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + AlertManeuverResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief AlertManeuverResponse class destructor @@ -71,4 +72,4 @@ class AlertManeuverResponse : public CommandResponseImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ALERT_MANEUVER_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ALERT_MANEUVER_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/alert_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/alert_request.h index 01b9782662..e80fab6458 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/alert_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/alert_request.h @@ -31,8 +31,8 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ALERT_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ALERT_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ALERT_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ALERT_REQUEST_H_ #include <string> @@ -40,22 +40,23 @@ #include "interfaces/MOBILE_API.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief AlertRequest command class **/ -class AlertRequest : public CommandRequestImpl { +class AlertRequest : public app_mngr::commands::CommandRequestImpl { public: /** * @brief AlertRequest class constructor * * @param message Incoming SmartObject message **/ - AlertRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + AlertRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief AlertRequest class destructor @@ -77,7 +78,7 @@ class AlertRequest : public CommandRequestImpl { * * @param event The received event */ - void on_event(const event_engine::Event& event); + void on_event(const app_mngr::event_engine::Event& event); protected: private: @@ -147,4 +148,4 @@ class AlertRequest : public CommandRequestImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ALERT_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ALERT_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/alert_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/alert_response.h index e03dad7564..f79f7961d2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/alert_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/alert_response.h @@ -31,28 +31,29 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ALERT_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ALERT_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ALERT_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ALERT_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief AlertResponse command class **/ -class AlertResponse : public CommandResponseImpl { +class AlertResponse : public app_mngr::commands::CommandResponseImpl { public: /** * @brief AlertResponse class constructor * * @param message Incoming SmartObject message **/ - AlertResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + AlertResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief AlertResponse class destructor @@ -71,4 +72,4 @@ class AlertResponse : public CommandResponseImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ALERT_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ALERT_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/change_registration_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/change_registration_request.h index 2cd8e386e0..d6a97b303b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/change_registration_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/change_registration_request.h @@ -31,8 +31,8 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_CHANGE_REGISTRATION_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_CHANGE_REGISTRATION_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_CHANGE_REGISTRATION_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_CHANGE_REGISTRATION_REQUEST_H_ #include <strings.h> @@ -41,7 +41,8 @@ #include "utils/macro.h" #include "utils/custom_string.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -50,15 +51,16 @@ namespace custom_str = utils::custom_string; /** * @brief ChangeRegistrationRequest command class **/ -class ChangeRegistrationRequest : public CommandRequestImpl { +class ChangeRegistrationRequest + : public app_mngr::commands::CommandRequestImpl { public: /** * @brief ChangeRegistrationRequest class constructor * * @param message Incoming SmartObject message **/ - ChangeRegistrationRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + ChangeRegistrationRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief ChangeRegistrationRequest class destructor @@ -75,7 +77,7 @@ class ChangeRegistrationRequest : public CommandRequestImpl { * * @param event The received event */ - void on_event(const event_engine::Event& event); + void on_event(const app_mngr::event_engine::Event& event); private: /* @@ -148,7 +150,7 @@ class ChangeRegistrationRequest : public CommandRequestImpl { */ struct CoincidencePredicateVR { CoincidencePredicateVR(const custom_str::CustomString& newItem) - : newItem_(newItem){}; + : newItem_(newItem) {} bool operator()(const smart_objects::SmartObject& obj) const { const custom_str::CustomString& vr_synonym = obj.asCustomString(); @@ -158,7 +160,7 @@ class ChangeRegistrationRequest : public CommandRequestImpl { const custom_str::CustomString& newItem_; }; - Pending pending_requests_; + app_mngr::commands::Pending pending_requests_; hmi_apis::Common_Result::eType ui_result_; hmi_apis::Common_Result::eType vr_result_; @@ -167,13 +169,13 @@ class ChangeRegistrationRequest : public CommandRequestImpl { std::string vr_response_info_; std::string tts_response_info_; - void SendVRRequest(ApplicationSharedPtr app, + void SendVRRequest(app_mngr::ApplicationSharedPtr app, smart_objects::SmartObject& msg_params); - void SendTTSRequest(ApplicationSharedPtr app, + void SendTTSRequest(app_mngr::ApplicationSharedPtr app, smart_objects::SmartObject& msg_params); - void SendUIRequest(ApplicationSharedPtr app, + void SendUIRequest(app_mngr::ApplicationSharedPtr app, smart_objects::SmartObject& msg_params, const int32_t hmi_language); @@ -183,4 +185,4 @@ class ChangeRegistrationRequest : public CommandRequestImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_CHANGE_REGISTRATION_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_CHANGE_REGISTRATION_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/change_registration_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/change_registration_response.h index 995764a15f..016459a107 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/change_registration_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/change_registration_response.h @@ -31,28 +31,31 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_CHANGE_REGISTRATION_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_CHANGE_REGISTRATION_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_CHANGE_REGISTRATION_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_CHANGE_REGISTRATION_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief ChangeRegistrationResponse command class **/ -class ChangeRegistrationResponse : public CommandResponseImpl { +class ChangeRegistrationResponse + : public app_mngr::commands::CommandResponseImpl { public: /** * @brief ChangeRegistrationResponse class constructor * * @param message Incoming SmartObject message **/ - ChangeRegistrationResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + ChangeRegistrationResponse( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief ChangeRegistrationResponse class destructor @@ -71,4 +74,4 @@ class ChangeRegistrationResponse : public CommandResponseImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_CHANGE_REGISTRATION_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_CHANGE_REGISTRATION_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/create_interaction_choice_set_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/create_interaction_choice_set_request.h index c00d310e7d..18a4ddbdb3 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/create_interaction_choice_set_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/create_interaction_choice_set_request.h @@ -31,8 +31,8 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_CREATE_INTERACTION_CHOICE_SET_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_CREATE_INTERACTION_CHOICE_SET_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_CREATE_INTERACTION_CHOICE_SET_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_CREATE_INTERACTION_CHOICE_SET_REQUEST_H_ #include <map> #include <string> @@ -42,7 +42,8 @@ #include "interfaces/MOBILE_API.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; class Application; @@ -51,15 +52,17 @@ namespace commands { /** * @brief CreateInteractionChoiceSetRequest command class **/ -class CreateInteractionChoiceSetRequest : public CommandRequestImpl { +class CreateInteractionChoiceSetRequest + : public app_mngr::commands::CommandRequestImpl { public: /** * @brief CreateInteractionChoiceSetRequest class constructor * * @param message Incoming SmartObject message **/ - CreateInteractionChoiceSetRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + CreateInteractionChoiceSetRequest( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief CreateInteractionChoiceSetRequest class destructor @@ -76,7 +79,7 @@ class CreateInteractionChoiceSetRequest : public CommandRequestImpl { * * @param event The received event */ - void on_event(const event_engine::Event& event) FINAL; + void on_event(const app_mngr::event_engine::Event& event) FINAL; /** * @brief Function is called by RequestController when request execution time @@ -143,7 +146,7 @@ class CreateInteractionChoiceSetRequest : public CommandRequestImpl { * @param app_id Application ID * */ - void SendVRAddCommandRequests(ApplicationSharedPtr const app); + void SendVRAddCommandRequests(app_mngr::ApplicationSharedPtr const app); /* * @brief Checks incoming choiseSet params. @@ -151,7 +154,8 @@ class CreateInteractionChoiceSetRequest : public CommandRequestImpl { * * @return Mobile result code */ - mobile_apis::Result::eType CheckChoiceSet(ApplicationConstSharedPtr app); + mobile_apis::Result::eType CheckChoiceSet( + app_mngr::ApplicationConstSharedPtr app); /* * @brief Predicate for using with CheckChoiceSet method to compare choice ID @@ -163,7 +167,7 @@ class CreateInteractionChoiceSetRequest : public CommandRequestImpl { CoincidencePredicateChoiceID(const uint32_t newItem) : newItem_(newItem) {} bool operator()(smart_objects::SmartObject obj) { - return obj[strings::choice_id].asUInt() == newItem_; + return obj[app_mngr::strings::choice_id].asUInt() == newItem_; } const uint32_t newItem_; @@ -177,10 +181,10 @@ class CreateInteractionChoiceSetRequest : public CommandRequestImpl { */ struct CoincidencePredicateMenuName { CoincidencePredicateMenuName(const std::string& newItem) - : newItem_(newItem){}; + : newItem_(newItem) {} bool operator()(smart_objects::SmartObject obj) { - return obj[strings::menu_name].asString() == newItem_; + return obj[app_mngr::strings::menu_name].asString() == newItem_; } const std::string& newItem_; @@ -267,4 +271,4 @@ class CreateInteractionChoiceSetRequest : public CommandRequestImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_CREATE_INTERACTION_CHOICE_SET_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_CREATE_INTERACTION_CHOICE_SET_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/create_interaction_choice_set_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/create_interaction_choice_set_response.h index bb2083e0b5..01ad4bd067 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/create_interaction_choice_set_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/create_interaction_choice_set_response.h @@ -31,28 +31,31 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_CREATE_INTERACTION_CHOICE_SET_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_CREATE_INTERACTION_CHOICE_SET_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_CREATE_INTERACTION_CHOICE_SET_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_CREATE_INTERACTION_CHOICE_SET_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief CreateInteractionChoiceSetResponse command class **/ -class CreateInteractionChoiceSetResponse : public CommandResponseImpl { +class CreateInteractionChoiceSetResponse + : public app_mngr::commands::CommandResponseImpl { public: /** * @brief CreateInteractionChoiceSetResponse class constructor * * @param message Incoming SmartObject message **/ - CreateInteractionChoiceSetResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + CreateInteractionChoiceSetResponse( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief CreateInteractionChoiceSetResponse class destructor @@ -71,4 +74,4 @@ class CreateInteractionChoiceSetResponse : public CommandResponseImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_CREATE_INTERACTION_CHOICE_SET_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_CREATE_INTERACTION_CHOICE_SET_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_command_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_command_request.h index afb2e226f6..484a9ff0a2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_command_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_command_request.h @@ -31,30 +31,31 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_DELETE_COMMAND_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_DELETE_COMMAND_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DELETE_COMMAND_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DELETE_COMMAND_REQUEST_H_ #include <string> #include "application_manager/commands/command_request_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief DeleteCommandRequest command class **/ -class DeleteCommandRequest : public CommandRequestImpl { +class DeleteCommandRequest : public app_mngr::commands::CommandRequestImpl { public: /** * @brief DeleteCommandRequest class constructor * * @param message Incoming SmartObject message **/ - DeleteCommandRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + DeleteCommandRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief DeleteCommandRequest class destructor @@ -71,7 +72,7 @@ class DeleteCommandRequest : public CommandRequestImpl { * * @param event The received event */ - void on_event(const event_engine::Event& event) FINAL; + void on_event(const app_mngr::event_engine::Event& event) FINAL; /** * @brief Init sets hash update mode for request @@ -112,4 +113,4 @@ class DeleteCommandRequest : public CommandRequestImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_DELETE_COMMAND_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DELETE_COMMAND_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_command_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_command_response.h index a6a25f9cd5..62ca7dc712 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_command_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_command_response.h @@ -31,28 +31,29 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_DELETE_COMMAND_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_DELETE_COMMAND_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DELETE_COMMAND_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DELETE_COMMAND_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief DeleteCommandResponse command class **/ -class DeleteCommandResponse : public CommandResponseImpl { +class DeleteCommandResponse : public app_mngr::commands::CommandResponseImpl { public: /** * @brief DeleteCommandResponse class constructor * * @param message Incoming SmartObject message **/ - DeleteCommandResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + DeleteCommandResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief DeleteCommandResponse class destructor @@ -71,4 +72,4 @@ class DeleteCommandResponse : public CommandResponseImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_DELETE_COMMAND_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DELETE_COMMAND_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_file_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_file_request.h index beb8ae73cd..9c87cd7fbf 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_file_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_file_request.h @@ -31,13 +31,14 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_DELETE_FILE_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_DELETE_FILE_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DELETE_FILE_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DELETE_FILE_REQUEST_H_ #include "application_manager/commands/command_request_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; struct AppFile; @@ -46,15 +47,15 @@ namespace commands { /** * @brief DeleteFileRequest command class **/ -class DeleteFileRequest : public CommandRequestImpl { +class DeleteFileRequest : public app_mngr::commands::CommandRequestImpl { public: /** * @brief DeleteFileRequest class constructor * * @param message Incoming SmartObject message **/ - DeleteFileRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + DeleteFileRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief DeleteFileRequest class destructor @@ -69,10 +70,11 @@ class DeleteFileRequest : public CommandRequestImpl { private: DISALLOW_COPY_AND_ASSIGN(DeleteFileRequest); - void SendFileRemovedNotification(const AppFile* file) const; + void SendFileRemovedNotification( + const application_manager::AppFile* file) const; }; } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_DELETE_FILE_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DELETE_FILE_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_file_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_file_response.h index 08f734ec13..95f8905a36 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_file_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_file_response.h @@ -31,28 +31,29 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_DELETE_FILE_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_DELETE_FILE_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DELETE_FILE_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DELETE_FILE_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief DeleteFileResponse command class **/ -class DeleteFileResponse : public CommandResponseImpl { +class DeleteFileResponse : public app_mngr::commands::CommandResponseImpl { public: /** * @brief DeleteFileResponse class constructor * * @param message Incoming SmartObject message **/ - DeleteFileResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + DeleteFileResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief DeleteFileResponse class destructor @@ -71,4 +72,4 @@ class DeleteFileResponse : public CommandResponseImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_DELETE_FILE_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DELETE_FILE_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_interaction_choice_set_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_interaction_choice_set_request.h index ead60be1af..a33c4c1bf5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_interaction_choice_set_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_interaction_choice_set_request.h @@ -31,29 +31,32 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_DELETE_INTERACTION_CHOICE_SET_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_DELETE_INTERACTION_CHOICE_SET_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DELETE_INTERACTION_CHOICE_SET_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DELETE_INTERACTION_CHOICE_SET_REQUEST_H_ #include "application_manager/commands/command_request_impl.h" #include "application_manager/application.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief DeleteInteractionChoiceSetRequest command class **/ -class DeleteInteractionChoiceSetRequest : public CommandRequestImpl { +class DeleteInteractionChoiceSetRequest + : public app_mngr::commands::CommandRequestImpl { public: /** * @brief DeleteInteractionChoiceSetRequest class constructor * * @param message Incoming SmartObject message **/ - DeleteInteractionChoiceSetRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + DeleteInteractionChoiceSetRequest( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief DeleteInteractionChoiceSetRequest class destructor @@ -76,9 +79,9 @@ class DeleteInteractionChoiceSetRequest : public CommandRequestImpl { * * @param app mobile application */ - bool ChoiceSetInUse(ApplicationConstSharedPtr app); + bool ChoiceSetInUse(app_mngr::ApplicationConstSharedPtr app); - void SendVrDeleteCommand(ApplicationSharedPtr app); + void SendVrDeleteCommand(app_mngr::ApplicationSharedPtr app); DISALLOW_COPY_AND_ASSIGN(DeleteInteractionChoiceSetRequest); }; @@ -86,4 +89,4 @@ class DeleteInteractionChoiceSetRequest : public CommandRequestImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_DELETE_INTERACTION_CHOICE_SET_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DELETE_INTERACTION_CHOICE_SET_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_interaction_choice_set_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_interaction_choice_set_response.h index 7a926399ee..1edf7d2740 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_interaction_choice_set_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_interaction_choice_set_response.h @@ -31,28 +31,31 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_DELETE_INTERACTION_CHOICE_SET_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_DELETE_INTERACTION_CHOICE_SET_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DELETE_INTERACTION_CHOICE_SET_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DELETE_INTERACTION_CHOICE_SET_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief DeleteInteractionChoiceSetResponse command class **/ -class DeleteInteractionChoiceSetResponse : public CommandResponseImpl { +class DeleteInteractionChoiceSetResponse + : public app_mngr::commands::CommandResponseImpl { public: /** * @brief DeleteInteractionChoiceSetResponse class constructor * * @param message Incoming SmartObject message **/ - DeleteInteractionChoiceSetResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + DeleteInteractionChoiceSetResponse( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief DeleteInteractionChoiceSetResponse class destructor @@ -71,4 +74,4 @@ class DeleteInteractionChoiceSetResponse : public CommandResponseImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_DELETE_INTERACTION_CHOICE_SET_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DELETE_INTERACTION_CHOICE_SET_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_sub_menu_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_sub_menu_request.h index 37863598ac..68e0fef19e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_sub_menu_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_sub_menu_request.h @@ -31,29 +31,30 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_DELETE_SUB_MENU_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_DELETE_SUB_MENU_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DELETE_SUB_MENU_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DELETE_SUB_MENU_REQUEST_H_ #include "application_manager/commands/command_request_impl.h" #include "application_manager/application.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief DeleteSubMenuRequest command class **/ -class DeleteSubMenuRequest : public CommandRequestImpl { +class DeleteSubMenuRequest : public app_mngr::commands::CommandRequestImpl { public: /** * @brief DeleteSubMenuRequest class constructor * * @param message Incoming SmartObject message **/ - DeleteSubMenuRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + DeleteSubMenuRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief DeleteSubMenuRequest class destructor @@ -70,7 +71,7 @@ class DeleteSubMenuRequest : public CommandRequestImpl { * * @param event The received event */ - void on_event(const event_engine::Event& event) FINAL; + void on_event(const app_mngr::event_engine::Event& event) FINAL; /** * @brief Init sets hash update mode for request @@ -85,7 +86,7 @@ class DeleteSubMenuRequest : public CommandRequestImpl { * * @return TRUE on success, otherwise FALSE */ - void DeleteSubMenuVRCommands(ApplicationConstSharedPtr app); + void DeleteSubMenuVRCommands(app_mngr::ApplicationConstSharedPtr app); /* * @brief Deletes UI commands from SDL for corresponding submenu ID @@ -94,7 +95,7 @@ class DeleteSubMenuRequest : public CommandRequestImpl { * * @return TRUE on success, otherwise FALSE */ - void DeleteSubMenuUICommands(ApplicationSharedPtr const app); + void DeleteSubMenuUICommands(app_mngr::ApplicationSharedPtr const app); DISALLOW_COPY_AND_ASSIGN(DeleteSubMenuRequest); }; @@ -102,4 +103,4 @@ class DeleteSubMenuRequest : public CommandRequestImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_DELETE_SUB_MENU_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DELETE_SUB_MENU_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_sub_menu_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_sub_menu_response.h index 4319d88ea0..54c667c448 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_sub_menu_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_sub_menu_response.h @@ -31,28 +31,29 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_DELETE_SUB_MENU_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_DELETE_SUB_MENU_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DELETE_SUB_MENU_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DELETE_SUB_MENU_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief ResetGlobalPropertiesResponse command class **/ -class DeleteSubMenuResponse : public CommandResponseImpl { +class DeleteSubMenuResponse : public app_mngr::commands::CommandResponseImpl { public: /** * @brief DeleteSubMenuResponse class constructor * * @param message Incoming SmartObject message **/ - DeleteSubMenuResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + DeleteSubMenuResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief DeleteSubMenuResponse class destructor @@ -71,4 +72,4 @@ class DeleteSubMenuResponse : public CommandResponseImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_DELETE_SUB_MENU_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DELETE_SUB_MENU_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/diagnostic_message_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/diagnostic_message_request.h index d55bce6613..630b72cfc7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/diagnostic_message_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/diagnostic_message_request.h @@ -31,28 +31,29 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_DIAGNOSTIC_MESSAGE_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_DIAGNOSTIC_MESSAGE_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DIAGNOSTIC_MESSAGE_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DIAGNOSTIC_MESSAGE_REQUEST_H_ #include "application_manager/commands/command_request_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief DiagnosticMessageRequest command class **/ -class DiagnosticMessageRequest : public CommandRequestImpl { +class DiagnosticMessageRequest : public app_mngr::commands::CommandRequestImpl { public: /** * @brief DiagnosticMessageRequest class constructor * * @param message Incoming SmartObject message **/ - DiagnosticMessageRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + DiagnosticMessageRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief DiagnosticMessageRequest class destructor @@ -69,7 +70,7 @@ class DiagnosticMessageRequest : public CommandRequestImpl { * * @param event The received event */ - void on_event(const event_engine::Event& event); + void on_event(const app_mngr::event_engine::Event& event); private: DISALLOW_COPY_AND_ASSIGN(DiagnosticMessageRequest); @@ -78,4 +79,4 @@ class DiagnosticMessageRequest : public CommandRequestImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_DIAGNOSTIC_MESSAGE_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DIAGNOSTIC_MESSAGE_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/diagnostic_message_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/diagnostic_message_response.h index 7ac810eabf..37447daaf9 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/diagnostic_message_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/diagnostic_message_response.h @@ -31,28 +31,30 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_DIAGNOSTIC_MESSAGE_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_DIAGNOSTIC_MESSAGE_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DIAGNOSTIC_MESSAGE_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DIAGNOSTIC_MESSAGE_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief DiagnosticMessageResponse command class **/ -class DiagnosticMessageResponse : public CommandResponseImpl { +class DiagnosticMessageResponse + : public app_mngr::commands::CommandResponseImpl { public: /** * @brief DiagnosticMessageResponse class constructor * * @param message Incoming SmartObject message **/ - DiagnosticMessageResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + DiagnosticMessageResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief DiagnosticMessageResponse class destructor @@ -71,4 +73,4 @@ class DiagnosticMessageResponse : public CommandResponseImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_DIAGNOSTIC_MESSAGE_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DIAGNOSTIC_MESSAGE_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/dial_number_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/dial_number_request.h index c8ae2b2cd9..03001c69d0 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/dial_number_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/dial_number_request.h @@ -30,26 +30,27 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_DIAL_NUMBER_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_DIAL_NUMBER_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DIAL_NUMBER_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DIAL_NUMBER_REQUEST_H_ #include "application_manager/commands/command_request_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief DialNumber request command class **/ -class DialNumberRequest : public CommandRequestImpl { +class DialNumberRequest : public app_mngr::commands::CommandRequestImpl { public: /** * \brief DialNumberRequest class constructor **/ - DialNumberRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + DialNumberRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * \brief DialNumberRequest class destructor @@ -71,7 +72,7 @@ class DialNumberRequest : public CommandRequestImpl { * * @param event The received event */ - void on_event(const event_engine::Event& event); + void on_event(const app_mngr::event_engine::Event& event); private: /** @@ -88,4 +89,4 @@ class DialNumberRequest : public CommandRequestImpl { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_DIAL_NUMBER_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DIAL_NUMBER_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/dial_number_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/dial_number_response.h index 688c9a7207..7041fb08c9 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/dial_number_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/dial_number_response.h @@ -31,28 +31,29 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_DIAL_NUMBER_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_DIAL_NUMBER_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DIAL_NUMBER_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DIAL_NUMBER_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief DialNumberResponse command class **/ -class DialNumberResponse : public CommandResponseImpl { +class DialNumberResponse : public app_mngr::commands::CommandResponseImpl { public: /** * @brief DialNumberResponse class constructor * * @param message Incoming SmartObject message **/ - DialNumberResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + DialNumberResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief DialNumberResponse class destructor @@ -71,4 +72,4 @@ class DialNumberResponse : public CommandResponseImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_DIAL_NUMBER_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DIAL_NUMBER_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/end_audio_pass_thru_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/end_audio_pass_thru_request.h index 04f4fa53ab..688aab4132 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/end_audio_pass_thru_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/end_audio_pass_thru_request.h @@ -31,28 +31,29 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_END_AUDIO_PASS_THRU_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_END_AUDIO_PASS_THRU_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_END_AUDIO_PASS_THRU_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_END_AUDIO_PASS_THRU_REQUEST_H_ #include "application_manager/commands/command_request_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief EndAudioPassThruRequest command class **/ -class EndAudioPassThruRequest : public CommandRequestImpl { +class EndAudioPassThruRequest : public app_mngr::commands::CommandRequestImpl { public: /** * @brief EndAudioPassThruRequest class constructor * * @param message Incoming SmartObject message **/ - EndAudioPassThruRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + EndAudioPassThruRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief EndAudioPassThruRequest class destructor @@ -69,7 +70,7 @@ class EndAudioPassThruRequest : public CommandRequestImpl { * * @param event The received event */ - void on_event(const event_engine::Event& event); + void on_event(const app_mngr::event_engine::Event& event); private: DISALLOW_COPY_AND_ASSIGN(EndAudioPassThruRequest); @@ -78,4 +79,4 @@ class EndAudioPassThruRequest : public CommandRequestImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_END_AUDIO_PASS_THRU_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_END_AUDIO_PASS_THRU_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/end_audio_pass_thru_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/end_audio_pass_thru_response.h index ca756cf5d7..408a77521a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/end_audio_pass_thru_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/end_audio_pass_thru_response.h @@ -31,28 +31,30 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_END_AUDIO_PASS_THRU_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_END_AUDIO_PASS_THRU_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_END_AUDIO_PASS_THRU_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_END_AUDIO_PASS_THRU_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief EndAudioPassThruResponse command class **/ -class EndAudioPassThruResponse : public CommandResponseImpl { +class EndAudioPassThruResponse + : public app_mngr::commands::CommandResponseImpl { public: /** * @brief EndAudioPassThruResponse class constructor * * @param message Incoming SmartObject message **/ - EndAudioPassThruResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + EndAudioPassThruResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief EndAudioPassThruResponse class destructor @@ -71,4 +73,4 @@ class EndAudioPassThruResponse : public CommandResponseImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_END_AUDIO_PASS_THRU_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_END_AUDIO_PASS_THRU_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/generic_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/generic_response.h index 6cfc6e5891..6119e7baba 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/generic_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/generic_response.h @@ -30,23 +30,24 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_GENERIC_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_GENERIC_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_GENERIC_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_GENERIC_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" #include "application_manager/message.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { -class GenericResponse : public CommandResponseImpl { +class GenericResponse : public app_mngr::commands::CommandResponseImpl { public: /** * \brief GenericResponse class constructor **/ - GenericResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) + GenericResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} /** @@ -66,4 +67,4 @@ class GenericResponse : public CommandResponseImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_GENERIC_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_GENERIC_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_dtcs_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_dtcs_request.h index b70c04bcca..265294e59d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_dtcs_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_dtcs_request.h @@ -31,28 +31,29 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_GET_DTCS_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_GET_DTCS_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_GET_DTCS_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_GET_DTCS_REQUEST_H_ #include "application_manager/commands/command_request_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief GetDTCsRequest command class **/ -class GetDTCsRequest : public CommandRequestImpl { +class GetDTCsRequest : public app_mngr::commands::CommandRequestImpl { public: /** * @brief GetDTCsRequest class constructor * * @param message Incoming SmartObject message **/ - GetDTCsRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + GetDTCsRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief GetDTCsRequest class destructor @@ -69,7 +70,7 @@ class GetDTCsRequest : public CommandRequestImpl { * * @param event The received event */ - void on_event(const event_engine::Event& event); + void on_event(const app_mngr::event_engine::Event& event); private: DISALLOW_COPY_AND_ASSIGN(GetDTCsRequest); @@ -78,4 +79,4 @@ class GetDTCsRequest : public CommandRequestImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_GET_DTCS_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_GET_DTCS_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_dtcs_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_dtcs_response.h index 10d0d0f86d..b282bd7de7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_dtcs_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_dtcs_response.h @@ -31,28 +31,29 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_GET_DTCS_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_GET_DTCS_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_GET_DTCS_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_GET_DTCS_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief GetDTCsResponse command class **/ -class GetDTCsResponse : public CommandResponseImpl { +class GetDTCsResponse : public app_mngr::commands::CommandResponseImpl { public: /** * @brief GetDTCsResponse class constructor * * @param message Incoming SmartObject message **/ - GetDTCsResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + GetDTCsResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief GetDTCsResponse class destructor @@ -71,4 +72,4 @@ class GetDTCsResponse : public CommandResponseImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_GET_DTCS_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_GET_DTCS_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_system_capability_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_system_capability_request.h index ba55a6b4cd..055a202745 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_system_capability_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_system_capability_request.h @@ -31,25 +31,28 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_GET_SYSTEM_CAPABILITY_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_GET_SYSTEM_CAPABILITY_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_GET_SYSTEM_CAPABILITY_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_GET_SYSTEM_CAPABILITY_REQUEST_H_ #include "application_manager/commands/command_request_impl.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { -class GetSystemCapabilityRequest : public CommandRequestImpl { +class GetSystemCapabilityRequest + : public app_mngr::commands::CommandRequestImpl { public: - GetSystemCapabilityRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + GetSystemCapabilityRequest( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); virtual ~GetSystemCapabilityRequest(); virtual void Run() OVERRIDE; - virtual void on_event(const event_engine::Event& event); + virtual void on_event(const app_mngr::event_engine::Event& event); private: DISALLOW_COPY_AND_ASSIGN(GetSystemCapabilityRequest); @@ -58,4 +61,4 @@ class GetSystemCapabilityRequest : public CommandRequestImpl { } // commands } // application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_GET_SYSTEM_CAPABILITY_REQUEST_H_
\ No newline at end of file +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_GET_SYSTEM_CAPABILITY_REQUEST_H_
\ No newline at end of file diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_system_capability_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_system_capability_response.h index 9fa6f9b5bb..9b98759d0c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_system_capability_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_system_capability_response.h @@ -31,20 +31,23 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_GET_SYSTEM_CAPABILITY_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_GET_SYSTEM_CAPABILITY_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_GET_SYSTEM_CAPABILITY_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_GET_SYSTEM_CAPABILITY_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { -class GetSystemCapabilityResponse : public CommandResponseImpl { +class GetSystemCapabilityResponse + : public app_mngr::commands::CommandResponseImpl { public: - GetSystemCapabilityResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + GetSystemCapabilityResponse( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); virtual ~GetSystemCapabilityResponse(); @@ -57,4 +60,4 @@ class GetSystemCapabilityResponse : public CommandResponseImpl { } // commands } // application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_GET_SYSTEM_CAPABILITY_RESPONSE_H_
\ No newline at end of file +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_GET_SYSTEM_CAPABILITY_RESPONSE_H_
\ No newline at end of file diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_vehicle_data_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_vehicle_data_request.h index 030a3afedc..a48d0e952c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_vehicle_data_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_vehicle_data_request.h @@ -31,13 +31,14 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_GET_VEHICLE_DATA_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_GET_VEHICLE_DATA_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_GET_VEHICLE_DATA_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_GET_VEHICLE_DATA_REQUEST_H_ #include "application_manager/commands/command_request_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; class SmartObject; @@ -46,15 +47,15 @@ namespace commands { /** * @brief GetVehicleDataRequest command class **/ -class GetVehicleDataRequest : public CommandRequestImpl { +class GetVehicleDataRequest : public app_mngr::commands::CommandRequestImpl { public: /** * @brief GetVehicleDataRequest class constructor * * @param message Incoming SmartObject message **/ - GetVehicleDataRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + GetVehicleDataRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief GetVehicleDataRequest class destructor @@ -67,7 +68,7 @@ class GetVehicleDataRequest : public CommandRequestImpl { virtual void Run(); protected: - virtual void on_event(const event_engine::Event& event); + virtual void on_event(const app_mngr::event_engine::Event& event); #ifdef HMI_DBUS_API private: @@ -91,4 +92,4 @@ class GetVehicleDataRequest : public CommandRequestImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_GET_VEHICLE_DATA_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_GET_VEHICLE_DATA_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_vehicle_data_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_vehicle_data_response.h index 11691d1f84..cf5bd6a122 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_vehicle_data_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_vehicle_data_response.h @@ -31,28 +31,29 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_GET_VEHICLE_DATA_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_GET_VEHICLE_DATA_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_GET_VEHICLE_DATA_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_GET_VEHICLE_DATA_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief GetVehicleDataResponse command class **/ -class GetVehicleDataResponse : public CommandResponseImpl { +class GetVehicleDataResponse : public app_mngr::commands::CommandResponseImpl { public: /** * @brief GetVehicleDataResponse class constructor * * @param message Incoming SmartObject message **/ - GetVehicleDataResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + GetVehicleDataResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief GetVehicleDataResponse class destructor @@ -71,4 +72,4 @@ class GetVehicleDataResponse : public CommandResponseImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_GET_VEHICLE_DATA_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_GET_VEHICLE_DATA_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_way_points_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_way_points_request.h index bf23121177..5084a26c36 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_way_points_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_way_points_request.h @@ -30,25 +30,26 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_GET_WAY_POINTS_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_GET_WAY_POINTS_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_GET_WAY_POINTS_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_GET_WAY_POINTS_REQUEST_H_ #include "application_manager/commands/command_request_impl.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief GetWayPointsRequest command class **/ -class GetWayPointsRequest : public CommandRequestImpl { +class GetWayPointsRequest : public app_mngr::commands::CommandRequestImpl { public: /** * \brief GetWayPointsRequest class constructor **/ - GetWayPointsRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + GetWayPointsRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * \brief GetWayPointsRequest class destructor @@ -64,7 +65,7 @@ class GetWayPointsRequest : public CommandRequestImpl { * * @param event The received event */ - virtual void on_event(const event_engine::Event& event); + virtual void on_event(const app_mngr::event_engine::Event& event); private: DISALLOW_COPY_AND_ASSIGN(GetWayPointsRequest); @@ -74,4 +75,4 @@ class GetWayPointsRequest : public CommandRequestImpl { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_GET_WAY_POINTS_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_GET_WAY_POINTS_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_way_points_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_way_points_response.h index cb4f840763..3387b29513 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_way_points_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_way_points_response.h @@ -30,26 +30,27 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_GET_WAY_POINTS_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_GET_WAY_POINTS_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_GET_WAY_POINTS_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_GET_WAY_POINTS_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief GetWayPointsResponse command class **/ -class GetWayPointsResponse : public CommandResponseImpl { +class GetWayPointsResponse : public app_mngr::commands::CommandResponseImpl { public: /** * \brief GetWayPointsResponse class constructor **/ - GetWayPointsResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + GetWayPointsResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * \brief GetWayPointsResponse class destructor @@ -69,4 +70,4 @@ class GetWayPointsResponse : public CommandResponseImpl { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_GET_WAY_POINTS_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_GET_WAY_POINTS_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/list_files_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/list_files_request.h index f1e9204eea..3fedf36626 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/list_files_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/list_files_request.h @@ -31,28 +31,29 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_LIST_FILES_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_LIST_FILES_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_LIST_FILES_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_LIST_FILES_REQUEST_H_ #include "application_manager/commands/command_request_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief ListFilesRequest command class **/ -class ListFilesRequest : public CommandRequestImpl { +class ListFilesRequest : public app_mngr::commands::CommandRequestImpl { public: /** * @brief ListFilesRequest class constructor * * @param message Incoming SmartObject message **/ - ListFilesRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + ListFilesRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief ListFilesRequest class destructor @@ -71,4 +72,4 @@ class ListFilesRequest : public CommandRequestImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_LIST_FILES_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_LIST_FILES_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/list_files_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/list_files_response.h index 81165c9bc4..12e2f87e37 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/list_files_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/list_files_response.h @@ -31,28 +31,29 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_LIST_FILES_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_LIST_FILES_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_LIST_FILES_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_LIST_FILES_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief ListFilesResponse command class **/ -class ListFilesResponse : public CommandResponseImpl { +class ListFilesResponse : public app_mngr::commands::CommandResponseImpl { public: /** * @brief ListFilesResponse class constructor * * @param message Incoming SmartObject message **/ - ListFilesResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + ListFilesResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief ListFilesResponse class destructor @@ -71,4 +72,4 @@ class ListFilesResponse : public CommandResponseImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_LIST_FILES_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_LIST_FILES_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_app_interface_unregistered_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_app_interface_unregistered_notification.h index 758fdaf760..3c34f13790 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_app_interface_unregistered_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_app_interface_unregistered_notification.h @@ -31,20 +31,22 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_APP_INTERFACE_UNREGISTERED_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_APP_INTERFACE_UNREGISTERED_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_APP_INTERFACE_UNREGISTERED_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_APP_INTERFACE_UNREGISTERED_NOTIFICATION_H_ #include "application_manager/commands/command_notification_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief OnAppInterfaceUnregisteredNotification class **/ -class OnAppInterfaceUnregisteredNotification : public CommandNotificationImpl { +class OnAppInterfaceUnregisteredNotification + : public app_mngr::commands::CommandNotificationImpl { public: /** * @brief OnAppInterfaceUnregisteredNotification class constructor @@ -52,7 +54,8 @@ class OnAppInterfaceUnregisteredNotification : public CommandNotificationImpl { * @param message Incoming SmartObject message **/ OnAppInterfaceUnregisteredNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager); + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnAppInterfaceUnregisteredNotification class destructor @@ -71,4 +74,4 @@ class OnAppInterfaceUnregisteredNotification : public CommandNotificationImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_APP_INTERFACE_UNREGISTERED_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_APP_INTERFACE_UNREGISTERED_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_audio_pass_thru_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_audio_pass_thru_notification.h index 68e1d4f548..edc721f091 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_audio_pass_thru_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_audio_pass_thru_notification.h @@ -31,13 +31,14 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_AUDIO_PASS_THRU_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_AUDIO_PASS_THRU_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_AUDIO_PASS_THRU_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_AUDIO_PASS_THRU_NOTIFICATION_H_ #include "application_manager/commands/command_notification_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -46,15 +47,17 @@ namespace commands { *binary data written from * microphone to mobile device while PerformAudioPassThru is active. **/ -class OnAudioPassThruNotification : public CommandNotificationImpl { +class OnAudioPassThruNotification + : public app_mngr::commands::CommandNotificationImpl { public: /** * @brief OnAudioPassThruNotification class constructor * * @param message Incoming SmartObject message **/ - OnAudioPassThruNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnAudioPassThruNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnAudioPassThruNotification class destructor @@ -73,4 +76,4 @@ class OnAudioPassThruNotification : public CommandNotificationImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_AUDIO_PASS_THRU_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_AUDIO_PASS_THRU_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_button_event_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_button_event_notification.h index d6a15caf4b..249fad1fd5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_button_event_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_button_event_notification.h @@ -31,14 +31,15 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_BUTTON_EVENT_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_BUTTON_EVENT_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_BUTTON_EVENT_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_BUTTON_EVENT_NOTIFICATION_H_ #include "application_manager/commands/command_notification_impl.h" #include "application_manager/application.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -48,15 +49,16 @@ namespace mobile { * @brief OnButtonEventNotification class is used to send notification * to mobile device that some button was pressed on HMI. **/ -class OnButtonEventNotification : public CommandNotificationImpl { +class OnButtonEventNotification + : public app_mngr::commands::CommandNotificationImpl { public: /** * @brief OnButtonEventNotification class constructor * * @param message Incoming SmartObject message **/ - OnButtonEventNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnButtonEventNotification(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnButtonEventNotification class destructor @@ -74,7 +76,7 @@ class OnButtonEventNotification : public CommandNotificationImpl { * * @param app Application to receive notification */ - void SendButtonEvent(ApplicationConstSharedPtr app); + void SendButtonEvent(app_mngr::ApplicationConstSharedPtr app); DISALLOW_COPY_AND_ASSIGN(OnButtonEventNotification); }; @@ -84,4 +86,4 @@ class OnButtonEventNotification : public CommandNotificationImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_BUTTON_EVENT_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_BUTTON_EVENT_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_button_press_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_button_press_notification.h index 9acd31f8da..526287c3fe 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_button_press_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_button_press_notification.h @@ -31,14 +31,15 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_BUTTON_PRESS_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_BUTTON_PRESS_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_BUTTON_PRESS_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_BUTTON_PRESS_NOTIFICATION_H_ #include "application_manager/commands/command_notification_impl.h" #include "application_manager/application.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -48,15 +49,16 @@ namespace mobile { * @brief OnButtonPressNotification class is used to send notification * to mobile device that some button was pressed on HMI. **/ -class OnButtonPressNotification : public CommandNotificationImpl { +class OnButtonPressNotification + : public app_mngr::commands::CommandNotificationImpl { public: /** * @brief OnButtonPressNotification class constructor * * @param message Incoming SmartObject message **/ - OnButtonPressNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnButtonPressNotification(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnButtonEventCommand class destructor @@ -74,7 +76,7 @@ class OnButtonPressNotification : public CommandNotificationImpl { * * @param app Application to receive notification */ - void SendButtonPress(ApplicationConstSharedPtr app); + void SendButtonPress(app_mngr::ApplicationConstSharedPtr app); DISALLOW_COPY_AND_ASSIGN(OnButtonPressNotification); }; @@ -83,4 +85,4 @@ class OnButtonPressNotification : public CommandNotificationImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_BUTTON_PRESS_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_BUTTON_PRESS_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_command_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_command_notification.h index e2faf9b05c..edc8392743 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_command_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_command_notification.h @@ -31,13 +31,14 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_COMMAND_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_COMMAND_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_COMMAND_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_COMMAND_NOTIFICATION_H_ #include "application_manager/commands/command_notification_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; class Application; @@ -47,15 +48,16 @@ namespace commands { * @brief OnCommandNotification class is used to send notification * to mobile device. **/ -class OnCommandNotification : public CommandNotificationImpl { +class OnCommandNotification + : public app_mngr::commands::CommandNotificationImpl { public: /** * @brief OnCommandNotification class constructor * * @param message Incoming SmartObject message **/ - OnCommandNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnCommandNotification(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnCommandNotification class destructor @@ -74,4 +76,4 @@ class OnCommandNotification : public CommandNotificationImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_COMMAND_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_COMMAND_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_driver_distraction_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_driver_distraction_notification.h index 1f9ee4ed8c..066039b915 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_driver_distraction_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_driver_distraction_notification.h @@ -31,13 +31,14 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_DRIVER_DISTRACTION_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_DRIVER_DISTRACTION_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_DRIVER_DISTRACTION_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_DRIVER_DISTRACTION_NOTIFICATION_H_ #include "application_manager/commands/command_notification_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -46,15 +47,17 @@ namespace mobile { /** * @brief OnDriverDistractionNotification class **/ -class OnDriverDistractionNotification : public CommandNotificationImpl { +class OnDriverDistractionNotification + : public app_mngr::commands::CommandNotificationImpl { public: /** * @brief OnDriverDistractionNotification class constructor * * @param message Incoming SmartObject message **/ - OnDriverDistractionNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnDriverDistractionNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnDriverDistractionNotification class destructor @@ -75,4 +78,4 @@ class OnDriverDistractionNotification : public CommandNotificationImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_DRIVER_DISTRACTION_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_DRIVER_DISTRACTION_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_hash_change_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_hash_change_notification.h index 07544c573f..54266b8a6a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_hash_change_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_hash_change_notification.h @@ -31,13 +31,14 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_HASH_CHANGE_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_HASH_CHANGE_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_HASH_CHANGE_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_HASH_CHANGE_NOTIFICATION_H_ #include "application_manager/commands/command_notification_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { namespace mobile { @@ -45,15 +46,16 @@ namespace mobile { /** * @brief OnHashChangeNotification class **/ -class OnHashChangeNotification : public CommandNotificationImpl { +class OnHashChangeNotification + : public app_mngr::commands::CommandNotificationImpl { public: /** * @brief OnHashChangeNotification class constructor * * @param message Incoming SmartObject message **/ - OnHashChangeNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnHashChangeNotification(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnHashChangeNotification class destructor @@ -73,4 +75,4 @@ class OnHashChangeNotification : public CommandNotificationImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_HASH_CHANGE_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_HASH_CHANGE_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_hmi_status_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_hmi_status_notification.h index 58659cbc4b..10810694ad 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_hmi_status_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_hmi_status_notification.h @@ -31,28 +31,30 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_HMI_STATUS_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_HMI_STATUS_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_HMI_STATUS_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_HMI_STATUS_NOTIFICATION_H_ #include "application_manager/commands/command_notification_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief OnHMIStatusNotification class **/ -class OnHMIStatusNotification : public CommandNotificationImpl { +class OnHMIStatusNotification + : public app_mngr::commands::CommandNotificationImpl { public: /** * @brief OnHMIStatusNotification class constructor * * @param message Incoming SmartObject message **/ - OnHMIStatusNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnHMIStatusNotification(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnHMIStatusNotification class destructor @@ -71,4 +73,4 @@ class OnHMIStatusNotification : public CommandNotificationImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_HMI_STATUS_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_HMI_STATUS_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_hmi_status_notification_from_mobile.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_hmi_status_notification_from_mobile.h index b2802e9fe9..cc7ff7ba0a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_hmi_status_notification_from_mobile.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_hmi_status_notification_from_mobile.h @@ -31,15 +31,16 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_HMI_STATUS_NOTIFICATION_FROM_MOBILE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_HMI_STATUS_NOTIFICATION_FROM_MOBILE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_HMI_STATUS_NOTIFICATION_FROM_MOBILE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_HMI_STATUS_NOTIFICATION_FROM_MOBILE_H_ #include "application_manager/commands/command_notification_from_mobile_impl.h" #include "application_manager/application_manager.h" #include "interfaces/MOBILE_API.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -47,15 +48,16 @@ namespace commands { * @brief OnHMIStatusNotificationFromMobile class **/ class OnHMIStatusNotificationFromMobile - : public CommandNotificationFromMobileImpl { + : public app_mngr::commands::CommandNotificationFromMobileImpl { public: /** * @brief OnHMIStatusNotificationFromMobile class constructor * * @param message Incoming SmartObject message **/ - OnHMIStatusNotificationFromMobile(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnHMIStatusNotificationFromMobile( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnHMIStatusNotificationFromMobile class destructor @@ -74,4 +76,4 @@ class OnHMIStatusNotificationFromMobile } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_HMI_STATUS_NOTIFICATION_FROM_MOBILE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_HMI_STATUS_NOTIFICATION_FROM_MOBILE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_keyboard_input_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_keyboard_input_notification.h index 911ca70cdf..a687810940 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_keyboard_input_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_keyboard_input_notification.h @@ -31,13 +31,14 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_KEYBOARD_INPUT_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_KEYBOARD_INPUT_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_KEYBOARD_INPUT_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_KEYBOARD_INPUT_NOTIFICATION_H_ #include "application_manager/commands/command_notification_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -46,15 +47,17 @@ namespace mobile { /** * @brief OnKeyBoardInputNotification class **/ -class OnKeyBoardInputNotification : public CommandNotificationImpl { +class OnKeyBoardInputNotification + : public app_mngr::commands::CommandNotificationImpl { public: /** * @brief OnKeyBoardInputNotification class constructor * * @param message Incoming SmartObject message **/ - OnKeyBoardInputNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnKeyBoardInputNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnKeyBoardInputNotification class destructor @@ -74,4 +77,4 @@ class OnKeyBoardInputNotification : public CommandNotificationImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_KEYBOARD_INPUT_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_KEYBOARD_INPUT_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_language_change_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_language_change_notification.h index bbd7679a6b..6149ce5617 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_language_change_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_language_change_notification.h @@ -31,28 +31,31 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_LANGUAGE_CHANGE_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_LANGUAGE_CHANGE_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_LANGUAGE_CHANGE_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_LANGUAGE_CHANGE_NOTIFICATION_H_ #include "application_manager/commands/command_notification_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief OnLanguageChangeNotification class **/ -class OnLanguageChangeNotification : public CommandNotificationImpl { +class OnLanguageChangeNotification + : public app_mngr::commands::CommandNotificationImpl { public: /** * @brief OnLanguageChangeNotification class constructor * * @param message Incoming SmartObject message **/ - OnLanguageChangeNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnLanguageChangeNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnLanguageChangeNotification class destructor @@ -71,4 +74,4 @@ class OnLanguageChangeNotification : public CommandNotificationImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_LANGUAGE_CHANGE_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_LANGUAGE_CHANGE_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_permissions_change_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_permissions_change_notification.h index 9fd2832218..dcefc7b8f3 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_permissions_change_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_permissions_change_notification.h @@ -31,28 +31,31 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_PERMISSIONS_CHANGE_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_PERMISSIONS_CHANGE_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_PERMISSIONS_CHANGE_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_PERMISSIONS_CHANGE_NOTIFICATION_H_ #include "application_manager/commands/command_notification_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief OnPermissionsChangeNotification class **/ -class OnPermissionsChangeNotification : public CommandNotificationImpl { +class OnPermissionsChangeNotification + : public app_mngr::commands::CommandNotificationImpl { public: /** * @brief OnPermissionsChangeNotification class constructor * * @param message Incoming SmartObject message **/ - OnPermissionsChangeNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnPermissionsChangeNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnPermissionsChangeNotification class destructor @@ -71,4 +74,4 @@ class OnPermissionsChangeNotification : public CommandNotificationImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_PERMISSIONS_CHANGE_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_PERMISSIONS_CHANGE_NOTIFICATION_H_ 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 d42e42649a..4077493938 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 @@ -30,13 +30,14 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_SYSTEM_REQUEST_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_SYSTEM_REQUEST_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_SYSTEM_REQUEST_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_SYSTEM_REQUEST_NOTIFICATION_H_ #include "application_manager/commands/command_notification_impl.h" #include <vector> -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -45,7 +46,8 @@ namespace mobile { /** * @brief OnSystemRequestNotification class **/ -class OnSystemRequestNotification : public CommandNotificationImpl { +class OnSystemRequestNotification + : public app_mngr::commands::CommandNotificationImpl { public: typedef std::vector<uint8_t> BinaryMessage; /** @@ -53,8 +55,9 @@ class OnSystemRequestNotification : public CommandNotificationImpl { * * @param message Incoming SmartObject message **/ - OnSystemRequestNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnSystemRequestNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnSystemRequestNotification class destructor @@ -83,4 +86,4 @@ class OnSystemRequestNotification : public CommandNotificationImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_SYSTEM_REQUEST_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_SYSTEM_REQUEST_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_tbt_client_state_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_tbt_client_state_notification.h index 42a81043f9..0e46afb667 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_tbt_client_state_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_tbt_client_state_notification.h @@ -31,28 +31,31 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_TBT_CLIENT_STATE_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_TBT_CLIENT_STATE_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_TBT_CLIENT_STATE_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_TBT_CLIENT_STATE_NOTIFICATION_H_ #include "application_manager/commands/command_notification_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief OnTBTClientStateNotification class **/ -class OnTBTClientStateNotification : public CommandNotificationImpl { +class OnTBTClientStateNotification + : public app_mngr::commands::CommandNotificationImpl { public: /** * @brief OnTBTClientStateNotification class constructor * * @param message Incoming SmartObject message **/ - OnTBTClientStateNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnTBTClientStateNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnTBTClientStateNotification class destructor @@ -71,4 +74,4 @@ class OnTBTClientStateNotification : public CommandNotificationImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_TBT_CLIENT_STATE_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_TBT_CLIENT_STATE_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_touch_event_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_touch_event_notification.h index abbf6787db..38a8e0c799 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_touch_event_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_touch_event_notification.h @@ -31,13 +31,14 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_TOUCH_EVENT_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_TOUCH_EVENT_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_TOUCH_EVENT_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_TOUCH_EVENT_NOTIFICATION_H_ #include "application_manager/commands/command_notification_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -46,15 +47,16 @@ namespace mobile { /** * @brief OnTouchEventNotification class **/ -class OnTouchEventNotification : public CommandNotificationImpl { +class OnTouchEventNotification + : public app_mngr::commands::CommandNotificationImpl { public: /** * @brief OnTouchEventNotification class constructor * * @param message Incoming SmartObject message **/ - OnTouchEventNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnTouchEventNotification(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnTouchEventNotification class destructor @@ -74,4 +76,4 @@ class OnTouchEventNotification : public CommandNotificationImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_TOUCH_EVENT_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_TOUCH_EVENT_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_vehicle_data_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_vehicle_data_notification.h index efe2ce8c55..8e6a2ca9ea 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_vehicle_data_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_vehicle_data_notification.h @@ -31,14 +31,15 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_VEHICLE_DATA_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_VEHICLE_DATA_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_VEHICLE_DATA_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_VEHICLE_DATA_NOTIFICATION_H_ #include "application_manager/commands/command_notification_impl.h" #include "application_manager/application.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { @@ -46,15 +47,16 @@ namespace commands { * @brief OnVehicleDataNotification class is used to send notification * to mobile device that some button was pressed on HMI. **/ -class OnVehicleDataNotification : public CommandNotificationImpl { +class OnVehicleDataNotification + : public app_mngr::commands::CommandNotificationImpl { public: /** * @brief OnVehicleDataNotification class constructor * * @param message Incoming SmartObject message **/ - OnVehicleDataNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnVehicleDataNotification(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnVehicleDataNotification class destructor @@ -72,7 +74,7 @@ class OnVehicleDataNotification : public CommandNotificationImpl { * * @param app Application to receive notification */ - void SendVehicleData(ApplicationConstSharedPtr app); + void SendVehicleData(app_mngr::ApplicationConstSharedPtr app); DISALLOW_COPY_AND_ASSIGN(OnVehicleDataNotification); }; @@ -80,4 +82,4 @@ class OnVehicleDataNotification : public CommandNotificationImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_VEHICLE_DATA_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_VEHICLE_DATA_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_way_point_change_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_way_point_change_notification.h index e33de74fd8..09eda79c79 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_way_point_change_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_way_point_change_notification.h @@ -30,25 +30,28 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_WAY_POINT_CHANGE_NOTIFICATION_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_WAY_POINT_CHANGE_NOTIFICATION_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_WAY_POINT_CHANGE_NOTIFICATION_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_WAY_POINT_CHANGE_NOTIFICATION_H_ #include "application_manager/commands/command_notification_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { -class OnWayPointChangeNotification : public CommandNotificationImpl { +class OnWayPointChangeNotification + : public app_mngr::commands::CommandNotificationImpl { public: /** * @brief OnWayPointChangeNotification class constructor * * @param message Incoming SmartObject message **/ - OnWayPointChangeNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + OnWayPointChangeNotification( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief OnWayPointChangeNotification class destructor @@ -66,4 +69,4 @@ class OnWayPointChangeNotification : public CommandNotificationImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_ON_WAY_POINT_CHANGE_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_WAY_POINT_CHANGE_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_audio_pass_thru_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_audio_pass_thru_request.h index 6e0e634459..6096792744 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_audio_pass_thru_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_audio_pass_thru_request.h @@ -31,29 +31,32 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_PERFORM_AUDIO_PASS_THRU_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_PERFORM_AUDIO_PASS_THRU_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_PERFORM_AUDIO_PASS_THRU_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_PERFORM_AUDIO_PASS_THRU_REQUEST_H_ #include "application_manager/commands/command_request_impl.h" #include "utils/macro.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief PerformAudioPassThruRequest command class **/ -class PerformAudioPassThruRequest : public CommandRequestImpl { +class PerformAudioPassThruRequest + : public app_mngr::commands::CommandRequestImpl { public: /** * @brief PerformAudioPassThruRequest class constructor * * @param message Incoming SmartObject message **/ - PerformAudioPassThruRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + PerformAudioPassThruRequest( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief PerformAudioPassThruRequest class destructor @@ -82,7 +85,7 @@ class PerformAudioPassThruRequest : public CommandRequestImpl { * * @param event The received event */ - void on_event(const event_engine::Event& event); + void on_event(const app_mngr::event_engine::Event& event); private: /** @@ -179,7 +182,8 @@ class PerformAudioPassThruRequest : public CommandRequestImpl { * result for mobile app */ AudioPassThruResults PrepareAudioPassThruResultCodeForResponse( - const ResponseInfo& ui_response, const ResponseInfo& tts_response); + const app_mngr::commands::ResponseInfo& ui_response, + const app_mngr::commands::ResponseInfo& tts_response); hmi_apis::Common_Result::eType result_tts_speak_; hmi_apis::Common_Result::eType result_ui_; @@ -192,4 +196,4 @@ class PerformAudioPassThruRequest : public CommandRequestImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_PERFORM_AUDIO_PASS_THRU_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_PERFORM_AUDIO_PASS_THRU_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_audio_pass_thru_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_audio_pass_thru_response.h index 29005d7b01..bdc74eb1c4 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_audio_pass_thru_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_audio_pass_thru_response.h @@ -31,28 +31,31 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_PERFORM_AUDIO_PASS_THRU_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_PERFORM_AUDIO_PASS_THRU_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_PERFORM_AUDIO_PASS_THRU_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_PERFORM_AUDIO_PASS_THRU_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief PerformAudioPassThruResponse command class **/ -class PerformAudioPassThruResponse : public CommandResponseImpl { +class PerformAudioPassThruResponse + : public app_mngr::commands::CommandResponseImpl { public: /** * @brief PerformAudioPassThruResponse class constructor * * @param message Incoming SmartObject message **/ - PerformAudioPassThruResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + PerformAudioPassThruResponse( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief PerformAudioPassThruResponse class destructor @@ -71,4 +74,4 @@ class PerformAudioPassThruResponse : public CommandResponseImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_PERFORM_AUDIO_PASS_THRU_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_PERFORM_AUDIO_PASS_THRU_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_interaction_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_interaction_request.h index c482e2d548..e9f4fb60e4 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_interaction_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_interaction_request.h @@ -31,8 +31,8 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_PERFORM_INTERACTION_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_PERFORM_INTERACTION_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_PERFORM_INTERACTION_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_PERFORM_INTERACTION_REQUEST_H_ #include <string> @@ -40,7 +40,8 @@ #include "application_manager/application.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; class Application; @@ -49,15 +50,16 @@ namespace commands { /** * @brief PerformInteractionRequest command class **/ -class PerformInteractionRequest : public CommandRequestImpl { +class PerformInteractionRequest + : public app_mngr::commands::CommandRequestImpl { public: /** * @brief PerformInteractionRequest class constructor * * @param message Incoming SmartObject message **/ - PerformInteractionRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + PerformInteractionRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief PerformInteractionRequest class destructor @@ -79,7 +81,7 @@ class PerformInteractionRequest : public CommandRequestImpl { * * @param event The received event */ - virtual void on_event(const event_engine::Event& event); + virtual void on_event(const app_mngr::event_engine::Event& event); /* * @brief Function is called by RequestController when request execution time @@ -113,7 +115,7 @@ class PerformInteractionRequest : public CommandRequestImpl { * */ void SendUIPerformInteractionRequest( - application_manager::ApplicationSharedPtr const app); + app_mngr::ApplicationSharedPtr const app); /* * @brief Sends TTS PerformInteraction request to HMI @@ -122,14 +124,14 @@ class PerformInteractionRequest : public CommandRequestImpl { * */ void SendVRPerformInteractionRequest( - application_manager::ApplicationSharedPtr const app); + app_mngr::ApplicationSharedPtr const app); /* * @brief Sends UI Show VR help request to HMI * * @param app_id Application ID */ - void SendUIShowVRHelpRequest(ApplicationSharedPtr const app); + void SendUIShowVRHelpRequest(app_mngr::ApplicationSharedPtr const app); /* * @brief Checks if incoming choice set doesn't has similar menu names. @@ -139,8 +141,7 @@ class PerformInteractionRequest : public CommandRequestImpl { * return Return TRUE if there are no similar menu names in choice set, * otherwise FALSE */ - bool CheckChoiceSetMenuNames( - application_manager::ApplicationSharedPtr const app); + bool CheckChoiceSetMenuNames(app_mngr::ApplicationSharedPtr const app); /* * @brief Checks if incoming choice set doesn't has similar VR synonyms. @@ -150,8 +151,7 @@ class PerformInteractionRequest : public CommandRequestImpl { * return Return TRUE if there are no similar VR synonyms in choice set, * otherwise FALSE */ - bool CheckChoiceSetVRSynonyms( - application_manager::ApplicationSharedPtr const app); + bool CheckChoiceSetVRSynonyms(app_mngr::ApplicationSharedPtr const app); /* * @brief Checks if request with non-sequential positions of vrHelpItems @@ -162,8 +162,7 @@ class PerformInteractionRequest : public CommandRequestImpl { * @return TRUE if vrHelpItems positions are sequential, * otherwise FALSE */ - bool CheckVrHelpItemPositions( - application_manager::ApplicationSharedPtr const app); + bool CheckVrHelpItemPositions(app_mngr::ApplicationSharedPtr const app); /* * @brief Disable PerformInteraction state in application and @@ -191,7 +190,8 @@ class PerformInteractionRequest : public CommandRequestImpl { * @return if ChoiceID from response is correct method returns TRUE * otherwise returns FALSE. */ - bool CheckChoiceIDFromResponse(ApplicationSharedPtr app, int32_t choice_id); + bool CheckChoiceIDFromResponse(app_mngr::ApplicationSharedPtr app, + int32_t choice_id); /** * @brief Checks for a match of choice ID, in @@ -205,7 +205,7 @@ class PerformInteractionRequest : public CommandRequestImpl { * true. */ bool CheckChoiceIDFromRequest( - ApplicationSharedPtr app, + app_mngr::ApplicationSharedPtr app, const size_t choice_set_id_list_length, const smart_objects::SmartObject& choice_set_id_list) const; @@ -238,4 +238,4 @@ class PerformInteractionRequest : public CommandRequestImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_PERFORM_INTERACTION_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_PERFORM_INTERACTION_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_interaction_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_interaction_response.h index 209b469d0d..389e20a673 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_interaction_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_interaction_response.h @@ -31,28 +31,31 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_PERFORM_INTERACTION_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_PERFORM_INTERACTION_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_PERFORM_INTERACTION_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_PERFORM_INTERACTION_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief PerformInteractionResponse command class **/ -class PerformInteractionResponse : public CommandResponseImpl { +class PerformInteractionResponse + : public app_mngr::commands::CommandResponseImpl { public: /** * @brief PerformInteractionResponse class constructor * * @param message Incoming SmartObject message **/ - PerformInteractionResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + PerformInteractionResponse( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief PerformInteractionResponse class destructor @@ -71,4 +74,4 @@ class PerformInteractionResponse : public CommandResponseImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_PERFORM_INTERACTION_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_PERFORM_INTERACTION_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/put_file_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/put_file_request.h index ad13f0ee52..4b7d224ba4 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/put_file_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/put_file_request.h @@ -31,29 +31,30 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_PUT_FILE_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_PUT_FILE_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_PUT_FILE_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_PUT_FILE_REQUEST_H_ #include "application_manager/commands/command_request_impl.h" #include "utils/macro.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief PutFileRequest command class **/ -class PutFileRequest : public CommandRequestImpl { +class PutFileRequest : public app_mngr::commands::CommandRequestImpl { public: /** * @brief PutFileRequest class constructor * * @param message Incoming SmartObject message **/ - PutFileRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + PutFileRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief PutFileRequest class destructor @@ -79,4 +80,4 @@ class PutFileRequest : public CommandRequestImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_PUT_FILE_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_PUT_FILE_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/put_file_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/put_file_response.h index aa407c8d83..b25b3e5215 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/put_file_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/put_file_response.h @@ -31,28 +31,29 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_PUT_FILE_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_PUT_FILE_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_PUT_FILE_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_PUT_FILE_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief PutFileResponse command class **/ -class PutFileResponse : public CommandResponseImpl { +class PutFileResponse : public app_mngr::commands::CommandResponseImpl { public: /** * @brief PutFileResponse class constructor * * @param message Incoming SmartObject message **/ - PutFileResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + PutFileResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief PutFileResponse class destructor @@ -71,4 +72,4 @@ class PutFileResponse : public CommandResponseImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_PUT_FILE_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_PUT_FILE_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/read_did_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/read_did_request.h index c88f16dab0..6156a1e101 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/read_did_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/read_did_request.h @@ -31,28 +31,29 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_READ_DID_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_READ_DID_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_READ_DID_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_READ_DID_REQUEST_H_ #include "application_manager/commands/command_request_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief ReadDIDRequest command class **/ -class ReadDIDRequest : public CommandRequestImpl { +class ReadDIDRequest : public app_mngr::commands::CommandRequestImpl { public: /** * @brief ReadDIDRequest class constructor * * @param message Incoming SmartObject message **/ - ReadDIDRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + ReadDIDRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief ReadDIDRequest class destructor @@ -64,7 +65,7 @@ class ReadDIDRequest : public CommandRequestImpl { * * @param event The received event */ - void on_event(const event_engine::Event& event); + void on_event(const app_mngr::event_engine::Event& event); /** * @brief Execute command @@ -78,4 +79,4 @@ class ReadDIDRequest : public CommandRequestImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_READ_DID_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_READ_DID_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/read_did_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/read_did_response.h index 2e493fa0ec..2218b67adb 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/read_did_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/read_did_response.h @@ -31,28 +31,29 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_READ_DID_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_READ_DID_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_READ_DID_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_READ_DID_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief ReadDIDResponse command class **/ -class ReadDIDResponse : public CommandResponseImpl { +class ReadDIDResponse : public app_mngr::commands::CommandResponseImpl { public: /** * @brief ReadDIDResponse class constructor * * @param message Incoming SmartObject message **/ - ReadDIDResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + ReadDIDResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief ReadDIDResponse class destructor @@ -71,4 +72,4 @@ class ReadDIDResponse : public CommandResponseImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_READ_DID_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_READ_DID_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/register_app_interface_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/register_app_interface_request.h index 5713e2e814..7dab09a4c2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/register_app_interface_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/register_app_interface_request.h @@ -31,8 +31,8 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_REGISTER_APP_INTERFACE_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_REGISTER_APP_INTERFACE_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_REGISTER_APP_INTERFACE_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_REGISTER_APP_INTERFACE_REQUEST_H_ #include "application_manager/commands/command_request_impl.h" #include "application_manager/policies/policy_handler_interface.h" @@ -43,7 +43,8 @@ namespace policy { struct DeviceInfo; } -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; class Application; @@ -54,13 +55,15 @@ namespace custom_str = utils::custom_string; /** * @brief Register app interface request command class **/ -class RegisterAppInterfaceRequest : public CommandRequestImpl { +class RegisterAppInterfaceRequest + : public app_mngr::commands::CommandRequestImpl { public: /** * \brief RegisterAppInterfaceRequest class constructor **/ - RegisterAppInterfaceRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + RegisterAppInterfaceRequest( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief RegisterAppInterfaceRequest class destructor @@ -102,7 +105,7 @@ class RegisterAppInterfaceRequest : public CommandRequestImpl { void SendRegisterAppInterfaceResponseToMobile(ApplicationType app_type); smart_objects::SmartObjectSPtr GetLockScreenIconUrlNotification( - const uint32_t connection_key, ApplicationSharedPtr app); + const uint32_t connection_key, app_mngr::ApplicationSharedPtr app); /** * @brief SendChangeRegistration send ChangeRegistration on HMI @@ -119,7 +122,7 @@ class RegisterAppInterfaceRequest : public CommandRequestImpl { * HMI * @param app application to change registration */ - void SendChangeRegistrationOnHMI(ApplicationConstSharedPtr app); + void SendChangeRegistrationOnHMI(app_mngr::ApplicationConstSharedPtr app); /** * @brief Sends OnAppRegistered notification to HMI @@ -127,9 +130,10 @@ class RegisterAppInterfaceRequest : public CommandRequestImpl { *@param application_impl application with changed HMI status * **/ - void SendOnAppRegisteredNotificationToHMI(const Application& application_impl, - bool resumption = false, - bool need_restore_vr = false); + void SendOnAppRegisteredNotificationToHMI( + const app_mngr::Application& application_impl, + bool resumption = false, + bool need_restore_vr = false); /* * @brief Check new ID along with known mobile application ID * @@ -220,4 +224,4 @@ class RegisterAppInterfaceRequest : public CommandRequestImpl { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_REGISTER_APP_INTERFACE_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_REGISTER_APP_INTERFACE_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/register_app_interface_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/register_app_interface_response.h index b125cc7c55..6b4ec48b49 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/register_app_interface_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/register_app_interface_response.h @@ -31,24 +31,27 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_REGISTER_APP_INTERFACE_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_REGISTER_APP_INTERFACE_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_REGISTER_APP_INTERFACE_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_REGISTER_APP_INTERFACE_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief Register app interface request command class **/ -class RegisterAppInterfaceResponse : public CommandResponseImpl { +class RegisterAppInterfaceResponse + : public app_mngr::commands::CommandResponseImpl { public: /** * \brief RegisterAppInterfaceResponse class constructor **/ - RegisterAppInterfaceResponse(const MessageSharedPtr& response, - ApplicationManager& application_manager) + RegisterAppInterfaceResponse( + const app_mngr::commands::MessageSharedPtr& response, + app_mngr::ApplicationManager& application_manager) : CommandResponseImpl(response, application_manager) {} /** @@ -71,4 +74,4 @@ class RegisterAppInterfaceResponse : public CommandResponseImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_REGISTER_APP_INTERFACE_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_REGISTER_APP_INTERFACE_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/reset_global_properties_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/reset_global_properties_request.h index c16a014c9f..4e2481d682 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/reset_global_properties_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/reset_global_properties_request.h @@ -31,29 +31,32 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_RESET_GLOBAL_PROPERTIES_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_RESET_GLOBAL_PROPERTIES_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_RESET_GLOBAL_PROPERTIES_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_RESET_GLOBAL_PROPERTIES_REQUEST_H_ #include "application_manager/commands/command_request_impl.h" #include "application_manager/application.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief ResetGlobalPropertiesRequest command class **/ -class ResetGlobalPropertiesRequest : public CommandRequestImpl { +class ResetGlobalPropertiesRequest + : public app_mngr::commands::CommandRequestImpl { public: /** * @brief ResetGlobalPropertiesRequest class constructor * * @param message Incoming SmartObject message **/ - ResetGlobalPropertiesRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + ResetGlobalPropertiesRequest( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief ResetGlobalPropertiesRequest class destructor @@ -70,7 +73,7 @@ class ResetGlobalPropertiesRequest : public CommandRequestImpl { * * @param event The received event */ - void on_event(const event_engine::Event& event) FINAL; + void on_event(const app_mngr::event_engine::Event& event) FINAL; /** * @brief Init sets hash update mode for request @@ -88,7 +91,7 @@ class ResetGlobalPropertiesRequest : public CommandRequestImpl { * * @return TRUE on success, otherwise FALSE */ - bool ResetHelpPromt(ApplicationSharedPtr app); + bool ResetHelpPromt(app_mngr::ApplicationSharedPtr app); /* * @brief Sets default value of the TIMEOUTPROMT global property @@ -140,4 +143,4 @@ class ResetGlobalPropertiesRequest : public CommandRequestImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_RESET_GLOBAL_PROPERTIES_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_RESET_GLOBAL_PROPERTIES_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/reset_global_properties_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/reset_global_properties_response.h index 39e28486d4..5b0de45196 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/reset_global_properties_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/reset_global_properties_response.h @@ -31,28 +31,31 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_RESET_GLOBAL_PROPERTIES_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_RESET_GLOBAL_PROPERTIES_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_RESET_GLOBAL_PROPERTIES_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_RESET_GLOBAL_PROPERTIES_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief ResetGlobalPropertiesResponse command class **/ -class ResetGlobalPropertiesResponse : public CommandResponseImpl { +class ResetGlobalPropertiesResponse + : public app_mngr::commands::CommandResponseImpl { public: /** * @brief ResetGlobalPropertiesResponse class constructor * * @param message Incoming SmartObject message **/ - ResetGlobalPropertiesResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + ResetGlobalPropertiesResponse( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief ResetGlobalPropertiesResponse class destructor @@ -71,4 +74,4 @@ class ResetGlobalPropertiesResponse : public CommandResponseImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_RESET_GLOBAL_PROPERTIES_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_RESET_GLOBAL_PROPERTIES_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/scrollable_message_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/scrollable_message_request.h index b3058c9a26..e2bdec7322 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/scrollable_message_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/scrollable_message_request.h @@ -31,27 +31,28 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SCROLLABLE_MESSAGE_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SCROLLABLE_MESSAGE_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SCROLLABLE_MESSAGE_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SCROLLABLE_MESSAGE_REQUEST_H_ #include "application_manager/commands/command_request_impl.h" #include "interfaces/MOBILE_API.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief scrollable message request command class **/ -class ScrollableMessageRequest : public CommandRequestImpl { +class ScrollableMessageRequest : public app_mngr::commands::CommandRequestImpl { public: /** * @brief ScrollableMessageRequest class constructor **/ - ScrollableMessageRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + ScrollableMessageRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief SliderCommand class destructor @@ -73,7 +74,7 @@ class ScrollableMessageRequest : public CommandRequestImpl { * * @param event The received event */ - virtual void on_event(const event_engine::Event& event); + virtual void on_event(const app_mngr::event_engine::Event& event); private: DISALLOW_COPY_AND_ASSIGN(ScrollableMessageRequest); @@ -83,4 +84,4 @@ class ScrollableMessageRequest : public CommandRequestImpl { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SCROLLABLE_MESSAGE_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SCROLLABLE_MESSAGE_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/scrollable_message_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/scrollable_message_response.h index aa0ac01e9d..d7809fe017 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/scrollable_message_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/scrollable_message_response.h @@ -30,23 +30,25 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SCROLLABLE_MESSAGE_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SCROLLABLE_MESSAGE_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SCROLLABLE_MESSAGE_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SCROLLABLE_MESSAGE_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" #include "application_manager/message.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { -class ScrollableMessageResponse : public CommandResponseImpl { +class ScrollableMessageResponse + : public app_mngr::commands::CommandResponseImpl { public: /** * \brief ScrollableMessageResponse class constructor **/ - ScrollableMessageResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + ScrollableMessageResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * \brief SpeakResponseCommand class destructor @@ -65,4 +67,4 @@ class ScrollableMessageResponse : public CommandResponseImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SCROLLABLE_MESSAGE_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SCROLLABLE_MESSAGE_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/send_haptic_data_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/send_haptic_data_request.h index 13ed06cce6..c7072d1971 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/send_haptic_data_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/send_haptic_data_request.h @@ -30,8 +30,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SEND_HAPTIC_DATA_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SEND_HAPTIC_DATA_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SEND_HAPTIC_DATA_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SEND_HAPTIC_DATA_REQUEST_H_ #include <string> #include "application_manager/commands/command_request_impl.h" @@ -39,14 +39,15 @@ #include "application_manager/event_engine/event.h" #include "smart_objects/smart_object.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief SendHapticDataRequest command class **/ -class SendHapticDataRequest : public CommandRequestImpl { +class SendHapticDataRequest : public app_mngr::commands::CommandRequestImpl { public: /** * @brief SendHapticDataRequest class constructor @@ -54,8 +55,8 @@ class SendHapticDataRequest : public CommandRequestImpl { * @param message Incoming SmartObject message * @param application_manager Reference of application manager **/ - SendHapticDataRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + SendHapticDataRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief SendHapticDataRequest class destructor @@ -72,7 +73,7 @@ class SendHapticDataRequest : public CommandRequestImpl { * * @param event The received event */ - void on_event(const event_engine::Event& event) OVERRIDE; + void on_event(const app_mngr::event_engine::Event& event) OVERRIDE; private: DISALLOW_COPY_AND_ASSIGN(SendHapticDataRequest); @@ -81,4 +82,4 @@ class SendHapticDataRequest : public CommandRequestImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SEND_HAPTIC_DATA_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SEND_HAPTIC_DATA_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/send_haptic_data_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/send_haptic_data_response.h index 2a60746c61..96b55ae860 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/send_haptic_data_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/send_haptic_data_response.h @@ -30,19 +30,20 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SEND_HAPTIC_DATA_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SEND_HAPTIC_DATA_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SEND_HAPTIC_DATA_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SEND_HAPTIC_DATA_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief SendHapticDataResponse command class **/ -class SendHapticDataResponse : public CommandResponseImpl { +class SendHapticDataResponse : public app_mngr::commands::CommandResponseImpl { public: /** * @brief SendHapticDataResponse class constructor @@ -50,8 +51,8 @@ class SendHapticDataResponse : public CommandResponseImpl { * @param message Incoming SmartObject message * @param application_manager Reference of application manager **/ - SendHapticDataResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + SendHapticDataResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief SendHapticDataResponse class destructor @@ -70,4 +71,4 @@ class SendHapticDataResponse : public CommandResponseImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SEND_HAPTIC_DATA_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SEND_HAPTIC_DATA_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/send_location_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/send_location_request.h index 570e70d007..58cca4ab72 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/send_location_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/send_location_request.h @@ -31,26 +31,27 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SEND_LOCATION_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SEND_LOCATION_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SEND_LOCATION_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SEND_LOCATION_REQUEST_H_ #include <list> #include "application_manager/commands/command_request_impl.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief send location request command class */ -class SendLocationRequest : public CommandRequestImpl { +class SendLocationRequest : public app_mngr::commands::CommandRequestImpl { public: /** * @brief SendLocationRquest class constructor */ - SendLocationRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + SendLocationRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief SendLocationRquest class destructor @@ -67,7 +68,7 @@ class SendLocationRequest : public CommandRequestImpl { * * @param event The received event */ - virtual void on_event(const event_engine::Event& event); + virtual void on_event(const app_mngr::event_engine::Event& event); private: /** @@ -93,4 +94,4 @@ class SendLocationRequest : public CommandRequestImpl { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SEND_LOCATION_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SEND_LOCATION_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/send_location_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/send_location_response.h index 0be0be8ca3..c8a3728038 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/send_location_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/send_location_response.h @@ -30,22 +30,23 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SEND_LOCATION_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SEND_LOCATION_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SEND_LOCATION_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SEND_LOCATION_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" #include "application_manager/message.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { -class SendLocationResponse : public CommandResponseImpl { +class SendLocationResponse : public app_mngr::commands::CommandResponseImpl { public: /** * @brief SendLocationResponse class constructor */ - SendLocationResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + SendLocationResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief SendLocationResponse class destructor @@ -64,4 +65,4 @@ class SendLocationResponse : public CommandResponseImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SEND_LOCATION_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SEND_LOCATION_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_app_icon_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_app_icon_request.h index 4735d89fb0..5a4972ed58 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_app_icon_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_app_icon_request.h @@ -31,20 +31,21 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SET_APP_ICON_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SET_APP_ICON_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SET_APP_ICON_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SET_APP_ICON_REQUEST_H_ #include "application_manager/commands/command_request_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief SetIconRequest command class **/ -class SetAppIconRequest : public CommandRequestImpl { +class SetAppIconRequest : public app_mngr::commands::CommandRequestImpl { public: /** * @brief Contains information about the type of image @@ -56,8 +57,8 @@ class SetAppIconRequest : public CommandRequestImpl { * * @param message Incoming SmartObject message **/ - SetAppIconRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + SetAppIconRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief SetIconRequest class destructor @@ -69,7 +70,7 @@ class SetAppIconRequest : public CommandRequestImpl { * * @param event The received event */ - void on_event(const event_engine::Event& event); + void on_event(const app_mngr::event_engine::Event& event); /** * @brief Execute command @@ -109,4 +110,4 @@ class SetAppIconRequest : public CommandRequestImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SET_APP_ICON_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SET_APP_ICON_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_app_icon_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_app_icon_response.h index 742332742b..de83c7b5c5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_app_icon_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_app_icon_response.h @@ -31,28 +31,29 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SET_APP_ICON_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SET_APP_ICON_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SET_APP_ICON_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SET_APP_ICON_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief SetIconResponse command class **/ -class SetAppIconResponse : public CommandResponseImpl { +class SetAppIconResponse : public app_mngr::commands::CommandResponseImpl { public: /** * @brief SetIconResponse class constructor * * @param message Incoming SmartObject message **/ - SetAppIconResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + SetAppIconResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief SetIconResponse class destructor @@ -71,4 +72,4 @@ class SetAppIconResponse : public CommandResponseImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SET_APP_ICON_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SET_APP_ICON_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_display_layout_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_display_layout_request.h index 06e8d70f79..e2b6868aa7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_display_layout_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_display_layout_request.h @@ -31,28 +31,29 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SET_DISPLAY_LAYOUT_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SET_DISPLAY_LAYOUT_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SET_DISPLAY_LAYOUT_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SET_DISPLAY_LAYOUT_REQUEST_H_ #include "application_manager/commands/command_request_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief SetDisplayLayoutRequest command class **/ -class SetDisplayLayoutRequest : public CommandRequestImpl { +class SetDisplayLayoutRequest : public app_mngr::commands::CommandRequestImpl { public: /** * @brief SetDisplayLayoutRequest class constructor * * @param message Incoming SmartObject message **/ - SetDisplayLayoutRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + SetDisplayLayoutRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief SetDisplayLayoutRequest class destructor @@ -64,7 +65,7 @@ class SetDisplayLayoutRequest : public CommandRequestImpl { * * @param event The received event **/ - virtual void on_event(const event_engine::Event& event); + virtual void on_event(const app_mngr::event_engine::Event& event); /** * @brief Execute command @@ -78,4 +79,4 @@ class SetDisplayLayoutRequest : public CommandRequestImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SET_DISPLAY_LAYOUT_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SET_DISPLAY_LAYOUT_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_display_layout_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_display_layout_response.h index a2040307b0..fcf25cee49 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_display_layout_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_display_layout_response.h @@ -31,28 +31,30 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SET_DISPLAY_LAYOUT_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SET_DISPLAY_LAYOUT_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SET_DISPLAY_LAYOUT_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SET_DISPLAY_LAYOUT_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief SetDisplayLayoutResponse command class **/ -class SetDisplayLayoutResponse : public CommandResponseImpl { +class SetDisplayLayoutResponse + : public app_mngr::commands::CommandResponseImpl { public: /** * @brief SetDisplayLayoutResponse class constructor * * @param message Incoming SmartObject message **/ - SetDisplayLayoutResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + SetDisplayLayoutResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief SetDisplayLayoutResponse class destructor @@ -71,4 +73,4 @@ class SetDisplayLayoutResponse : public CommandResponseImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SET_DISPLAY_LAYOUT_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SET_DISPLAY_LAYOUT_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_global_properties_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_global_properties_request.h index da28d33de8..c004b27048 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_global_properties_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_global_properties_request.h @@ -30,29 +30,32 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SET_GLOBAL_PROPERTIES_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SET_GLOBAL_PROPERTIES_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SET_GLOBAL_PROPERTIES_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SET_GLOBAL_PROPERTIES_REQUEST_H_ #include <string> #include "application_manager/commands/command_request_impl.h" #include "utils/macro.h" #include "application_manager/application.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief Register app interface request command class **/ -class SetGlobalPropertiesRequest : public CommandRequestImpl { +class SetGlobalPropertiesRequest + : public app_mngr::commands::CommandRequestImpl { public: /** * @brief SetGlobalPropertiesRequest class constructor * * @param message Incoming SmartObject message **/ - SetGlobalPropertiesRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + SetGlobalPropertiesRequest( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief SetGlobalPropertiesRequest class destructor @@ -69,7 +72,7 @@ class SetGlobalPropertiesRequest : public CommandRequestImpl { * * @param event The received event */ - void on_event(const event_engine::Event& event) FINAL; + void on_event(const app_mngr::event_engine::Event& event) FINAL; /** * @brief Init sets hash update mode for request @@ -83,15 +86,16 @@ class SetGlobalPropertiesRequest : public CommandRequestImpl { // prepare UI sending data (VrHelps, Menus, Keyboard) to SmartObject static void PrepareUIRequestVRHelpData( - const ApplicationSharedPtr app, + const app_mngr::ApplicationSharedPtr app, const smart_objects::SmartObject& msg_params, smart_objects::SmartObject& out_params); static bool PrepareUIRequestDefaultVRHelpData( - const ApplicationSharedPtr app, smart_objects::SmartObject& out_params); + const app_mngr::ApplicationSharedPtr app, + smart_objects::SmartObject& out_params); static void PrepareUIRequestMenuAndKeyboardData( - const ApplicationSharedPtr app, + const app_mngr::ApplicationSharedPtr app, const smart_objects::SmartObject& msg_params, smart_objects::SmartObject& out_params); @@ -156,4 +160,4 @@ class SetGlobalPropertiesRequest : public CommandRequestImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SET_GLOBAL_PROPERTIES_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SET_GLOBAL_PROPERTIES_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_global_properties_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_global_properties_response.h index c5beda084d..a7c72aab53 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_global_properties_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_global_properties_response.h @@ -31,28 +31,31 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SET_GLOBAL_PROPERTIES_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SET_GLOBAL_PROPERTIES_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SET_GLOBAL_PROPERTIES_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SET_GLOBAL_PROPERTIES_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief Register app interface request command class **/ -class SetGlobalPropertiesResponse : public CommandResponseImpl { +class SetGlobalPropertiesResponse + : public app_mngr::commands::CommandResponseImpl { public: /** * @brief SetGlobalPropertiesResponse class constructor * * @param message Incoming SmartObject message **/ - SetGlobalPropertiesResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + SetGlobalPropertiesResponse( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief SetGlobalPropertiesResponse class destructor @@ -71,4 +74,4 @@ class SetGlobalPropertiesResponse : public CommandResponseImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SET_GLOBAL_PROPERTIES_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SET_GLOBAL_PROPERTIES_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_icon_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_icon_request.h index 96d4ac6f1e..25bd416e60 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_icon_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_icon_request.h @@ -31,21 +31,22 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SET_ICON_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SET_ICON_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SET_ICON_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SET_ICON_REQUEST_H_ #include "application_manager/commands/command_request_impl.h" #include "application_manager/application_manager.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief SetIconRequest command class **/ -class SetIconRequest : public CommandRequestImpl { +class SetIconRequest : public app_mngr::commands::CommandRequestImpl { public: /** * @brief Contains information about the type of image @@ -57,8 +58,8 @@ class SetIconRequest : public CommandRequestImpl { * * @param message Incoming SmartObject message **/ - SetIconRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + SetIconRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief SetIconRequest class destructor @@ -70,7 +71,7 @@ class SetIconRequest : public CommandRequestImpl { * * @param event The received event */ - void on_event(const event_engine::Event& event); + void on_event(const app_mngr::event_engine::Event& event); /** * @brief Execute command @@ -84,4 +85,4 @@ class SetIconRequest : public CommandRequestImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SET_ICON_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SET_ICON_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_icon_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_icon_response.h index 83be0d4a4b..1e2510ffd2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_icon_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_icon_response.h @@ -31,28 +31,30 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SET_ICON_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SET_ICON_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SET_ICON_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SET_ICON_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" #include "application_manager/application_manager.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief SetIconResponse command class **/ -class SetIconResponse : public CommandResponseImpl { +class SetIconResponse : public app_mngr::commands::CommandResponseImpl { public: /** * @brief SetIconResponse class constructor * * @param message Incoming SmartObject message **/ - SetIconResponse(const MessageSharedPtr& message, ApplicationManager& app_man); + SetIconResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& app_man); /** * @brief SetIconResponse class destructor @@ -71,4 +73,4 @@ class SetIconResponse : public CommandResponseImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SET_ICON_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SET_ICON_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_media_clock_timer_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_media_clock_timer_request.h index 283dd41622..4623566da2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_media_clock_timer_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_media_clock_timer_request.h @@ -31,26 +31,27 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SET_MEDIA_CLOCK_TIMER_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SET_MEDIA_CLOCK_TIMER_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SET_MEDIA_CLOCK_TIMER_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SET_MEDIA_CLOCK_TIMER_REQUEST_H_ #include "application_manager/commands/command_request_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief SetMediaClockRequest request command class **/ -class SetMediaClockRequest : public CommandRequestImpl { +class SetMediaClockRequest : public app_mngr::commands::CommandRequestImpl { public: /** * \brief SetMediaClockRequest class constructor **/ - SetMediaClockRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + SetMediaClockRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * \brief ShowCommand class destructor @@ -67,7 +68,7 @@ class SetMediaClockRequest : public CommandRequestImpl { * * @param event The received event */ - void on_event(const event_engine::Event& event); + void on_event(const app_mngr::event_engine::Event& event); private: bool isDataValid(); @@ -79,4 +80,4 @@ class SetMediaClockRequest : public CommandRequestImpl { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SET_MEDIA_CLOCK_TIMER_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SET_MEDIA_CLOCK_TIMER_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_media_clock_timer_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_media_clock_timer_response.h index 3f41ae2dab..cbbab0648e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_media_clock_timer_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_media_clock_timer_response.h @@ -30,23 +30,26 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SET_MEDIA_CLOCK_TIMER_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SET_MEDIA_CLOCK_TIMER_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SET_MEDIA_CLOCK_TIMER_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SET_MEDIA_CLOCK_TIMER_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" #include "application_manager/message.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { -class SetMediaClockTimerResponse : public CommandResponseImpl { +class SetMediaClockTimerResponse + : public app_mngr::commands::CommandResponseImpl { public: /** * \brief SetMediaClockTimerResponse class constructor **/ - SetMediaClockTimerResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + SetMediaClockTimerResponse( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * \brief SetMediaClockTimerResponse class destructor @@ -65,4 +68,4 @@ class SetMediaClockTimerResponse : public CommandResponseImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SET_MEDIA_CLOCK_TIMER_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SET_MEDIA_CLOCK_TIMER_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_constant_tbt_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_constant_tbt_request.h index f015d740df..990da46f92 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_constant_tbt_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_constant_tbt_request.h @@ -31,29 +31,30 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SHOW_CONSTANT_TBT_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SHOW_CONSTANT_TBT_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SHOW_CONSTANT_TBT_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SHOW_CONSTANT_TBT_REQUEST_H_ #include "application_manager/commands/command_request_impl.h" #include "interfaces/MOBILE_API.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief ShowConstantTBTRequest command class **/ -class ShowConstantTBTRequest : public CommandRequestImpl { +class ShowConstantTBTRequest : public app_mngr::commands::CommandRequestImpl { public: /** * @brief ShowConstantTBTRequest class constructor * * @param message Incoming SmartObject message **/ - ShowConstantTBTRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + ShowConstantTBTRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief ShowConstantTBTRequest class destructor @@ -70,7 +71,7 @@ class ShowConstantTBTRequest : public CommandRequestImpl { * * @param event The received event */ - virtual void on_event(const event_engine::Event& event); + virtual void on_event(const app_mngr::event_engine::Event& event); private: /** @@ -87,4 +88,4 @@ class ShowConstantTBTRequest : public CommandRequestImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SHOW_CONSTANT_TBT_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SHOW_CONSTANT_TBT_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_constant_tbt_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_constant_tbt_response.h index 73aad5de89..f33e7bd727 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_constant_tbt_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_constant_tbt_response.h @@ -31,28 +31,29 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SHOW_CONSTANT_TBT_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SHOW_CONSTANT_TBT_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SHOW_CONSTANT_TBT_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SHOW_CONSTANT_TBT_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief ShowConstantTBTResponse command class **/ -class ShowConstantTBTResponse : public CommandResponseImpl { +class ShowConstantTBTResponse : public app_mngr::commands::CommandResponseImpl { public: /** * @brief ShowConstantTBTResponse class constructor * * @param message Incoming SmartObject message **/ - ShowConstantTBTResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + ShowConstantTBTResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief ShowConstantTBTResponse class destructor @@ -71,4 +72,4 @@ class ShowConstantTBTResponse : public CommandResponseImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SHOW_CONSTANT_TBT_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SHOW_CONSTANT_TBT_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_request.h index a10997bacd..ef7db514c1 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_request.h @@ -31,27 +31,28 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SHOW_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SHOW_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SHOW_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SHOW_REQUEST_H_ #include "application_manager/commands/command_request_impl.h" #include "interfaces/MOBILE_API.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief show request command class **/ -class ShowRequest : public CommandRequestImpl { +class ShowRequest : public app_mngr::commands::CommandRequestImpl { public: /** * \brief ShowRequest class constructor **/ - ShowRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + ShowRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * \brief ShowRequest class destructor @@ -68,7 +69,7 @@ class ShowRequest : public CommandRequestImpl { * * @param event The received event */ - virtual void on_event(const event_engine::Event& event); + virtual void on_event(const app_mngr::event_engine::Event& event); private: /* @@ -96,4 +97,4 @@ class ShowRequest : public CommandRequestImpl { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SHOW_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SHOW_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_response.h index 0a54fb9cde..96652ac4a1 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_response.h @@ -30,23 +30,24 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SHOW_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SHOW_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SHOW_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SHOW_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" #include "application_manager/message.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { -class ShowResponse : public CommandResponseImpl { +class ShowResponse : public app_mngr::commands::CommandResponseImpl { public: /** * \brief ShowResponse class constructor **/ - ShowResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + ShowResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * \brief ShowResponse class destructor @@ -65,4 +66,4 @@ class ShowResponse : public CommandResponseImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SHOW_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SHOW_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/slider_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/slider_request.h index 2446c9ff20..1ca1a36af0 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/slider_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/slider_request.h @@ -31,26 +31,27 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SLIDER_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SLIDER_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SLIDER_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SLIDER_REQUEST_H_ #include "application_manager/commands/command_request_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief slider request command class **/ -class SliderRequest : public CommandRequestImpl { +class SliderRequest : public app_mngr::commands::CommandRequestImpl { public: /** * \brief SliderRequest class constructor **/ - SliderRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + SliderRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * \brief SliderRequest class destructor @@ -72,7 +73,7 @@ class SliderRequest : public CommandRequestImpl { * * @param event The received event */ - virtual void on_event(const event_engine::Event& event); + virtual void on_event(const app_mngr::event_engine::Event& event); private: /** @@ -89,4 +90,4 @@ class SliderRequest : public CommandRequestImpl { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SLIDER_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SLIDER_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/slider_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/slider_response.h index bc0efaadd0..3f358e2bd3 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/slider_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/slider_response.h @@ -30,23 +30,24 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SLIDER_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SLIDER_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SLIDER_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SLIDER_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" #include "application_manager/message.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { -class SliderResponse : public CommandResponseImpl { +class SliderResponse : public app_mngr::commands::CommandResponseImpl { public: /** * \brief SliderResponse class constructor **/ - SliderResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + SliderResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * \brief SpeakResponseCommand class destructor @@ -65,4 +66,4 @@ class SliderResponse : public CommandResponseImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SLIDER_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SLIDER_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/speak_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/speak_request.h index dc22652b27..8db7a9c65d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/speak_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/speak_request.h @@ -31,26 +31,27 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SPEAK_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SPEAK_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SPEAK_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SPEAK_REQUEST_H_ #include "application_manager/commands/command_request_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief speak request command class **/ -class SpeakRequest : public CommandRequestImpl { +class SpeakRequest : public app_mngr::commands::CommandRequestImpl { public: /** * \brief SpeakRequest class constructor **/ - SpeakRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + SpeakRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * \brief SpeakRequest class destructor @@ -67,7 +68,7 @@ class SpeakRequest : public CommandRequestImpl { * * @param event The received event */ - virtual void on_event(const event_engine::Event& event); + virtual void on_event(const app_mngr::event_engine::Event& event); private: /* @@ -91,4 +92,4 @@ class SpeakRequest : public CommandRequestImpl { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SPEAK_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SPEAK_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/speak_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/speak_response.h index 2808526603..8f038b0198 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/speak_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/speak_response.h @@ -30,23 +30,24 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SPEAK_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SPEAK_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SPEAK_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SPEAK_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" #include "application_manager/message.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { -class SpeakResponse : public CommandResponseImpl { +class SpeakResponse : public app_mngr::commands::CommandResponseImpl { public: /** * \brief SpeakResponse class constructor **/ - SpeakResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + SpeakResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * \brief SpeakResponse class destructor @@ -65,4 +66,4 @@ class SpeakResponse : public CommandResponseImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SPEAK_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SPEAK_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_button_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_button_request.h index cf65e2a6a4..5db452ebdd 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_button_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_button_request.h @@ -31,29 +31,30 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SUBSCRIBE_BUTTON_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SUBSCRIBE_BUTTON_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SUBSCRIBE_BUTTON_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SUBSCRIBE_BUTTON_REQUEST_H_ #include "application_manager/commands/command_request_impl.h" #include "application_manager/application_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief SubscribeButtonRequest command class **/ -class SubscribeButtonRequest : public CommandRequestImpl { +class SubscribeButtonRequest : public app_mngr::commands::CommandRequestImpl { public: /** * @brief SubscribeButtonRequest class constructor * * @param message Incoming SmartObject message **/ - SubscribeButtonRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + SubscribeButtonRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief SubscribeButtonRequest class destructor @@ -81,7 +82,7 @@ class SubscribeButtonRequest : public CommandRequestImpl { * * @return TRUE on success, otherwise false **/ - bool IsSubscriptionAllowed(ApplicationSharedPtr app, + bool IsSubscriptionAllowed(app_mngr::ApplicationSharedPtr app, const mobile_apis::ButtonName::eType btn_id); /** @@ -96,4 +97,4 @@ class SubscribeButtonRequest : public CommandRequestImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SUBSCRIBE_BUTTON_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SUBSCRIBE_BUTTON_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_button_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_button_response.h index 38e0dd2dc6..85356fd624 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_button_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_button_response.h @@ -31,28 +31,29 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SUBSCRIBE_BUTTON_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SUBSCRIBE_BUTTON_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SUBSCRIBE_BUTTON_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SUBSCRIBE_BUTTON_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief SubscribeButtonResponse command class **/ -class SubscribeButtonResponse : public CommandResponseImpl { +class SubscribeButtonResponse : public app_mngr::commands::CommandResponseImpl { public: /** * @brief SubscribeButtonResponse class constructor * * @param message Incoming SmartObject message **/ - SubscribeButtonResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + SubscribeButtonResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief SubscribeButtonResponse class destructor @@ -71,4 +72,4 @@ class SubscribeButtonResponse : public CommandResponseImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SUBSCRIBE_BUTTON_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SUBSCRIBE_BUTTON_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_vehicle_data_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_vehicle_data_request.h index f556f81764..96290e6863 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_vehicle_data_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_vehicle_data_request.h @@ -31,29 +31,32 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SUBSCRIBE_VEHICLE_DATA_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SUBSCRIBE_VEHICLE_DATA_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SUBSCRIBE_VEHICLE_DATA_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SUBSCRIBE_VEHICLE_DATA_REQUEST_H_ #include "application_manager/commands/command_request_impl.h" #include "application_manager/application.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief SubscribeVehicleDataRequest command class **/ -class SubscribeVehicleDataRequest : public CommandRequestImpl { +class SubscribeVehicleDataRequest + : public app_mngr::commands::CommandRequestImpl { public: /** * @brief SubscribeVehicleDataRequest class constructor * * @param message Incoming SmartObject message **/ - SubscribeVehicleDataRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + SubscribeVehicleDataRequest( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief SubscribeButtonCommandRequest class destructor @@ -70,7 +73,7 @@ class SubscribeVehicleDataRequest : public CommandRequestImpl { * * @param event The received event */ - void on_event(const event_engine::Event& event) FINAL; + void on_event(const app_mngr::event_engine::Event& event) FINAL; /** * @brief Init sets hash update mode for request @@ -114,7 +117,7 @@ class SubscribeVehicleDataRequest : public CommandRequestImpl { * @param msg_params 'message_parameters' response section reference */ void UnsubscribeFailedSubscriptions( - ApplicationSharedPtr app, + app_mngr::ApplicationSharedPtr app, const smart_objects::SmartObject& msg_params) const; /** @@ -130,7 +133,7 @@ class SubscribeVehicleDataRequest : public CommandRequestImpl { * HMI * @param result contains result that SDL sends to mobile app. */ - void CheckVISubscribtions(ApplicationSharedPtr app, + void CheckVISubscribtions(app_mngr::ApplicationSharedPtr app, std::string& out_info, mobile_apis::Result::eType& out_result_code, smart_objects::SmartObject& out_response_params, @@ -141,17 +144,17 @@ class SubscribeVehicleDataRequest : public CommandRequestImpl { * @brief VI parameters which had been already subscribed by another apps * befor particular app subscribed for these parameters */ - VehicleInfoSubscriptions vi_already_subscribed_by_another_apps_; + app_mngr::VehicleInfoSubscriptions vi_already_subscribed_by_another_apps_; /** * @brief VI parameters which had been subscribed already by particular app */ - VehicleInfoSubscriptions vi_already_subscribed_by_this_app_; + app_mngr::VehicleInfoSubscriptions vi_already_subscribed_by_this_app_; /** * @brief VI parameters which wait for subscribe after HMI respond */ - VehicleInfoSubscriptions vi_waiting_for_subscribe_; + app_mngr::VehicleInfoSubscriptions vi_waiting_for_subscribe_; DISALLOW_COPY_AND_ASSIGN(SubscribeVehicleDataRequest); }; @@ -159,4 +162,4 @@ class SubscribeVehicleDataRequest : public CommandRequestImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SUBSCRIBE_VEHICLE_DATA_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SUBSCRIBE_VEHICLE_DATA_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_vehicle_data_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_vehicle_data_response.h index 7e3cffc387..94b8de46e9 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_vehicle_data_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_vehicle_data_response.h @@ -31,28 +31,31 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SUBSCRIBE_VEHICLE_DATA_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SUBSCRIBE_VEHICLE_DATA_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SUBSCRIBE_VEHICLE_DATA_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SUBSCRIBE_VEHICLE_DATA_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief SubscribeVehicleDataResponse command class **/ -class SubscribeVehicleDataResponse : public CommandResponseImpl { +class SubscribeVehicleDataResponse + : public app_mngr::commands::CommandResponseImpl { public: /** * @brief SubscribeVehicleDataResponse class constructor * * @param message Incoming SmartObject message **/ - SubscribeVehicleDataResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + SubscribeVehicleDataResponse( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UnsubscribeVehicleDataCommandRequest class destructor @@ -71,4 +74,4 @@ class SubscribeVehicleDataResponse : public CommandResponseImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SUBSCRIBE_VEHICLE_DATA_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SUBSCRIBE_VEHICLE_DATA_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_way_points_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_way_points_request.h index f392dd6dd1..a48c356e9e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_way_points_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_way_points_request.h @@ -30,25 +30,27 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SUBSCRIBE_WAY_POINTS_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SUBSCRIBE_WAY_POINTS_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SUBSCRIBE_WAY_POINTS_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SUBSCRIBE_WAY_POINTS_REQUEST_H_ #include "application_manager/commands/command_request_impl.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief SubsribeWayPointsRequest command class **/ -class SubscribeWayPointsRequest : public CommandRequestImpl { +class SubscribeWayPointsRequest + : public app_mngr::commands::CommandRequestImpl { public: /** * \brief SubscribeWayPointsRequest class constructor **/ - SubscribeWayPointsRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + SubscribeWayPointsRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * \brief SubscribeWayPointsRequest class destructor @@ -64,7 +66,7 @@ class SubscribeWayPointsRequest : public CommandRequestImpl { * * @param event The received event */ - void on_event(const event_engine::Event& event) FINAL; + void on_event(const app_mngr::event_engine::Event& event) FINAL; /** * @brief Init sets hash update mode for request @@ -79,4 +81,4 @@ class SubscribeWayPointsRequest : public CommandRequestImpl { } // application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SUBSCRIBE_WAY_POINTS_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SUBSCRIBE_WAY_POINTS_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_way_points_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_way_points_response.h index cfdc0eede7..2c879960fe 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_way_points_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_way_points_response.h @@ -30,26 +30,29 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SUBSCRIBE_WAY_POINTS_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SUBSCRIBE_WAY_POINTS_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SUBSCRIBE_WAY_POINTS_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SUBSCRIBE_WAY_POINTS_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief SubscribeWayPointsResponse command class **/ -class SubscribeWayPointsResponse : public CommandResponseImpl { +class SubscribeWayPointsResponse + : public app_mngr::commands::CommandResponseImpl { public: /** * \brief SubscribeWayPointsResponse class constructor **/ - SubscribeWayPointsResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + SubscribeWayPointsResponse( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * \brief SubscribeWayPointsResponse class destructor @@ -69,4 +72,4 @@ class SubscribeWayPointsResponse : public CommandResponseImpl { } // application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SUBSCRIBE_WAY_POINTS_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SUBSCRIBE_WAY_POINTS_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/system_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/system_request.h index 1d163b6cd8..76d74fb7d6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/system_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/system_request.h @@ -31,8 +31,8 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SYSTEM_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SYSTEM_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SYSTEM_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SYSTEM_REQUEST_H_ #include <string> #include "application_manager/commands/command_request_impl.h" @@ -40,22 +40,23 @@ #include "application_manager/event_engine/event.h" #include "smart_objects/smart_object.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief SystemRequest command class **/ -class SystemRequest : public CommandRequestImpl { +class SystemRequest : public app_mngr::commands::CommandRequestImpl { public: /** * @brief SystemRequest class constructor * * @param message Incoming SmartObject message **/ - SystemRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + SystemRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief SystemRequest class destructor @@ -72,7 +73,7 @@ class SystemRequest : public CommandRequestImpl { * * @param event The received event */ - virtual void on_event(const event_engine::Event& event); + virtual void on_event(const app_mngr::event_engine::Event& event); private: /** @@ -91,4 +92,4 @@ class SystemRequest : public CommandRequestImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SYSTEM_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SYSTEM_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/system_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/system_response.h index efee210b7b..69e6a5c2e8 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/system_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/system_response.h @@ -31,27 +31,28 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SYSTEM_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SYSTEM_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SYSTEM_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SYSTEM_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief SystemResponse command class **/ -class SystemResponse : public CommandResponseImpl { +class SystemResponse : public app_mngr::commands::CommandResponseImpl { public: /** * @brief SystemResponse class constructor * * @param message Incoming SmartObject message **/ - SystemResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + SystemResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief SystemResponse class destructor @@ -70,4 +71,4 @@ class SystemResponse : public CommandResponseImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SYSTEM_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SYSTEM_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unregister_app_interface_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unregister_app_interface_request.h index acc7374e18..71fa0b20e7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unregister_app_interface_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unregister_app_interface_request.h @@ -31,26 +31,29 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_UNREGISTER_APP_INTERFACE_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_UNREGISTER_APP_INTERFACE_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_UNREGISTER_APP_INTERFACE_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_UNREGISTER_APP_INTERFACE_REQUEST_H_ #include "application_manager/commands/command_request_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief Unregister app interface request command class **/ -class UnregisterAppInterfaceRequest : public CommandRequestImpl { +class UnregisterAppInterfaceRequest + : public app_mngr::commands::CommandRequestImpl { public: /** * \brief UnregisterAppInterfaceRequest class constructor **/ - UnregisterAppInterfaceRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) + UnregisterAppInterfaceRequest( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} /** @@ -72,4 +75,4 @@ class UnregisterAppInterfaceRequest : public CommandRequestImpl { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_UNREGISTER_APP_INTERFACE_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_UNREGISTER_APP_INTERFACE_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unregister_app_interface_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unregister_app_interface_response.h index 1a459e109c..4e4d223c15 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unregister_app_interface_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unregister_app_interface_response.h @@ -31,24 +31,27 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_UNREGISTER_APP_INTERFACE_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_UNREGISTER_APP_INTERFACE_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_UNREGISTER_APP_INTERFACE_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_UNREGISTER_APP_INTERFACE_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief Unregister app interface request command class **/ -class UnregisterAppInterfaceResponse : public CommandResponseImpl { +class UnregisterAppInterfaceResponse + : public app_mngr::commands::CommandResponseImpl { public: /** * \brief UnregisterAppInterfaceResponse class constructor **/ - UnregisterAppInterfaceResponse(const MessageSharedPtr& response, - ApplicationManager& application_manager) + UnregisterAppInterfaceResponse( + const app_mngr::commands::MessageSharedPtr& response, + app_mngr::ApplicationManager& application_manager) : CommandResponseImpl(response, application_manager) {} /** @@ -68,4 +71,4 @@ class UnregisterAppInterfaceResponse : public CommandResponseImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_UNREGISTER_APP_INTERFACE_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_UNREGISTER_APP_INTERFACE_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_button_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_button_request.h index b0206c4407..aa6a8d3abe 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_button_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_button_request.h @@ -31,28 +31,29 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_UNSUBSCRIBE_BUTTON_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_UNSUBSCRIBE_BUTTON_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_UNSUBSCRIBE_BUTTON_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_UNSUBSCRIBE_BUTTON_REQUEST_H_ #include "application_manager/commands/command_request_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief UnsubscribeButtonRequest command class **/ -class UnsubscribeButtonRequest : public CommandRequestImpl { +class UnsubscribeButtonRequest : public app_mngr::commands::CommandRequestImpl { public: /** * @brief UnsubscribeButtonRequest class constructor * * @param message Incoming SmartObject message **/ - UnsubscribeButtonRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UnsubscribeButtonRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UnsubscribeButtonRequest class destructor @@ -82,4 +83,4 @@ class UnsubscribeButtonRequest : public CommandRequestImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_UNSUBSCRIBE_BUTTON_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_UNSUBSCRIBE_BUTTON_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_button_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_button_response.h index 06dbe84578..7978d6abd0 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_button_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_button_response.h @@ -31,28 +31,30 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_UNSUBSCRIBE_BUTTON_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_UNSUBSCRIBE_BUTTON_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_UNSUBSCRIBE_BUTTON_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_UNSUBSCRIBE_BUTTON_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief UnsubscribeButtonResponse command class **/ -class UnsubscribeButtonResponse : public CommandResponseImpl { +class UnsubscribeButtonResponse + : public app_mngr::commands::CommandResponseImpl { public: /** * @brief UnsubscribeButtonResponse class constructor * * @param message Incoming SmartObject message **/ - UnsubscribeButtonResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UnsubscribeButtonResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UnsubscribeButtonResponse class destructor @@ -71,4 +73,4 @@ class UnsubscribeButtonResponse : public CommandResponseImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_UNSUBSCRIBE_BUTTON_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_UNSUBSCRIBE_BUTTON_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_vehicle_data_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_vehicle_data_request.h index 1c7d80797d..badd59561d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_vehicle_data_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_vehicle_data_request.h @@ -31,29 +31,32 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_UNSUBSCRIBE_VEHICLE_DATA_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_UNSUBSCRIBE_VEHICLE_DATA_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_UNSUBSCRIBE_VEHICLE_DATA_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_UNSUBSCRIBE_VEHICLE_DATA_REQUEST_H_ #include "application_manager/commands/command_request_impl.h" #include "application_manager/application.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief UnsubscribeVehicleDataRequest command class **/ -class UnsubscribeVehicleDataRequest : public CommandRequestImpl { +class UnsubscribeVehicleDataRequest + : public app_mngr::commands::CommandRequestImpl { public: /** * @brief UnsubscribeVehicleDataRequest class constructor * * @param message Incoming SmartObject message **/ - UnsubscribeVehicleDataRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UnsubscribeVehicleDataRequest( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UnsubscribeVehicleDataRequest class destructor @@ -70,7 +73,7 @@ class UnsubscribeVehicleDataRequest : public CommandRequestImpl { * * @param event The received event */ - void on_event(const event_engine::Event& event) FINAL; + void on_event(const app_mngr::event_engine::Event& event) FINAL; /** * @brief Init sets hash update mode for request @@ -111,12 +114,12 @@ class UnsubscribeVehicleDataRequest : public CommandRequestImpl { * @brief VI parameters which still being subscribed by another apps after * particular app had been unsubscribed from these parameters */ - VehicleInfoSubscriptions vi_still_subscribed_by_another_apps_; + app_mngr::VehicleInfoSubscriptions vi_still_subscribed_by_another_apps_; /** * @brief VI parameters which had been unsubscribed already by particular app */ - VehicleInfoSubscriptions vi_already_unsubscribed_by_this_app_; + app_mngr::VehicleInfoSubscriptions vi_already_unsubscribed_by_this_app_; DISALLOW_COPY_AND_ASSIGN(UnsubscribeVehicleDataRequest); }; @@ -124,4 +127,4 @@ class UnsubscribeVehicleDataRequest : public CommandRequestImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_UNSUBSCRIBE_VEHICLE_DATA_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_UNSUBSCRIBE_VEHICLE_DATA_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_vehicle_data_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_vehicle_data_response.h index a34a36688c..d172403dc2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_vehicle_data_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_vehicle_data_response.h @@ -31,28 +31,31 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_UNSUBSCRIBE_VEHICLE_DATA_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_UNSUBSCRIBE_VEHICLE_DATA_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_UNSUBSCRIBE_VEHICLE_DATA_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_UNSUBSCRIBE_VEHICLE_DATA_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief UnsubscribeVehicleDataResponse command class **/ -class UnsubscribeVehicleDataResponse : public CommandResponseImpl { +class UnsubscribeVehicleDataResponse + : public app_mngr::commands::CommandResponseImpl { public: /** * @brief UnsubscribeVehicleDataResponse class constructor * * @param message Incoming SmartObject message **/ - UnsubscribeVehicleDataResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UnsubscribeVehicleDataResponse( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UnsubscribeVehicleDataResponse class destructor @@ -71,4 +74,4 @@ class UnsubscribeVehicleDataResponse : public CommandResponseImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_UNSUBSCRIBE_VEHICLE_DATA_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_UNSUBSCRIBE_VEHICLE_DATA_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_way_points_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_way_points_request.h index 0b5462b7b5..d4958f1ad6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_way_points_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_way_points_request.h @@ -30,22 +30,25 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_UNSUBSCRIBE_WAY_POINTS_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_UNSUBSCRIBE_WAY_POINTS_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_UNSUBSCRIBE_WAY_POINTS_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_UNSUBSCRIBE_WAY_POINTS_REQUEST_H_ #include "application_manager/commands/command_request_impl.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { -class UnSubscribeWayPointsRequest : public CommandRequestImpl { +class UnSubscribeWayPointsRequest + : public app_mngr::commands::CommandRequestImpl { public: /** * \brief UnSubscribeWayPointsRequest class constructor **/ - UnSubscribeWayPointsRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UnSubscribeWayPointsRequest( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * \brief UnSubscribeWayPointsRequest class destructor @@ -62,7 +65,7 @@ class UnSubscribeWayPointsRequest : public CommandRequestImpl { * * @param event The received event */ - void on_event(const event_engine::Event& event) FINAL; + void on_event(const app_mngr::event_engine::Event& event) FINAL; /** * @brief Init sets hash update mode for request @@ -77,4 +80,4 @@ class UnSubscribeWayPointsRequest : public CommandRequestImpl { } // application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_UNSUBSCRIBE_WAY_POINTS_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_UNSUBSCRIBE_WAY_POINTS_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_way_points_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_way_points_response.h index 70211330a9..eb7847d0da 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_way_points_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_way_points_response.h @@ -30,26 +30,29 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_UNSUBSCRIBE_WAY_POINTS_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_UNSUBSCRIBE_WAY_POINTS_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_UNSUBSCRIBE_WAY_POINTS_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_UNSUBSCRIBE_WAY_POINTS_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief UnsubscribeWayPointsResponse command class **/ -class UnsubscribeWayPointsResponse : public CommandResponseImpl { +class UnsubscribeWayPointsResponse + : public app_mngr::commands::CommandResponseImpl { public: /** * \brief UnsubscribeWayPointsResponse class constructor **/ - UnsubscribeWayPointsResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UnsubscribeWayPointsResponse( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * \brief UnsubscribeWayPointsResponse class destructor @@ -69,4 +72,4 @@ class UnsubscribeWayPointsResponse : public CommandResponseImpl { } // application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_UNSUBSCRIBE_WAY_POINTS_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_UNSUBSCRIBE_WAY_POINTS_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/update_turn_list_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/update_turn_list_request.h index e15e81caf5..6d6b4b2a66 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/update_turn_list_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/update_turn_list_request.h @@ -31,29 +31,30 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_UPDATE_TURN_LIST_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_UPDATE_TURN_LIST_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_UPDATE_TURN_LIST_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_UPDATE_TURN_LIST_REQUEST_H_ #include "application_manager/commands/command_request_impl.h" #include "interfaces/MOBILE_API.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief UpdateTurnListRequest command class **/ -class UpdateTurnListRequest : public CommandRequestImpl { +class UpdateTurnListRequest : public app_mngr::commands::CommandRequestImpl { public: /** * @brief UpdateTurnListRequest class constructor * * @param message Incoming SmartObject message **/ - UpdateTurnListRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UpdateTurnListRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UpdateTurnListRequest class destructor @@ -70,7 +71,7 @@ class UpdateTurnListRequest : public CommandRequestImpl { * * @param event The received event */ - virtual void on_event(const event_engine::Event& event); + virtual void on_event(const app_mngr::event_engine::Event& event); private: /** @@ -95,4 +96,4 @@ class UpdateTurnListRequest : public CommandRequestImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_UPDATE_TURN_LIST_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_UPDATE_TURN_LIST_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/update_turn_list_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/update_turn_list_response.h index 481ad9f219..b5f5feba62 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/update_turn_list_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/update_turn_list_response.h @@ -31,28 +31,29 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_UPDATE_TURN_LIST_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_UPDATE_TURN_LIST_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_UPDATE_TURN_LIST_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_UPDATE_TURN_LIST_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" #include "utils/macro.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief UpdateTurnListResponse command class **/ -class UpdateTurnListResponse : public CommandResponseImpl { +class UpdateTurnListResponse : public app_mngr::commands::CommandResponseImpl { public: /** * @brief UpdateTurnListResponse class constructor * * @param message Incoming SmartObject message **/ - UpdateTurnListResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UpdateTurnListResponse(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UpdateTurnListResponse class destructor @@ -71,4 +72,4 @@ class UpdateTurnListResponse : public CommandResponseImpl { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_UPDATE_TURN_LIST_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_UPDATE_TURN_LIST_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/hmi_command_factory.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/hmi_command_factory.h index 35aca28132..00b8d3e34d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/hmi_command_factory.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/hmi_command_factory.h @@ -30,29 +30,30 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_HMI_COMMAND_FACTORY_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_HMI_COMMAND_FACTORY_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_HMI_COMMAND_FACTORY_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_HMI_COMMAND_FACTORY_H_ #include "application_manager/command_factory.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; /** * @brief Factory class for HMI command creation **/ -class HMICommandFactory : public CommandFactory { +class HMICommandFactory : public app_mngr::CommandFactory { public: - HMICommandFactory(ApplicationManager& application_manager); + HMICommandFactory(app_mngr::ApplicationManager& application_manager); - CommandSharedPtr CreateCommand( - const commands::MessageSharedPtr& message, - commands::Command::CommandSource source) OVERRIDE; + app_mngr::CommandSharedPtr CreateCommand( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::commands::Command::CommandSource source) OVERRIDE; private: - ApplicationManager& application_manager_; + app_mngr::ApplicationManager& application_manager_; DISALLOW_COPY_AND_ASSIGN(HMICommandFactory); }; } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_HMI_COMMAND_FACTORY_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_HMI_COMMAND_FACTORY_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/mobile_command_factory.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/mobile_command_factory.h index 0eddca0f14..ccbe6d0ec1 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/mobile_command_factory.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/mobile_command_factory.h @@ -30,29 +30,30 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_MOBILE_COMMAND_FACTORY_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_MOBILE_COMMAND_FACTORY_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_MOBILE_COMMAND_FACTORY_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_MOBILE_COMMAND_FACTORY_H_ #include "application_manager/command_factory.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; /** * @brief Factory class for mobile command creation **/ -class MobileCommandFactory : public CommandFactory { +class MobileCommandFactory : public app_mngr::CommandFactory { public: - MobileCommandFactory(ApplicationManager& application_manager); + MobileCommandFactory(app_mngr::ApplicationManager& application_manager); - CommandSharedPtr CreateCommand( - const commands::MessageSharedPtr& message, - commands::Command::CommandSource source) OVERRIDE; + app_mngr::CommandSharedPtr CreateCommand( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::commands::Command::CommandSource source) OVERRIDE; private: - ApplicationManager& application_manager_; + app_mngr::ApplicationManager& application_manager_; DISALLOW_COPY_AND_ASSIGN(MobileCommandFactory); }; } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_MOBILE_COMMAND_FACTORY_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_MOBILE_COMMAND_FACTORY_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/sdl_command_factory.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/sdl_command_factory.h index e04fa16f92..5bb24ad62a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/sdl_command_factory.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/sdl_command_factory.h @@ -30,8 +30,8 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_SDL_COMMAND_FACTORY_H -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_SDL_COMMAND_FACTORY_H +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_SDL_COMMAND_FACTORY_H +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_SDL_COMMAND_FACTORY_H #include <memory> #include "application_manager/application_manager.h" @@ -42,26 +42,27 @@ #include "application_manager/hmi_capabilities.h" #include "application_manager/policies/policy_handler_interface.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; -class SDLCommandFactory : public CommandFactory { +class SDLCommandFactory : public app_mngr::CommandFactory { public: - SDLCommandFactory(ApplicationManager& app_manager, - rpc_service::RPCService& rpc_service, - HMICapabilities& hmi_capabilities, + SDLCommandFactory(app_mngr::ApplicationManager& app_manager, + app_mngr::rpc_service::RPCService& rpc_service, + app_mngr::HMICapabilities& hmi_capabilities, policy::PolicyHandlerInterface& policy_handler); - CommandSharedPtr CreateCommand( - const commands::MessageSharedPtr& message, - commands::Command::CommandSource source) OVERRIDE; + app_mngr::CommandSharedPtr CreateCommand( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::commands::Command::CommandSource source) OVERRIDE; private: - ApplicationManager& app_manager_; - rpc_service::RPCService& rpc_service_; - HMICapabilities& hmi_capabilities_; + app_mngr::ApplicationManager& app_manager_; + app_mngr::rpc_service::RPCService& rpc_service_; + app_mngr::HMICapabilities& hmi_capabilities_; policy::PolicyHandlerInterface& policy_handler_; std::unique_ptr<HMICommandFactory> hmi_command_factory_; std::unique_ptr<MobileCommandFactory> mobile_command_factory_; }; } -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_SDL_COMMAND_FACTORY_H +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_SDL_COMMAND_FACTORY_H diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/sdl_rpc_plugin.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/sdl_rpc_plugin.h index 56573633ca..2cbfce3b8d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/sdl_rpc_plugin.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/sdl_rpc_plugin.h @@ -1,5 +1,5 @@ -#ifndef SDL_RPC_PLUGIN_H -#define SDL_RPC_PLUGIN_H +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_SDL_RPC_PLUGIN_H +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_SDL_RPC_PLUGIN_H #include "application_manager/plugin_manager/rpc_plugin.h" #include "application_manager/command_factory.h" @@ -33,4 +33,4 @@ class SDLRPCPlugin : public plugins::RPCPlugin { extern "C" application_manager::plugin_manager::RPCPlugin* Create(); -#endif // SDL_RPC_PLUGIN_H +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_SDL_RPC_PLUGIN_H diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/activate_app_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/activate_app_request.cc index 71b8aea206..a3778b331e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/activate_app_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/activate_app_request.cc @@ -34,12 +34,14 @@ #include "application_manager/message_helper.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -ActivateAppRequest::ActivateAppRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +ActivateAppRequest::ActivateAppRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} ActivateAppRequest::~ActivateAppRequest() { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/activate_app_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/activate_app_response.cc index d0c6797fb3..513cb42ca1 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/activate_app_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/activate_app_response.cc @@ -33,12 +33,14 @@ #include "application_manager/message_helper.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { ActivateAppResponse::ActivateAppResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} ActivateAppResponse::~ActivateAppResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/add_statistics_info_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/add_statistics_info_notification.cc index 9ffa356f07..bfdf320354 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/add_statistics_info_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/add_statistics_info_notification.cc @@ -34,12 +34,14 @@ #include "application_manager/policies/policy_handler.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { AddStatisticsInfoNotification::AddStatisticsInfoNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} AddStatisticsInfoNotification::~AddStatisticsInfoNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_all_apps_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_all_apps_request.cc index d048e8696a..cedd362807 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_all_apps_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_all_apps_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/allow_all_apps_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { AllowAllAppsRequest::AllowAllAppsRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} AllowAllAppsRequest::~AllowAllAppsRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_all_apps_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_all_apps_response.cc index 8a7b8f75d7..24430640fa 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_all_apps_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_all_apps_response.cc @@ -31,12 +31,14 @@ */ #include "sdl_rpc_plugin/commands/hmi/allow_all_apps_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { AllowAllAppsResponse::AllowAllAppsResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} AllowAllAppsResponse::~AllowAllAppsResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_app_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_app_request.cc index 9c43299fe6..5d67c59770 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_app_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_app_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/allow_app_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -AllowAppRequest::AllowAppRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +AllowAppRequest::AllowAppRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} AllowAppRequest::~AllowAppRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_app_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_app_response.cc index 8eac947391..7981ccb0f3 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_app_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_app_response.cc @@ -33,12 +33,14 @@ #include "application_manager/application_impl.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -AllowAppResponse::AllowAppResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +AllowAppResponse::AllowAppResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} AllowAppResponse::~AllowAppResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_on_awake_sdl.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_on_awake_sdl.cc index c23a9b66b1..d7ad938198 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_on_awake_sdl.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_on_awake_sdl.cc @@ -34,12 +34,14 @@ #include "application_manager/message_helper.h" #include "application_manager/resumption/resume_ctrl.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnAwakeSDLNotification::OnAwakeSDLNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnAwakeSDLNotification::~OnAwakeSDLNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_system_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_system_request.cc index 0e0c89fa94..b64212fea4 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_system_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_system_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/basic_communication_system_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { BasicCommunicationSystemRequest::BasicCommunicationSystemRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} BasicCommunicationSystemRequest::~BasicCommunicationSystemRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_system_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_system_response.cc index dbb6e126ab..9ad65e6886 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_system_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_system_response.cc @@ -34,12 +34,14 @@ #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { BasicCommunicationSystemResponse::BasicCommunicationSystemResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} BasicCommunicationSystemResponse::~BasicCommunicationSystemResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/button_get_capabilities_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/button_get_capabilities_request.cc index 989ba8aa5c..7422986fc6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/button_get_capabilities_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/button_get_capabilities_request.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/button_get_capabilities_request.h" #include "utils/logger.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { ButtonGetCapabilitiesRequest::ButtonGetCapabilitiesRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} ButtonGetCapabilitiesRequest::~ButtonGetCapabilitiesRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/button_get_capabilities_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/button_get_capabilities_response.cc index f9fc43bc9b..684f120f5e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/button_get_capabilities_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/button_get_capabilities_response.cc @@ -33,12 +33,14 @@ #include "utils/logger.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { ButtonGetCapabilitiesResponse::ButtonGetCapabilitiesResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} ButtonGetCapabilitiesResponse::~ButtonGetCapabilitiesResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/close_popup_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/close_popup_request.cc index 5b00a547e4..903bea918b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/close_popup_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/close_popup_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/close_popup_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -ClosePopupRequest::ClosePopupRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +ClosePopupRequest::ClosePopupRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} ClosePopupRequest::~ClosePopupRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/close_popup_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/close_popup_response.cc index b5070153c7..073b2638e4 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/close_popup_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/close_popup_response.cc @@ -31,12 +31,14 @@ */ #include "sdl_rpc_plugin/commands/hmi/close_popup_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -ClosePopupResponse::ClosePopupResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +ClosePopupResponse::ClosePopupResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} ClosePopupResponse::~ClosePopupResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/decrypt_certificate_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/decrypt_certificate_request.cc index 0e0b632f71..8b9b2eccd0 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/decrypt_certificate_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/decrypt_certificate_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/decrypt_certificate_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { DecryptCertificateRequest::DecryptCertificateRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} void DecryptCertificateRequest::Run() { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/decrypt_certificate_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/decrypt_certificate_response.cc index 501f38e9df..eff079c383 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/decrypt_certificate_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/decrypt_certificate_response.cc @@ -33,12 +33,14 @@ #include "application_manager/policies/policy_handler.h" #ifdef EXTERNAL_PROPRIETARY_MODE -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { DecryptCertificateResponse::DecryptCertificateResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} DecryptCertificateResponse::~DecryptCertificateResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/dial_number_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/dial_number_request.cc index 1211c796d3..8651a407d2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/dial_number_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/dial_number_request.cc @@ -32,14 +32,16 @@ #include "sdl_rpc_plugin/commands/hmi/dial_number_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { namespace hmi { -DialNumberRequest::DialNumberRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +DialNumberRequest::DialNumberRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} DialNumberRequest::~DialNumberRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/dial_number_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/dial_number_response.cc index 4db6dfc9d8..2e540a1da3 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/dial_number_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/dial_number_response.cc @@ -31,14 +31,16 @@ */ #include "sdl_rpc_plugin/commands/hmi/dial_number_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { namespace hmi { -DialNumberResponse::DialNumberResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +DialNumberResponse::DialNumberResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} DialNumberResponse::~DialNumberResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_system_info_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_system_info_request.cc index 5ff9489235..a332a6fe9a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_system_info_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_system_info_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/get_system_info_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { GetSystemInfoRequest::GetSystemInfoRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} GetSystemInfoRequest::~GetSystemInfoRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_system_info_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_system_info_response.cc index 9a6efbe996..c7f35080dc 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_system_info_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_system_info_response.cc @@ -32,11 +32,13 @@ #include "sdl_rpc_plugin/commands/hmi/get_system_info_response.h" #include "application_manager/message_helper.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { GetSystemInfoResponse::GetSystemInfoResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} GetSystemInfoResponse::~GetSystemInfoResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_urls.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_urls.cc index 2b1cd4e442..6c1ddf9367 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_urls.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_urls.cc @@ -37,10 +37,11 @@ #include "application_manager/policies/policy_handler.h" #include "utils/helpers.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -GetUrls::GetUrls(const MessageSharedPtr& message, +GetUrls::GetUrls(const application_manager::commands::MessageSharedPtr& message, ApplicationManager& application_manager) : RequestFromHMI(message, application_manager) {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_urls_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_urls_response.cc index 40f13f87bf..977ffdae73 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_urls_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_urls_response.cc @@ -33,11 +33,13 @@ #include "sdl_rpc_plugin/commands/hmi/get_urls_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -GetUrlsResponse::GetUrlsResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +GetUrlsResponse::GetUrlsResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseToHMI(message, application_manager) {} GetUrlsResponse::~GetUrlsResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/mixing_audio_supported_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/mixing_audio_supported_request.cc index 36fdfb4769..57a4012c98 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/mixing_audio_supported_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/mixing_audio_supported_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/mixing_audio_supported_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { MixingAudioSupportedRequest::MixingAudioSupportedRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} MixingAudioSupportedRequest::~MixingAudioSupportedRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/mixing_audio_supported_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/mixing_audio_supported_response.cc index 376c07d178..f8ab03cdc9 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/mixing_audio_supported_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/mixing_audio_supported_response.cc @@ -31,12 +31,14 @@ */ #include "sdl_rpc_plugin/commands/hmi/mixing_audio_supported_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { MixingAudioSupportedResponse::MixingAudioSupportedResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} MixingAudioSupportedResponse::~MixingAudioSupportedResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_alert_maneuver_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_alert_maneuver_request.cc index af98923ae7..d74425efe1 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_alert_maneuver_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_alert_maneuver_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/navi_alert_maneuver_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { NaviAlertManeuverRequest::NaviAlertManeuverRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} NaviAlertManeuverRequest::~NaviAlertManeuverRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_alert_maneuver_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_alert_maneuver_response.cc index dc03fa102f..9b734f27cb 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_alert_maneuver_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_alert_maneuver_response.cc @@ -34,12 +34,14 @@ #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { NaviAlertManeuverResponse::NaviAlertManeuverResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} NaviAlertManeuverResponse::~NaviAlertManeuverResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_start_stream_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_start_stream_request.cc index e13697f727..4c09b27170 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_start_stream_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_start_stream_request.cc @@ -35,12 +35,14 @@ #include "application_manager/message_helper.h" #include "protocol_handler/protocol_handler.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { AudioStartStreamRequest::AudioStartStreamRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) , EventObserver(application_manager.event_dispatcher()) , retry_number_(0) { @@ -58,7 +60,7 @@ AudioStartStreamRequest::~AudioStartStreamRequest() {} void AudioStartStreamRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); - if (!CheckAvailabilityHMIInterfaces( + if (!app_mngr::commands::CheckAvailabilityHMIInterfaces( application_manager_, HmiInterfaces::HMI_INTERFACE_Navigation)) { LOG4CXX_INFO(logger_, "Interface Navi is not supported by system"); return; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_start_stream_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_start_stream_response.cc index 2e2d5215d2..e20fd0cbd6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_start_stream_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_start_stream_response.cc @@ -31,12 +31,14 @@ */ #include "sdl_rpc_plugin/commands/hmi/navi_audio_start_stream_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { AudioStartStreamResponse::AudioStartStreamResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} AudioStartStreamResponse::~AudioStartStreamResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_stop_stream_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_stop_stream_request.cc index 0247d0a1be..8ec7fa6b59 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_stop_stream_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_stop_stream_request.cc @@ -31,19 +31,21 @@ */ #include "sdl_rpc_plugin/commands/hmi/navi_audio_stop_stream_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { AudioStopStreamRequest::AudioStopStreamRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} AudioStopStreamRequest::~AudioStopStreamRequest() {} void AudioStopStreamRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); - if (!CheckAvailabilityHMIInterfaces( + if (!app_mngr::commands::CheckAvailabilityHMIInterfaces( application_manager_, HmiInterfaces::HMI_INTERFACE_Navigation)) { LOG4CXX_INFO(logger_, "Interface Navi is not supported by system"); return; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_stop_stream_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_stop_stream_response.cc index fdb7ba2c49..95dc5bc9a7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_stop_stream_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_stop_stream_response.cc @@ -31,12 +31,14 @@ */ #include "sdl_rpc_plugin/commands/hmi/navi_audio_stop_stream_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { AudioStopStreamResponse::AudioStopStreamResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} AudioStopStreamResponse::~AudioStopStreamResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_get_way_points_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_get_way_points_request.cc index 42d78e6996..b41367f1a8 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_get_way_points_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_get_way_points_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/navi_get_way_points_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { NaviGetWayPointsRequest::NaviGetWayPointsRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} NaviGetWayPointsRequest::~NaviGetWayPointsRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_get_way_points_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_get_way_points_response.cc index 3d5331f5d8..7ab71110da 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_get_way_points_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_get_way_points_response.cc @@ -34,12 +34,14 @@ #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { NaviGetWayPointsResponse::NaviGetWayPointsResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} NaviGetWayPointsResponse::~NaviGetWayPointsResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_is_ready_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_is_ready_request.cc index de24f5f574..14e7969283 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_is_ready_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_is_ready_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/navi_is_ready_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -NaviIsReadyRequest::NaviIsReadyRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +NaviIsReadyRequest::NaviIsReadyRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) , EventObserver(application_manager.event_dispatcher()) {} @@ -57,10 +59,10 @@ void NaviIsReadyRequest::on_event(const event_engine::Event& event) { case hmi_apis::FunctionID::Navigation_IsReady: { LOG4CXX_DEBUG(logger_, "Received Navigation_IsReady event"); unsubscribe_from_event(hmi_apis::FunctionID::Navigation_IsReady); - const bool is_available = - ChangeInterfaceState(application_manager_, - message, - HmiInterfaces::HMI_INTERFACE_Navigation); + const bool is_available = app_mngr::commands::ChangeInterfaceState( + application_manager_, + message, + HmiInterfaces::HMI_INTERFACE_Navigation); HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities(); diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_is_ready_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_is_ready_response.cc index e31120b224..2dfcbfc6b7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_is_ready_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_is_ready_response.cc @@ -31,12 +31,14 @@ */ #include "sdl_rpc_plugin/commands/hmi/navi_is_ready_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { NaviIsReadyResponse::NaviIsReadyResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} NaviIsReadyResponse::~NaviIsReadyResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_send_location_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_send_location_request.cc index 56675618db..73cca16b8c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_send_location_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_send_location_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/navi_send_location_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { NaviSendLocationRequest::NaviSendLocationRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} NaviSendLocationRequest::~NaviSendLocationRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_send_location_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_send_location_response.cc index 598a1bebe4..8b017acf69 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_send_location_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_send_location_response.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/navi_send_location_response.h" #include "application_manager/event_engine/event.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { NaviSendLocationResponse::NaviSendLocationResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} NaviSendLocationResponse::~NaviSendLocationResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_set_video_config_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_set_video_config_request.cc index ea98701ffd..5c985021e9 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_set_video_config_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_set_video_config_request.cc @@ -34,12 +34,14 @@ #include <string> #include <vector> -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { NaviSetVideoConfigRequest::NaviSetVideoConfigRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) , EventObserver(application_manager.event_dispatcher()) {} @@ -47,7 +49,7 @@ NaviSetVideoConfigRequest::~NaviSetVideoConfigRequest() {} void NaviSetVideoConfigRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); - if (!CheckAvailabilityHMIInterfaces( + if (!app_mngr::commands::CheckAvailabilityHMIInterfaces( application_manager_, HmiInterfaces::HMI_INTERFACE_Navigation)) { LOG4CXX_WARN(logger_, "HMI interface Navigation is not supported"); return; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_set_video_config_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_set_video_config_response.cc index 34fc56e664..199ccd670d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_set_video_config_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_set_video_config_response.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/navi_set_video_config_response.h" #include "application_manager/event_engine/event.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { NaviSetVideoConfigResponse::NaviSetVideoConfigResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} NaviSetVideoConfigResponse::~NaviSetVideoConfigResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_show_constant_tbt_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_show_constant_tbt_request.cc index 28e19b846c..b836dd5284 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_show_constant_tbt_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_show_constant_tbt_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/navi_show_constant_tbt_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { NaviShowConstantTBTRequest::NaviShowConstantTBTRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} NaviShowConstantTBTRequest::~NaviShowConstantTBTRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_show_constant_tbt_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_show_constant_tbt_response.cc index fe3244d5ed..5060393cfb 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_show_constant_tbt_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_show_constant_tbt_response.cc @@ -34,12 +34,14 @@ #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { NaviShowConstantTBTResponse::NaviShowConstantTBTResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} NaviShowConstantTBTResponse::~NaviShowConstantTBTResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_start_stream_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_start_stream_request.cc index 112de0e4e1..4d2457acde 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_start_stream_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_start_stream_request.cc @@ -35,12 +35,14 @@ #include "application_manager/message_helper.h" #include "protocol_handler/protocol_handler.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { NaviStartStreamRequest::NaviStartStreamRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) , EventObserver(application_manager.event_dispatcher()) , retry_number_(0) { @@ -58,7 +60,7 @@ NaviStartStreamRequest::~NaviStartStreamRequest() {} void NaviStartStreamRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); - if (!CheckAvailabilityHMIInterfaces( + if (!app_mngr::commands::CheckAvailabilityHMIInterfaces( application_manager_, HmiInterfaces::HMI_INTERFACE_Navigation)) { LOG4CXX_INFO(logger_, "Interface Navi is not supported by system"); return; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_start_stream_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_start_stream_response.cc index 7ea082da08..d3215c8d82 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_start_stream_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_start_stream_response.cc @@ -31,12 +31,14 @@ */ #include "sdl_rpc_plugin/commands/hmi/navi_start_stream_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { NaviStartStreamResponse::NaviStartStreamResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} NaviStartStreamResponse::~NaviStartStreamResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_stop_stream_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_stop_stream_request.cc index c3d6ed6675..0961315c2c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_stop_stream_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_stop_stream_request.cc @@ -1,18 +1,20 @@ #include "sdl_rpc_plugin/commands/hmi/navi_stop_stream_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { NaviStopStreamRequest::NaviStopStreamRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} NaviStopStreamRequest::~NaviStopStreamRequest() {} void NaviStopStreamRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); - if (!CheckAvailabilityHMIInterfaces( + if (!app_mngr::commands::CheckAvailabilityHMIInterfaces( application_manager_, HmiInterfaces::HMI_INTERFACE_Navigation)) { LOG4CXX_INFO(logger_, "Interface Navi is not supported by system"); return; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_stop_stream_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_stop_stream_response.cc index 8ba80eca2c..94dcfb729c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_stop_stream_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_stop_stream_response.cc @@ -31,12 +31,14 @@ */ #include "sdl_rpc_plugin/commands/hmi/navi_stop_stream_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { NaviStopStreamResponse::NaviStopStreamResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} NaviStopStreamResponse::~NaviStopStreamResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_subscribe_way_points_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_subscribe_way_points_request.cc index 6faf5cedca..e614a96316 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_subscribe_way_points_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_subscribe_way_points_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/navi_subscribe_way_points_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { NaviSubscribeWayPointsRequest::NaviSubscribeWayPointsRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} NaviSubscribeWayPointsRequest::~NaviSubscribeWayPointsRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_subscribe_way_points_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_subscribe_way_points_response.cc index d2a64e3945..17701a430c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_subscribe_way_points_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_subscribe_way_points_response.cc @@ -34,12 +34,14 @@ #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { NaviSubscribeWayPointsResponse::NaviSubscribeWayPointsResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} NaviSubscribeWayPointsResponse::~NaviSubscribeWayPointsResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_unsubscribe_way_points_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_unsubscribe_way_points_request.cc index 5a1aafa0a1..421de032b2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_unsubscribe_way_points_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_unsubscribe_way_points_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/navi_unsubscribe_way_points_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { NaviUnSubscribeWayPointsRequest::NaviUnSubscribeWayPointsRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} NaviUnSubscribeWayPointsRequest::~NaviUnSubscribeWayPointsRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_unsubscribe_way_points_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_unsubscribe_way_points_response.cc index 183ad8b6f8..afc32d371a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_unsubscribe_way_points_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_unsubscribe_way_points_response.cc @@ -35,12 +35,14 @@ #include "interfaces/MOBILE_API.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { NaviUnsubscribeWayPointsResponse::NaviUnsubscribeWayPointsResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} NaviUnsubscribeWayPointsResponse::~NaviUnsubscribeWayPointsResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_update_turn_list_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_update_turn_list_request.cc index 809286d035..62e34f586d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_update_turn_list_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_update_turn_list_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/navi_update_turn_list_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { NaviUpdateTurnListRequest::NaviUpdateTurnListRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} NaviUpdateTurnListRequest::~NaviUpdateTurnListRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_update_turn_list_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_update_turn_list_response.cc index 5d7baf874d..4231b5055e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_update_turn_list_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_update_turn_list_response.cc @@ -34,12 +34,14 @@ #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { NaviUpdateTurnListResponse::NaviUpdateTurnListResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} NaviUpdateTurnListResponse::~NaviUpdateTurnListResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/notification_from_hmi.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/notification_from_hmi.cc index 5e7bd7b673..ec8a9af8f5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/notification_from_hmi.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/notification_from_hmi.cc @@ -30,17 +30,19 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" #include "application_manager/rpc_service.h" #include "smart_objects/smart_object.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { NotificationFromHMI::NotificationFromHMI( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandImpl(message, application_manager) { // Replace HMI app id with Mobile connection id ReplaceHMIWithMobileAppId(*message); @@ -59,7 +61,7 @@ bool NotificationFromHMI::CleanUp() { void NotificationFromHMI::Run() {} void NotificationFromHMI::SendNotificationToMobile( - const MessageSharedPtr& message) { + const application_manager::commands::MessageSharedPtr& message) { (*message)[strings::params][strings::message_type] = static_cast<int32_t>(application_manager::MessageType::kNotification); application_manager_.GetRPCService().ManageMobileCommand(message, SOURCE_SDL); diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/notification_to_hmi.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/notification_to_hmi.cc index fcdee1a57b..252ddbec87 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/notification_to_hmi.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/notification_to_hmi.cc @@ -30,16 +30,18 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "sdl_rpc_plugin/commands/hmi/notification_to_hmi.h" +#include "application_manager/commands/notification_to_hmi.h" #include "application_manager/application_manager.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -NotificationToHMI::NotificationToHMI(const MessageSharedPtr& message, - ApplicationManager& application_manager) +NotificationToHMI::NotificationToHMI( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandImpl(message, application_manager) {} NotificationToHMI::~NotificationToHMI() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_allow_sdl_functionality_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_allow_sdl_functionality_notification.cc index 69bfb76fe9..48f55c0480 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_allow_sdl_functionality_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_allow_sdl_functionality_notification.cc @@ -34,12 +34,14 @@ #include "application_manager/application_manager.h" #include "application_manager/policies/policy_handler.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnAllowSDLFunctionalityNotification::OnAllowSDLFunctionalityNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnAllowSDLFunctionalityNotification::~OnAllowSDLFunctionalityNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_activated_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_activated_notification.cc index 543f64f367..84a3f651fe 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_activated_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_activated_notification.cc @@ -35,12 +35,14 @@ #include "application_manager/message_helper.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnAppActivatedNotification::OnAppActivatedNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnAppActivatedNotification::~OnAppActivatedNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_deactivated_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_deactivated_notification.cc index 3665292d17..5bbdbbbc4e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_deactivated_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_deactivated_notification.cc @@ -37,12 +37,14 @@ #include "utils/helpers.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnAppDeactivatedNotification::OnAppDeactivatedNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnAppDeactivatedNotification::~OnAppDeactivatedNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_permission_changed_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_permission_changed_notification.cc index 9ddb551460..26cf5e244d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_permission_changed_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_permission_changed_notification.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_app_permission_changed_notification.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnAppPermissionChangedNotification::OnAppPermissionChangedNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationToHMI(message, application_manager) {} OnAppPermissionChangedNotification::~OnAppPermissionChangedNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_permission_consent_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_permission_consent_notification.cc index 1c85e0f352..bc76568404 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_permission_consent_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_permission_consent_notification.cc @@ -108,12 +108,14 @@ struct ExternalConsentStatusAppender #endif } // namespace -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnAppPermissionConsentNotification::OnAppPermissionConsentNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnAppPermissionConsentNotification::~OnAppPermissionConsentNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_registered_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_registered_notification.cc index 2f7a590260..e73da8e966 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_registered_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_registered_notification.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_app_registered_notification.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnAppRegisteredNotification::OnAppRegisteredNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationToHMI(message, application_manager) {} OnAppRegisteredNotification::~OnAppRegisteredNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_unregistered_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_unregistered_notification.cc index b7f2c47ccf..a7643cc4e7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_unregistered_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_unregistered_notification.cc @@ -34,12 +34,14 @@ #include "application_manager/event_engine/event.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnAppUnregisteredNotification::OnAppUnregisteredNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationToHMI(message, application_manager) {} OnAppUnregisteredNotification::~OnAppUnregisteredNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_audio_data_streaming_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_audio_data_streaming_notification.cc index 432c78e13a..ba3355be37 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_audio_data_streaming_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_audio_data_streaming_notification.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_audio_data_streaming_notification.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnAudioDataStreamingNotification::OnAudioDataStreamingNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationToHMI(message, application_manager) {} OnAudioDataStreamingNotification::~OnAudioDataStreamingNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_button_event_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_button_event_notification.cc index 22a9935fc7..463812d3a1 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_button_event_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_button_event_notification.cc @@ -35,14 +35,16 @@ #include "application_manager/application_impl.h" #include "utils/logger.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { namespace hmi { OnButtonEventNotification::OnButtonEventNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} void OnButtonEventNotification::Run() { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_button_press_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_button_press_notification.cc index 024103ed81..86592ea985 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_button_press_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_button_press_notification.cc @@ -36,14 +36,16 @@ #include "utils/logger.h" #include "application_manager/event_engine/event.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { namespace hmi { OnButtonPressNotification::OnButtonPressNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} void OnButtonPressNotification::Run() { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_button_subscription_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_button_subscription_notification.cc index 12eb9550c4..157d49491d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_button_subscription_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_button_subscription_notification.cc @@ -32,14 +32,16 @@ #include "sdl_rpc_plugin/commands/hmi/on_button_subscription_notification.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { namespace hmi { OnButtonSubscriptionNotification::OnButtonSubscriptionNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationToHMI(message, application_manager) {} OnButtonSubscriptionNotification::~OnButtonSubscriptionNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_device_chosen_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_device_chosen_notification.cc index 7484b3f1fa..880cc33077 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_device_chosen_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_device_chosen_notification.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_device_chosen_notification.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnDeviceChosenNotification::OnDeviceChosenNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnDeviceChosenNotification::~OnDeviceChosenNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_device_state_changed_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_device_state_changed_notification.cc index a75acebb7a..b94fb2d020 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_device_state_changed_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_device_state_changed_notification.cc @@ -74,12 +74,14 @@ std::string convert_to_bt_mac(std::string& deviceInternalId) { } } -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnDeviceStateChangedNotification::OnDeviceStateChangedNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnDeviceStateChangedNotification::~OnDeviceStateChangedNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_driver_distraction_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_driver_distraction_notification.cc index 221cb34211..bf37a2753b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_driver_distraction_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_driver_distraction_notification.cc @@ -39,7 +39,8 @@ #include "interfaces/HMI_API.h" #include "utils/make_shared.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { @@ -93,7 +94,8 @@ struct OnDriverDistractionProcessor { } OnDriverDistractionNotification::OnDriverDistractionNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnDriverDistractionNotification::~OnDriverDistractionNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_event_changed_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_event_changed_notification.cc index 67f132e8e2..2d02b8c5f5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_event_changed_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_event_changed_notification.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_event_changed_notification.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnEventChangedNotification::OnEventChangedNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnEventChangedNotification::~OnEventChangedNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_exit_all_applications_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_exit_all_applications_notification.cc index 07dbe93ed2..e1d7450e2e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_exit_all_applications_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_exit_all_applications_notification.cc @@ -41,12 +41,14 @@ #include "application_manager/resumption/resume_ctrl.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnExitAllApplicationsNotification::OnExitAllApplicationsNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnExitAllApplicationsNotification::~OnExitAllApplicationsNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_exit_application_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_exit_application_notification.cc index 6c093ab2ea..b831942248 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_exit_application_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_exit_application_notification.cc @@ -39,12 +39,14 @@ #include "interfaces/MOBILE_API.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnExitApplicationNotification::OnExitApplicationNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnExitApplicationNotification::~OnExitApplicationNotification() {} @@ -77,7 +79,7 @@ void OnExitApplicationNotification::Run() { application_manager_.GetRPCService().ManageMobileCommand( MessageHelper::GetOnAppInterfaceUnregisteredNotificationToMobile( app_id, AppInterfaceUnregisteredReason::APP_UNAUTHORIZED), - commands::Command::SOURCE_SDL); + SOURCE_SDL); // HMI rejects registration for navi application application_manager_.UnregisterApplication(app_id, Result::SUCCESS); return; @@ -86,7 +88,7 @@ void OnExitApplicationNotification::Run() { application_manager_.GetRPCService().ManageMobileCommand( MessageHelper::GetOnAppInterfaceUnregisteredNotificationToMobile( app_id, AppInterfaceUnregisteredReason::UNSUPPORTED_HMI_RESOURCE), - commands::Command::SOURCE_SDL); + SOURCE_SDL); application_manager_.UnregisterApplication(app_id, Result::SUCCESS); return; } diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_file_removed_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_file_removed_notification.cc index fd2a2d33ed..a279457ef9 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_file_removed_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_file_removed_notification.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_file_removed_notification.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnFileRemovedNotification::OnFileRemovedNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationToHMI(message, application_manager) {} OnFileRemovedNotification::~OnFileRemovedNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_find_applications.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_find_applications.cc index 94315036e6..57bda08c81 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_find_applications.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_find_applications.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_find_applications.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -OnFindApplications::OnFindApplications(const MessageSharedPtr& message, - ApplicationManager& application_manager) +OnFindApplications::OnFindApplications( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnFindApplications::~OnFindApplications() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ignition_cycle_over_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ignition_cycle_over_notification.cc index ca837d0cac..e125eefa56 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ignition_cycle_over_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ignition_cycle_over_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_ignition_cycle_over_notification.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnIgnitionCycleOverNotification::OnIgnitionCycleOverNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnIgnitionCycleOverNotification::~OnIgnitionCycleOverNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_navi_tbt_client_state_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_navi_tbt_client_state_notification.cc index f4b24a242d..e91b5f924d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_navi_tbt_client_state_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_navi_tbt_client_state_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_navi_tbt_client_state_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnNaviTBTClientStateNotification::OnNaviTBTClientStateNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnNaviTBTClientStateNotification::~OnNaviTBTClientStateNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_navi_way_point_change_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_navi_way_point_change_notification.cc index 42a76ff153..2416b492d6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_navi_way_point_change_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_navi_way_point_change_notification.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_navi_way_point_change_notification.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnNaviWayPointChangeNotification::OnNaviWayPointChangeNotification( - const MessageSharedPtr& message, ApplicationManager& app_man) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& app_man) : NotificationFromHMI(message, app_man) {} OnNaviWayPointChangeNotification::~OnNaviWayPointChangeNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_policy_update.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_policy_update.cc index f865653ca3..134f94c641 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_policy_update.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_policy_update.cc @@ -33,11 +33,13 @@ #include "sdl_rpc_plugin/commands/hmi/on_policy_update.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -OnPolicyUpdate::OnPolicyUpdate(const MessageSharedPtr& message, - ApplicationManager& application_manager) +OnPolicyUpdate::OnPolicyUpdate( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnPolicyUpdate::~OnPolicyUpdate() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_put_file_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_put_file_notification.cc index a9ce3e0344..a9384e05af 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_put_file_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_put_file_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_put_file_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnPutFileNotification::OnPutFileNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationToHMI(message, application_manager) {} OnPutFileNotification::~OnPutFileNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ready_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ready_notification.cc index fdb9e7aa8f..abc6f627b5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ready_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ready_notification.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_ready_notification.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnReadyNotification::OnReadyNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnReadyNotification::~OnReadyNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_received_policy_update.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_received_policy_update.cc index 2802499cf9..19c1c27161 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_received_policy_update.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_received_policy_update.cc @@ -35,12 +35,14 @@ #include "application_manager/application_manager.h" #include "utils/file_system.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnReceivedPolicyUpdate::OnReceivedPolicyUpdate( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnReceivedPolicyUpdate::~OnReceivedPolicyUpdate() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_record_start_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_record_start_notification.cc index 012fe3c382..d170d3553f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_record_start_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_record_start_notification.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_record_start_notification.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnRecordStartdNotification::OnRecordStartdNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationToHMI(message, application_manager) {} OnRecordStartdNotification::~OnRecordStartdNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_resume_audio_source_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_resume_audio_source_notification.cc index 16f55d0a4f..ee2031c467 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_resume_audio_source_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_resume_audio_source_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_resume_audio_source_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnResumeAudioSourceNotification::OnResumeAudioSourceNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationToHMI(message, application_manager) {} OnResumeAudioSourceNotification::~OnResumeAudioSourceNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_sdl_close_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_sdl_close_notification.cc index f86c6829d7..487d8a8fc6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_sdl_close_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_sdl_close_notification.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_sdl_close_notification.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnSDLCloseNotification::OnSDLCloseNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationToHMI(message, application_manager) {} OnSDLCloseNotification::~OnSDLCloseNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_sdl_consent_needed_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_sdl_consent_needed_notification.cc index 5bd9214396..0d88e69c0a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_sdl_consent_needed_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_sdl_consent_needed_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_sdl_consent_needed_notification.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnSDLConsentNeededNotification::OnSDLConsentNeededNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationToHMI(message, application_manager) {} OnSDLConsentNeededNotification::~OnSDLConsentNeededNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_sdl_persistence_complete_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_sdl_persistence_complete_notification.cc index b94f4b97ec..24618651ed 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_sdl_persistence_complete_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_sdl_persistence_complete_notification.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_sdl_persistence_complete_notification.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnSDLPersistenceCompleteNotification::OnSDLPersistenceCompleteNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationToHMI(message, application_manager) {} OnSDLPersistenceCompleteNotification::~OnSDLPersistenceCompleteNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_start_device_discovery.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_start_device_discovery.cc index 642e29e959..ed2a944dc4 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_start_device_discovery.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_start_device_discovery.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_start_device_discovery.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnStartDeviceDiscovery::OnStartDeviceDiscovery( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnStartDeviceDiscovery::~OnStartDeviceDiscovery() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_status_update_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_status_update_notification.cc index 9b44d480a0..5742ae6a69 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_status_update_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_status_update_notification.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_status_update_notification.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnStatusUpdateNotification::OnStatusUpdateNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationToHMI(message, application_manager) {} OnStatusUpdateNotification::~OnStatusUpdateNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_context_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_context_notification.cc index 2c86931878..29ef9904df 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_context_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_context_notification.cc @@ -36,11 +36,13 @@ #include "application_manager/state_controller.h" #include "application_manager/message_helper.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnSystemContextNotification::OnSystemContextNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnSystemContextNotification::~OnSystemContextNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_error_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_error_notification.cc index 48bf18da90..857df0b6de 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_error_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_error_notification.cc @@ -34,12 +34,14 @@ #include "application_manager/application_manager.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnSystemErrorNotification::OnSystemErrorNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnSystemErrorNotification::~OnSystemErrorNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_info_changed_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_info_changed_notification.cc index 15997a21fb..1bd014b26f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_info_changed_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_info_changed_notification.cc @@ -34,12 +34,14 @@ #include "application_manager/application_manager.h" #include "application_manager/message_helper.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnSystemInfoChangedNotification::OnSystemInfoChangedNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnSystemInfoChangedNotification::~OnSystemInfoChangedNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_request_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_request_notification.cc index 9492bc8299..65d208a24f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_request_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_request_notification.cc @@ -39,12 +39,14 @@ using policy::PolicyHandlerInterface; -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnSystemRequestNotification::OnSystemRequestNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnSystemRequestNotification::~OnSystemRequestNotification() {} 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 b053ca987c..975d8b2f03 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 @@ -37,12 +37,14 @@ #include "application_manager/rpc_service.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnTTSLanguageChangeNotification::OnTTSLanguageChangeNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnTTSLanguageChangeNotification::~OnTTSLanguageChangeNotification() {} @@ -82,7 +84,7 @@ void OnTTSLanguageChangeNotification::Run() { MessageHelper::GetOnAppInterfaceUnregisteredNotificationToMobile( app->app_id(), mobile_api::AppInterfaceUnregisteredReason::LANGUAGE_CHANGE), - commands::Command::SOURCE_SDL); + SOURCE_SDL); application_manager_.UnregisterApplication( app->app_id(), mobile_apis::Result::SUCCESS, false); } diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_reset_timeout_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_reset_timeout_notification.cc index ed5522a92a..0457bbe1a0 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_reset_timeout_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_reset_timeout_notification.cc @@ -2,14 +2,16 @@ #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { namespace hmi { OnTTSResetTimeoutNotification::OnTTSResetTimeoutNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnTTSResetTimeoutNotification::~OnTTSResetTimeoutNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_started_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_started_notification.cc index 9f9d4bc1f3..79207ad7ce 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_started_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_started_notification.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_tts_started_notification.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnTTSStartedNotification::OnTTSStartedNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnTTSStartedNotification::~OnTTSStartedNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_stopped_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_stopped_notification.cc index c3ae14fd96..0d1a8c2470 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_stopped_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_stopped_notification.cc @@ -34,12 +34,14 @@ #include "application_manager/event_engine/event.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnTTSStoppedNotification::OnTTSStoppedNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnTTSStoppedNotification::~OnTTSStoppedNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_command_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_command_notification.cc index 91ebc144af..85449cebd7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_command_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_command_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_ui_command_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnUICommandNotification::OnUICommandNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnUICommandNotification::~OnUICommandNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_keyboard_input_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_keyboard_input_notification.cc index 58e78a41dc..05e15ba7ba 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_keyboard_input_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_keyboard_input_notification.cc @@ -33,14 +33,16 @@ #include "sdl_rpc_plugin/commands/hmi/on_ui_keyboard_input_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { namespace hmi { OnUIKeyBoardInputNotification::OnUIKeyBoardInputNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnUIKeyBoardInputNotification::~OnUIKeyBoardInputNotification() {} 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 9180be158e..322601e7ce 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 @@ -37,12 +37,14 @@ #include "application_manager/rpc_service.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnUILanguageChangeNotification::OnUILanguageChangeNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnUILanguageChangeNotification::~OnUILanguageChangeNotification() {} @@ -81,7 +83,7 @@ void OnUILanguageChangeNotification::Run() { MessageHelper::GetOnAppInterfaceUnregisteredNotificationToMobile( app->app_id(), mobile_api::AppInterfaceUnregisteredReason::LANGUAGE_CHANGE), - commands::Command::SOURCE_SDL); + SOURCE_SDL); application_manager_.UnregisterApplication( app->app_id(), mobile_apis::Result::SUCCESS, false); } diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_reset_timeout_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_reset_timeout_notification.cc index e75660206f..1bb5a8cf20 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_reset_timeout_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_reset_timeout_notification.cc @@ -34,14 +34,16 @@ #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { namespace hmi { OnUIResetTimeoutNotification::OnUIResetTimeoutNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnUIResetTimeoutNotification::~OnUIResetTimeoutNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_touch_event_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_touch_event_notification.cc index 9894cf110f..ca9cab3c0d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_touch_event_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_touch_event_notification.cc @@ -33,14 +33,16 @@ #include "sdl_rpc_plugin/commands/hmi/on_ui_touch_event_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { namespace hmi { OnUITouchEventNotification::OnUITouchEventNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnUITouchEventNotification::~OnUITouchEventNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_update_device_list.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_update_device_list.cc index 7b49e82906..2c08cbae94 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_update_device_list.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_update_device_list.cc @@ -31,12 +31,14 @@ */ #include "sdl_rpc_plugin/commands/hmi/on_update_device_list.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -OnUpdateDeviceList::OnUpdateDeviceList(const MessageSharedPtr& message, - ApplicationManager& application_manager) +OnUpdateDeviceList::OnUpdateDeviceList( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnUpdateDeviceList::~OnUpdateDeviceList() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_acc_pedal_position_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_acc_pedal_position_notification.cc index dcd7aa99ce..2050384e53 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_acc_pedal_position_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_acc_pedal_position_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vi_acc_pedal_position_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVIAccPedalPositionNotification::OnVIAccPedalPositionNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVIAccPedalPositionNotification::~OnVIAccPedalPositionNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_belt_status_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_belt_status_notification.cc index c37aa616a0..794a9dffe5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_belt_status_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_belt_status_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vi_belt_status_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVIBeltStatusNotification::OnVIBeltStatusNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVIBeltStatusNotification::~OnVIBeltStatusNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_body_information_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_body_information_notification.cc index d61002e808..2e8ad0fd0c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_body_information_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_body_information_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vi_body_information_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVIBodyInformationNotification::OnVIBodyInformationNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVIBodyInformationNotification::~OnVIBodyInformationNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_device_status_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_device_status_notification.cc index 4a84f648f6..32f3a5437f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_device_status_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_device_status_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vi_device_status_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVIDeviceStatusNotification::OnVIDeviceStatusNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVIDeviceStatusNotification::~OnVIDeviceStatusNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_driver_braking_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_driver_braking_notification.cc index d1b6f24806..6ef2385b09 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_driver_braking_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_driver_braking_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vi_driver_braking_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVIDriverBrakingNotification::OnVIDriverBrakingNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVIDriverBrakingNotification::~OnVIDriverBrakingNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_engine_torque_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_engine_torque_notification.cc index 2d0d54c971..5b0fa5fef6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_engine_torque_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_engine_torque_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vi_engine_torque_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVIEngineTorqueNotification::OnVIEngineTorqueNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVIEngineTorqueNotification::~OnVIEngineTorqueNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_external_temperature_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_external_temperature_notification.cc index 13d228c495..a57ef6afb4 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_external_temperature_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_external_temperature_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vi_external_temperature_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVIExternalTemperatureNotification::OnVIExternalTemperatureNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVIExternalTemperatureNotification::~OnVIExternalTemperatureNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_fuel_level_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_fuel_level_notification.cc index 5f79b61261..b8829a6983 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_fuel_level_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_fuel_level_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vi_fuel_level_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVIFuelLevelNotification::OnVIFuelLevelNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVIFuelLevelNotification::~OnVIFuelLevelNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_fuel_level_state_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_fuel_level_state_notification.cc index 057524e176..e932eb8f53 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_fuel_level_state_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_fuel_level_state_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vi_fuel_level_state_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVIFuelLevelStateNotification::OnVIFuelLevelStateNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVIFuelLevelStateNotification::~OnVIFuelLevelStateNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_gps_data_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_gps_data_notification.cc index d393380cae..79e6f61773 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_gps_data_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_gps_data_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vi_gps_data_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVIGpsDataNotification::OnVIGpsDataNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVIGpsDataNotification::~OnVIGpsDataNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_head_lamp_status_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_head_lamp_status_notification.cc index 2bdf887b55..e7222080e1 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_head_lamp_status_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_head_lamp_status_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vi_head_lamp_status_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVIHeadLampStatusNotification::OnVIHeadLampStatusNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVIHeadLampStatusNotification::~OnVIHeadLampStatusNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_instant_fuel_consumption_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_instant_fuel_consumption_notification.cc index c266201b8c..21c327ef62 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_instant_fuel_consumption_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_instant_fuel_consumption_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vi_instant_fuel_consumption_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVIInstantFuelConsumptionNotification::OnVIInstantFuelConsumptionNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVIInstantFuelConsumptionNotification:: diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_my_key_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_my_key_notification.cc index 0c5136f7dd..8253216056 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_my_key_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_my_key_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vi_my_key_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVIMyKeyNotification::OnVIMyKeyNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVIMyKeyNotification::~OnVIMyKeyNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_odometer_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_odometer_notification.cc index a670061680..11de1ee053 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_odometer_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_odometer_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vi_odometer_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVIOdometerNotification::OnVIOdometerNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVIOdometerNotification::~OnVIOdometerNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_prndl_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_prndl_notification.cc index 441447e725..0c57cceeb5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_prndl_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_prndl_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vi_prndl_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVIPrndlNotification::OnVIPrndlNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVIPrndlNotification::~OnVIPrndlNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_rpm_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_rpm_notification.cc index 7a971113f7..f198877279 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_rpm_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_rpm_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vi_rpm_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVIRpmNotification::OnVIRpmNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVIRpmNotification::~OnVIRpmNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_speed_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_speed_notification.cc index a5abd73b7e..bfa13c4d95 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_speed_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_speed_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vi_speed_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVISpeedNotification::OnVISpeedNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVISpeedNotification::~OnVISpeedNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_steering_wheel_angle_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_steering_wheel_angle_notification.cc index 932d1d6e40..82770593f7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_steering_wheel_angle_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_steering_wheel_angle_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vi_steering_wheel_angle_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVISteeringWheelAngleNotification::OnVISteeringWheelAngleNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVISteeringWheelAngleNotification::~OnVISteeringWheelAngleNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_tire_pressure_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_tire_pressure_notification.cc index 485cd157ea..7ff35bd370 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_tire_pressure_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_tire_pressure_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vi_tire_pressure_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVITirePressureNotification::OnVITirePressureNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVITirePressureNotification::~OnVITirePressureNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_vehicle_data_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_vehicle_data_notification.cc index 033f40bd6a..7477f2fd1f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_vehicle_data_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_vehicle_data_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vi_vehicle_data_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVIVehicleDataNotification::OnVIVehicleDataNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVIVehicleDataNotification::~OnVIVehicleDataNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_vin_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_vin_notification.cc index 4f683bba04..a16d0250a8 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_vin_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_vin_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vi_vin_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVIVinNotification::OnVIVinNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVIVinNotification::~OnVIVinNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_wiper_status_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_wiper_status_notification.cc index 82fda0a90c..e39dddf0d0 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_wiper_status_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_wiper_status_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vi_wiper_status_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVIWiperStatusNotification::OnVIWiperStatusNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVIWiperStatusNotification::~OnVIWiperStatusNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_video_data_streaming_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_video_data_streaming_notification.cc index 0c61c45b55..1033bd3853 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_video_data_streaming_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_video_data_streaming_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_video_data_streaming_notification.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVideoDataStreamingNotification::OnVideoDataStreamingNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationToHMI(message, application_manager) {} OnVideoDataStreamingNotification::~OnVideoDataStreamingNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_command_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_command_notification.cc index 6f6da58399..80edee5052 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_command_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_command_notification.cc @@ -40,12 +40,14 @@ #include "interfaces/HMI_API.h" #include "application_manager/event_engine/event.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVRCommandNotification::OnVRCommandNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVRCommandNotification::~OnVRCommandNotification() {} 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 0e78ab733d..1fd2310b66 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 @@ -38,12 +38,14 @@ #include "application_manager/rpc_service.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVRLanguageChangeNotification::OnVRLanguageChangeNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVRLanguageChangeNotification::~OnVRLanguageChangeNotification() {} @@ -80,7 +82,7 @@ void OnVRLanguageChangeNotification::Run() { MessageHelper::GetOnAppInterfaceUnregisteredNotificationToMobile( app->app_id(), mobile_api::AppInterfaceUnregisteredReason::LANGUAGE_CHANGE), - commands::Command::SOURCE_SDL); + SOURCE_SDL); application_manager_.UnregisterApplication( app->app_id(), mobile_apis::Result::SUCCESS, false); } diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_started_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_started_notification.cc index f05554a4cd..d48ce75095 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_started_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_started_notification.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vr_started_notification.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVRStartedNotification::OnVRStartedNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVRStartedNotification::~OnVRStartedNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_stopped_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_stopped_notification.cc index eb2e558b01..9ffbf1c0ec 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_stopped_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_stopped_notification.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vr_stopped_notification.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVRStoppedNotification::OnVRStoppedNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVRStoppedNotification::~OnVRStoppedNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_get_capabilities_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_get_capabilities_request.cc index 4914294e60..432b46a430 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_get_capabilities_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_get_capabilities_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/rc_get_capabilities_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { RCGetCapabilitiesRequest::RCGetCapabilitiesRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} RCGetCapabilitiesRequest::~RCGetCapabilitiesRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_get_capabilities_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_get_capabilities_response.cc index 4164181aa7..953ab41f92 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_get_capabilities_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_get_capabilities_response.cc @@ -31,12 +31,14 @@ */ #include "sdl_rpc_plugin/commands/hmi/rc_get_capabilities_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { RCGetCapabilitiesResponse::RCGetCapabilitiesResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} RCGetCapabilitiesResponse::~RCGetCapabilitiesResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_is_ready_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_is_ready_request.cc index c2245d3517..c1aa47f554 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_is_ready_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_is_ready_request.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/rc_is_ready_request.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -RCIsReadyRequest::RCIsReadyRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +RCIsReadyRequest::RCIsReadyRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) , EventObserver(application_manager.event_dispatcher()) {} @@ -57,7 +59,7 @@ void RCIsReadyRequest::on_event(const event_engine::Event& event) { case hmi_apis::FunctionID::RC_IsReady: { LOG4CXX_DEBUG(logger_, "Received RC_IsReady event"); unsubscribe_from_event(hmi_apis::FunctionID::RC_IsReady); - const bool is_available = ChangeInterfaceState( + const bool is_available = app_mngr::commands::ChangeInterfaceState( application_manager_, message, HmiInterfaces::HMI_INTERFACE_RC); HMICapabilities& hmi_capabilities = @@ -67,8 +69,8 @@ void RCIsReadyRequest::on_event(const event_engine::Event& event) { hmi_capabilities.set_rc_supported(false); } - if (!CheckAvailabilityHMIInterfaces(application_manager_, - HmiInterfaces::HMI_INTERFACE_RC)) { + if (!app_mngr::commands::CheckAvailabilityHMIInterfaces( + application_manager_, HmiInterfaces::HMI_INTERFACE_RC)) { LOG4CXX_INFO(logger_, "HmiInterfaces::HMI_INTERFACE_RC isn't available"); return; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_is_ready_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_is_ready_response.cc index bd7dc62481..27eee2b446 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_is_ready_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_is_ready_response.cc @@ -31,12 +31,14 @@ */ #include "sdl_rpc_plugin/commands/hmi/rc_is_ready_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -RCIsReadyResponse::RCIsReadyResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +RCIsReadyResponse::RCIsReadyResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} RCIsReadyResponse::~RCIsReadyResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/response_from_hmi.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/response_from_hmi.cc index 7e7cb557dc..1405e8124c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/response_from_hmi.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/response_from_hmi.cc @@ -30,16 +30,18 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" #include "application_manager/rpc_service.h" #include "smart_objects/smart_object.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -ResponseFromHMI::ResponseFromHMI(const MessageSharedPtr& message, - ApplicationManager& application_manager) +ResponseFromHMI::ResponseFromHMI( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandImpl(message, application_manager) { // If it is error response, shift info if ((*message)[strings::params].keyExists(hmi_response::message)) { @@ -64,7 +66,8 @@ bool ResponseFromHMI::CleanUp() { void ResponseFromHMI::Run() {} void ResponseFromHMI::SendResponseToMobile( - const MessageSharedPtr& message, ApplicationManager& application_manager) { + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) { (*message)[strings::params][strings::message_type] = MessageType::kResponse; application_manager_.GetRPCService().ManageMobileCommand(message, SOURCE_SDL); diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/response_to_hmi.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/response_to_hmi.cc index 149a82e971..87abafbdb5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/response_to_hmi.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/response_to_hmi.cc @@ -30,16 +30,18 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "sdl_rpc_plugin/commands/hmi/response_to_hmi.h" +#include "application_manager/commands/response_to_hmi.h" #include "application_manager/application_manager.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -ResponseToHMI::ResponseToHMI(const MessageSharedPtr& message, - ApplicationManager& application_manager) +ResponseToHMI::ResponseToHMI( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandImpl(message, application_manager) {} ResponseToHMI::~ResponseToHMI() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_request.cc index 36fddf2bf5..272587d2b7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_request.cc @@ -34,7 +34,8 @@ #include "application_manager/state_controller.h" #include "application_manager/message_helper.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { @@ -82,7 +83,8 @@ struct SendLaunchApp } SDLActivateAppRequest::SDLActivateAppRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestFromHMI(message, application_manager) {} SDLActivateAppRequest::~SDLActivateAppRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_response.cc index 2521dcc8e4..fb7cd2626e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_response.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/sdl_activate_app_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { SDLActivateAppResponse::SDLActivateAppResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseToHMI(message, application_manager) {} SDLActivateAppResponse::~SDLActivateAppResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_list_of_permissions_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_list_of_permissions_request.cc index 2af0f4f38e..08115ee85b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_list_of_permissions_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_list_of_permissions_request.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/sdl_get_list_of_permissions_request.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { SDLGetListOfPermissionsRequest::SDLGetListOfPermissionsRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestFromHMI(message, application_manager) {} SDLGetListOfPermissionsRequest::~SDLGetListOfPermissionsRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_list_of_permissions_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_list_of_permissions_response.cc index 9e4be91d9e..4c8e3898f6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_list_of_permissions_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_list_of_permissions_response.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/sdl_get_list_of_permissions_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { SDLGetListOfPermissionsResponse::SDLGetListOfPermissionsResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseToHMI(message, application_manager) {} SDLGetListOfPermissionsResponse::~SDLGetListOfPermissionsResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_status_update_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_status_update_request.cc index 6c7cd1e7a5..e492d1c9f8 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_status_update_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_status_update_request.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/sdl_get_status_update_request.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { SDLGetStatusUpdateRequest::SDLGetStatusUpdateRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestFromHMI(message, application_manager) {} SDLGetStatusUpdateRequest::~SDLGetStatusUpdateRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_status_update_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_status_update_response.cc index 85ac3de729..434fd436ed 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_status_update_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_status_update_response.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/sdl_get_status_update_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { SDLGetStatusUpdateResponse::SDLGetStatusUpdateResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseToHMI(message, application_manager) {} SDLGetStatusUpdateResponse::~SDLGetStatusUpdateResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_user_friendly_message_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_user_friendly_message_request.cc index bc944faaa9..d55ea5aef2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_user_friendly_message_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_user_friendly_message_request.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/sdl_get_user_friendly_message_request.h" #include "application_manager/message_helper.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { SDLGetUserFriendlyMessageRequest::SDLGetUserFriendlyMessageRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestFromHMI(message, application_manager) {} SDLGetUserFriendlyMessageRequest::~SDLGetUserFriendlyMessageRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_user_friendly_message_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_user_friendly_message_response.cc index e8736f6260..ec9a1e8506 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_user_friendly_message_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_user_friendly_message_response.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/sdl_get_user_friendly_message_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { SDLGetUserFriendlyMessageResponse::SDLGetUserFriendlyMessageResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseToHMI(message, application_manager) {} SDLGetUserFriendlyMessageResponse::~SDLGetUserFriendlyMessageResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_policy_update.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_policy_update.cc index e06dad82b7..f437ac3429 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_policy_update.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_policy_update.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/sdl_policy_update.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -SDLPolicyUpdate::SDLPolicyUpdate(const MessageSharedPtr& message, - ApplicationManager& application_manager) +SDLPolicyUpdate::SDLPolicyUpdate( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} SDLPolicyUpdate::~SDLPolicyUpdate() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_policy_update_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_policy_update_response.cc index e305b01053..c43cdc64a1 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_policy_update_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_policy_update_response.cc @@ -32,11 +32,13 @@ #include "sdl_rpc_plugin/commands/hmi/sdl_policy_update_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { SDLPolicyUpdateResponse::SDLPolicyUpdateResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} SDLPolicyUpdateResponse::~SDLPolicyUpdateResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_change_registration_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_change_registration_request.cc index 3195a60393..dc650e26c6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_change_registration_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_change_registration_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/tts_change_registration_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { TTSChangeRegistrationRequest::TTSChangeRegistrationRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} TTSChangeRegistrationRequest::~TTSChangeRegistrationRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_change_registration_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_change_registration_response.cc index 3b8e921b25..51a05e8a62 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_change_registration_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_change_registration_response.cc @@ -34,12 +34,14 @@ #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { TTSChangeRegistratioResponse::TTSChangeRegistratioResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} TTSChangeRegistratioResponse::~TTSChangeRegistratioResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_capabilities_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_capabilities_request.cc index e70909a2a6..3d8eb68e97 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_capabilities_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_capabilities_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/tts_get_capabilities_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { TTSGetCapabilitiesRequest::TTSGetCapabilitiesRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} TTSGetCapabilitiesRequest::~TTSGetCapabilitiesRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_capabilities_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_capabilities_response.cc index 8bbd18701d..1b1810302a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_capabilities_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_capabilities_response.cc @@ -31,12 +31,14 @@ */ #include "sdl_rpc_plugin/commands/hmi/tts_get_capabilities_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { TTSGetCapabilitiesResponse::TTSGetCapabilitiesResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} TTSGetCapabilitiesResponse::~TTSGetCapabilitiesResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_language_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_language_request.cc index bd1bfe3345..fe10976155 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_language_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_language_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/tts_get_language_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { TTSGetLanguageRequest::TTSGetLanguageRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} TTSGetLanguageRequest::~TTSGetLanguageRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_language_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_language_response.cc index f2b381fdb5..802e28be97 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_language_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_language_response.cc @@ -33,12 +33,14 @@ #include "application_manager/event_engine/event.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { TTSGetLanguageResponse::TTSGetLanguageResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} TTSGetLanguageResponse::~TTSGetLanguageResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_supported_languages_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_supported_languages_request.cc index 5fa7e42fbe..e9638caf6d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_supported_languages_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_supported_languages_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/tts_get_supported_languages_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { TTSGetSupportedLanguagesRequest::TTSGetSupportedLanguagesRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} TTSGetSupportedLanguagesRequest::~TTSGetSupportedLanguagesRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_supported_languages_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_supported_languages_response.cc index 36bb8c4669..9768340ee6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_supported_languages_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_supported_languages_response.cc @@ -33,12 +33,14 @@ #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { TTSGetSupportedLanguagesResponse::TTSGetSupportedLanguagesResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} TTSGetSupportedLanguagesResponse::~TTSGetSupportedLanguagesResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_is_ready_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_is_ready_request.cc index a409615bdb..dd87ba7c76 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_is_ready_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_is_ready_request.cc @@ -34,12 +34,14 @@ #include "application_manager/rpc_service.h" #include "application_manager/message_helper.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -TTSIsReadyRequest::TTSIsReadyRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +TTSIsReadyRequest::TTSIsReadyRequest( + const app_mngr::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) , EventObserver(application_manager.event_dispatcher()) {} @@ -59,13 +61,13 @@ void TTSIsReadyRequest::on_event(const event_engine::Event& event) { case hmi_apis::FunctionID::TTS_IsReady: { LOG4CXX_DEBUG(logger_, "Received TTS_IsReady event"); unsubscribe_from_event(hmi_apis::FunctionID::TTS_IsReady); - const bool is_available = ChangeInterfaceState( + const bool is_available = app_mngr::commands::ChangeInterfaceState( application_manager_, message, HmiInterfaces::HMI_INTERFACE_TTS); HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities(); hmi_capabilities.set_is_tts_cooperating(is_available); - if (!CheckAvailabilityHMIInterfaces(application_manager_, - HmiInterfaces::HMI_INTERFACE_TTS)) { + if (!app_mngr::commands::CheckAvailabilityHMIInterfaces( + application_manager_, HmiInterfaces::HMI_INTERFACE_TTS)) { LOG4CXX_INFO(logger_, "HmiInterfaces::HMI_INTERFACE_TTS isn't available"); return; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_is_ready_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_is_ready_response.cc index e103a0911b..4cabdcd442 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_is_ready_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_is_ready_response.cc @@ -31,12 +31,14 @@ */ #include "sdl_rpc_plugin/commands/hmi/tts_is_ready_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -TTSIsReadyResponse::TTSIsReadyResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +TTSIsReadyResponse::TTSIsReadyResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} TTSIsReadyResponse::~TTSIsReadyResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_set_global_properties_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_set_global_properties_request.cc index 237b7385a6..f5b83a7537 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_set_global_properties_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_set_global_properties_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/tts_set_global_properties_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { TTSSetGlobalPropertiesRequest::TTSSetGlobalPropertiesRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} TTSSetGlobalPropertiesRequest::~TTSSetGlobalPropertiesRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_set_global_properties_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_set_global_properties_response.cc index 1e21d0741d..6e140a563e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_set_global_properties_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_set_global_properties_response.cc @@ -34,12 +34,14 @@ #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { TTSSetGlobalPropertiesResponse::TTSSetGlobalPropertiesResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} TTSSetGlobalPropertiesResponse::~TTSSetGlobalPropertiesResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_speak_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_speak_request.cc index a561608a9a..9d572a3fab 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_speak_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_speak_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/tts_speak_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -TTSSpeakRequest::TTSSpeakRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +TTSSpeakRequest::TTSSpeakRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} TTSSpeakRequest::~TTSSpeakRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_speak_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_speak_response.cc index 26e1d44ad1..9bdd1d39c5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_speak_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_speak_response.cc @@ -35,12 +35,14 @@ #include "interfaces/MOBILE_API.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -TTSSpeakResponse::TTSSpeakResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +TTSSpeakResponse::TTSSpeakResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} TTSSpeakResponse::~TTSSpeakResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_stop_speaking_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_stop_speaking_request.cc index 107daf6f32..86f5787dab 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_stop_speaking_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_stop_speaking_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/tts_stop_speaking_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { TTSStopSpeakingRequest::TTSStopSpeakingRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} TTSStopSpeakingRequest::~TTSStopSpeakingRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_stop_speaking_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_stop_speaking_response.cc index e6ea6647fa..d69d627c07 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_stop_speaking_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_stop_speaking_response.cc @@ -33,12 +33,14 @@ #include "application_manager/event_engine/event.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { TTSStopSpeakingResponse::TTSStopSpeakingResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} TTSStopSpeakingResponse::~TTSStopSpeakingResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_command_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_command_request.cc index cd18849619..a0439c3b7f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_command_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_command_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/ui_add_command_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIAddCommandRequest::UIAddCommandRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} UIAddCommandRequest::~UIAddCommandRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_command_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_command_response.cc index 6b74f2b895..5099d553ef 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_command_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_command_response.cc @@ -33,12 +33,14 @@ #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIAddCommandResponse::UIAddCommandResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UIAddCommandResponse::~UIAddCommandResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_submenu_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_submenu_request.cc index 7490dc08fd..f14640b18c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_submenu_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_submenu_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/ui_add_submenu_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIAddSubmenuRequest::UIAddSubmenuRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} UIAddSubmenuRequest::~UIAddSubmenuRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_submenu_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_submenu_response.cc index c57ac3c870..39432cc0ed 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_submenu_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_submenu_response.cc @@ -34,12 +34,14 @@ #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIAddSubmenuResponse::UIAddSubmenuResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UIAddSubmenuResponse::~UIAddSubmenuResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_alert_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_alert_request.cc index 4fc3138a1f..361a87514f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_alert_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_alert_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/ui_alert_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -UIAlertRequest::UIAlertRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +UIAlertRequest::UIAlertRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} UIAlertRequest::~UIAlertRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_alert_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_alert_response.cc index f36d3e105a..4218e5b147 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_alert_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_alert_response.cc @@ -34,12 +34,14 @@ #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -UIAlertResponse::UIAlertResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +UIAlertResponse::UIAlertResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UIAlertResponse::~UIAlertResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_change_registration_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_change_registration_request.cc index 57ab6c52eb..c082f2bb8f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_change_registration_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_change_registration_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/ui_change_registration_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIChangeRegistrationRequest::UIChangeRegistrationRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} UIChangeRegistrationRequest::~UIChangeRegistrationRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_change_registration_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_change_registration_response.cc index 4cf839d4a2..1a9cee6a34 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_change_registration_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_change_registration_response.cc @@ -34,12 +34,14 @@ #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIChangeRegistratioResponse::UIChangeRegistratioResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UIChangeRegistratioResponse::~UIChangeRegistratioResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_command_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_command_request.cc index 815332ec8c..4bd8616762 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_command_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_command_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/ui_delete_command_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIDeleteCommandRequest::UIDeleteCommandRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} UIDeleteCommandRequest::~UIDeleteCommandRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_command_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_command_response.cc index c34dd7b3e1..ea1a37e8b2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_command_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_command_response.cc @@ -34,12 +34,14 @@ #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIDeleteCommandResponse::UIDeleteCommandResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UIDeleteCommandResponse::~UIDeleteCommandResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_submenu_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_submenu_request.cc index 5f9915f171..35500c1e35 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_submenu_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_submenu_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/ui_delete_submenu_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIDeleteSubmenuRequest::UIDeleteSubmenuRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} UIDeleteSubmenuRequest::~UIDeleteSubmenuRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_submenu_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_submenu_response.cc index f243b1b3c1..b6ba8523fd 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_submenu_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_submenu_response.cc @@ -34,12 +34,14 @@ #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIDeleteSubmenuResponse::UIDeleteSubmenuResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UIDeleteSubmenuResponse::~UIDeleteSubmenuResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_end_audio_pass_thru_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_end_audio_pass_thru_request.cc index d68146a5ae..f12db15937 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_end_audio_pass_thru_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_end_audio_pass_thru_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/ui_end_audio_pass_thru_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIEndAudioPassThruRequest::UIEndAudioPassThruRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} UIEndAudioPassThruRequest::~UIEndAudioPassThruRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_end_audio_pass_thru_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_end_audio_pass_thru_response.cc index 27b96379c2..46f742d6c7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_end_audio_pass_thru_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_end_audio_pass_thru_response.cc @@ -34,12 +34,14 @@ #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIEndAudioPassThruResponse::UIEndAudioPassThruResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UIEndAudioPassThruResponse::~UIEndAudioPassThruResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_request.cc index f4cb64a8a3..ec53be1d61 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/ui_get_capabilities_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIGetCapabilitiesRequest::UIGetCapabilitiesRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} UIGetCapabilitiesRequest::~UIGetCapabilitiesRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_response.cc index 34ccd62b94..6f50deed3b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_response.cc @@ -31,12 +31,14 @@ */ #include "sdl_rpc_plugin/commands/hmi/ui_get_capabilities_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIGetCapabilitiesResponse::UIGetCapabilitiesResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UIGetCapabilitiesResponse::~UIGetCapabilitiesResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_language_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_language_request.cc index 1e2d1fa2d1..c50b15c8eb 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_language_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_language_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/ui_get_language_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIGetLanguageRequest::UIGetLanguageRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} UIGetLanguageRequest::~UIGetLanguageRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_language_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_language_response.cc index f45e02b63b..1feba12abe 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_language_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_language_response.cc @@ -34,12 +34,14 @@ #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIGetLanguageResponse::UIGetLanguageResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UIGetLanguageResponse::~UIGetLanguageResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_supported_languages_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_supported_languages_request.cc index 23944edd3b..a2b848038a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_supported_languages_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_supported_languages_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/ui_get_supported_languages_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIGetSupportedLanguagesRequest::UIGetSupportedLanguagesRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} UIGetSupportedLanguagesRequest::~UIGetSupportedLanguagesRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_supported_languages_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_supported_languages_response.cc index d6e068368a..87fa40964a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_supported_languages_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_supported_languages_response.cc @@ -33,12 +33,14 @@ #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIGetSupportedLanguagesResponse::UIGetSupportedLanguagesResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UIGetSupportedLanguagesResponse::~UIGetSupportedLanguagesResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_is_ready_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_is_ready_request.cc index 8aa3af58d5..5f5da94542 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_is_ready_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_is_ready_request.cc @@ -34,12 +34,14 @@ #include "application_manager/message_helper.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -UIIsReadyRequest::UIIsReadyRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +UIIsReadyRequest::UIIsReadyRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) , EventObserver(application_manager.event_dispatcher()) {} @@ -58,13 +60,13 @@ void UIIsReadyRequest::on_event(const event_engine::Event& event) { case hmi_apis::FunctionID::UI_IsReady: { LOG4CXX_DEBUG(logger_, "Received UI_IsReady event"); unsubscribe_from_event(hmi_apis::FunctionID::UI_IsReady); - const bool is_available = ChangeInterfaceState( + const bool is_available = app_mngr::commands::ChangeInterfaceState( application_manager_, message, HmiInterfaces::HMI_INTERFACE_UI); HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities(); hmi_capabilities.set_is_ui_cooperating(is_available); - if (!CheckAvailabilityHMIInterfaces(application_manager_, - HmiInterfaces::HMI_INTERFACE_UI)) { + if (!app_mngr::commands::CheckAvailabilityHMIInterfaces( + application_manager_, HmiInterfaces::HMI_INTERFACE_UI)) { LOG4CXX_INFO(logger_, "HmiInterfaces::HMI_INTERFACE_UI isn't available"); return; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_is_ready_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_is_ready_response.cc index 869b5f13cb..8faa4feba2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_is_ready_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_is_ready_response.cc @@ -31,12 +31,14 @@ */ #include "sdl_rpc_plugin/commands/hmi/ui_is_ready_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -UIIsReadyResponse::UIIsReadyResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +UIIsReadyResponse::UIIsReadyResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UIIsReadyResponse::~UIIsReadyResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_audio_pass_thru_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_audio_pass_thru_request.cc index 57f852ff95..26092d4764 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_audio_pass_thru_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_audio_pass_thru_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/ui_perform_audio_pass_thru_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIPerformAudioPassThruRequest::UIPerformAudioPassThruRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} UIPerformAudioPassThruRequest::~UIPerformAudioPassThruRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_audio_pass_thru_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_audio_pass_thru_response.cc index 0a03b3b829..c31b5b91e8 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_audio_pass_thru_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_audio_pass_thru_response.cc @@ -33,12 +33,14 @@ #include "application_manager/event_engine/event.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIPerformAudioPassThruResponse::UIPerformAudioPassThruResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UIPerformAudioPassThruResponse::~UIPerformAudioPassThruResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_interaction_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_interaction_request.cc index 1136987009..079cbbe46d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_interaction_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_interaction_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/ui_perform_interaction_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIPerformInteractionRequest::UIPerformInteractionRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} UIPerformInteractionRequest::~UIPerformInteractionRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_interaction_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_interaction_response.cc index 328de7e936..ce80d2eef0 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_interaction_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_interaction_response.cc @@ -33,12 +33,14 @@ #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIPerformInteractionResponse::UIPerformInteractionResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UIPerformInteractionResponse::~UIPerformInteractionResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_scrollable_message_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_scrollable_message_request.cc index 700460d2a1..ad3e9a6692 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_scrollable_message_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_scrollable_message_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/ui_scrollable_message_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIScrollableMessageRequest::UIScrollableMessageRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} UIScrollableMessageRequest::~UIScrollableMessageRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_scrollable_message_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_scrollable_message_response.cc index ace5074b2b..049bfa44b4 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_scrollable_message_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_scrollable_message_response.cc @@ -33,12 +33,14 @@ #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIScrollableMessageResponse::UIScrollableMessageResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UIScrollableMessageResponse::~UIScrollableMessageResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_send_haptic_data_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_send_haptic_data_request.cc index af85062af1..6e6e8ed065 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_send_haptic_data_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_send_haptic_data_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/ui_send_haptic_data_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UISendHapticDataRequest::UISendHapticDataRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} UISendHapticDataRequest::~UISendHapticDataRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_send_haptic_data_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_send_haptic_data_response.cc index 2917f0e9ef..d2851f1cb5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_send_haptic_data_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_send_haptic_data_response.cc @@ -34,12 +34,14 @@ #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UISendHapticDataResponse::UISendHapticDataResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UISendHapticDataResponse::~UISendHapticDataResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_app_icon_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_app_icon_request.cc index 844066087a..8a1f085876 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_app_icon_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_app_icon_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/ui_set_app_icon_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UISetAppIconRequest::UISetAppIconRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} UISetAppIconRequest::~UISetAppIconRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_app_icon_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_app_icon_response.cc index f4c618a6eb..894c195466 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_app_icon_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_app_icon_response.cc @@ -33,12 +33,14 @@ #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UISetAppIconResponse::UISetAppIconResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UISetAppIconResponse::~UISetAppIconResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_display_layout_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_display_layout_request.cc index 53b7a5fdaa..38db95a26d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_display_layout_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_display_layout_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/ui_set_display_layout_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UiSetDisplayLayoutRequest::UiSetDisplayLayoutRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} UiSetDisplayLayoutRequest::~UiSetDisplayLayoutRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_display_layout_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_display_layout_response.cc index 2ecd865aa8..ed0e09da12 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_display_layout_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_display_layout_response.cc @@ -34,12 +34,14 @@ #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UiSetDisplayLayoutResponse::UiSetDisplayLayoutResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UiSetDisplayLayoutResponse::~UiSetDisplayLayoutResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_global_properties_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_global_properties_request.cc index 458a254033..1b64ca3eae 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_global_properties_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_global_properties_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/ui_set_global_properties_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UISetGlobalPropertiesRequest::UISetGlobalPropertiesRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} UISetGlobalPropertiesRequest::~UISetGlobalPropertiesRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_global_properties_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_global_properties_response.cc index a7da45645c..897c0b7030 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_global_properties_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_global_properties_response.cc @@ -33,12 +33,14 @@ #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UISetGlobalPropertiesResponse::UISetGlobalPropertiesResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UISetGlobalPropertiesResponse::~UISetGlobalPropertiesResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_icon_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_icon_request.cc index 5f3dceed12..1bade6dcef 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_icon_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_icon_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/ui_set_icon_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -UISetIconRequest::UISetIconRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +UISetIconRequest::UISetIconRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} UISetIconRequest::~UISetIconRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_media_clock_timer_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_media_clock_timer_request.cc index bfebb880bf..df1ab8ddd3 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_media_clock_timer_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_media_clock_timer_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/ui_set_media_clock_timer_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UISetMediaClockTimerRequest::UISetMediaClockTimerRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} UISetMediaClockTimerRequest::~UISetMediaClockTimerRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_media_clock_timer_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_media_clock_timer_response.cc index f677675721..9058550d28 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_media_clock_timer_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_media_clock_timer_response.cc @@ -33,12 +33,14 @@ #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UISetMediaClockTimerResponse::UISetMediaClockTimerResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UISetMediaClockTimerResponse::~UISetMediaClockTimerResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_show_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_show_request.cc index 38d29abe9e..f106359792 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_show_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_show_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/ui_show_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -UIShowRequest::UIShowRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +UIShowRequest::UIShowRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} UIShowRequest::~UIShowRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_show_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_show_response.cc index 61b9ad45fe..bc2b922b0a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_show_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_show_response.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/ui_show_response.h" #include "application_manager/event_engine/event.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -UIShowResponse::UIShowResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +UIShowResponse::UIShowResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UIShowResponse::~UIShowResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_slider_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_slider_request.cc index 39fff5c3ef..c2ba0aa76d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_slider_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_slider_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/ui_slider_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -UISliderRequest::UISliderRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +UISliderRequest::UISliderRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} UISliderRequest::~UISliderRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_slider_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_slider_response.cc index 3fe65c8d21..1fa10ce22c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_slider_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_slider_response.cc @@ -33,12 +33,14 @@ #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -UISliderResponse::UISliderResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +UISliderResponse::UISliderResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UISliderResponse::~UISliderResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_app_list_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_app_list_request.cc index 83c0fbc036..b8e56f8b0c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_app_list_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_app_list_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/update_app_list_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UpdateAppListRequest::UpdateAppListRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} UpdateAppListRequest::~UpdateAppListRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_app_list_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_app_list_response.cc index 9ceea3927c..cfe248653b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_app_list_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_app_list_response.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/update_app_list_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UpdateAppListResponse::UpdateAppListResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UpdateAppListResponse::~UpdateAppListResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_device_list_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_device_list_request.cc index 72deef28a2..502c99a628 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_device_list_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_device_list_request.cc @@ -36,12 +36,14 @@ #include <unistd.h> -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UpdateDeviceListRequest::UpdateDeviceListRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) , EventObserver(application_manager_.event_dispatcher()) {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_device_list_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_device_list_response.cc index 1730775122..72502f7ef1 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_device_list_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_device_list_response.cc @@ -31,12 +31,14 @@ */ #include "sdl_rpc_plugin/commands/hmi/update_device_list_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UpdateDeviceListResponse::UpdateDeviceListResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UpdateDeviceListResponse::~UpdateDeviceListResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_sdl_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_sdl_request.cc index cee6b9577f..46c20aebd8 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_sdl_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_sdl_request.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/update_sdl_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -UpdateSDLRequest::UpdateSDLRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +UpdateSDLRequest::UpdateSDLRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} UpdateSDLRequest::~UpdateSDLRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_sdl_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_sdl_response.cc index a211053868..5284d0c721 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_sdl_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_sdl_response.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/update_sdl_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -UpdateSDLResponse::UpdateSDLResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +UpdateSDLResponse::UpdateSDLResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UpdateSDLResponse::~UpdateSDLResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_diagnostic_message_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_diagnostic_message_request.cc index 0e17b23ca6..0aede55815 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_diagnostic_message_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_diagnostic_message_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/vi_diagnostic_message_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VIDiagnosticMessageRequest::VIDiagnosticMessageRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} VIDiagnosticMessageRequest::~VIDiagnosticMessageRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_diagnostic_message_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_diagnostic_message_response.cc index 7893671ded..a10890854a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_diagnostic_message_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_diagnostic_message_response.cc @@ -33,12 +33,14 @@ #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VIDiagnosticMessageResponse::VIDiagnosticMessageResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} VIDiagnosticMessageResponse::~VIDiagnosticMessageResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_dtcs_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_dtcs_request.cc index 768dfeb064..6e44f94566 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_dtcs_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_dtcs_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/vi_get_dtcs_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -VIGetDTCsRequest::VIGetDTCsRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +VIGetDTCsRequest::VIGetDTCsRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} VIGetDTCsRequest::~VIGetDTCsRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_dtcs_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_dtcs_response.cc index 1ae1dbb17a..e42e1e83ed 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_dtcs_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_dtcs_response.cc @@ -33,12 +33,14 @@ #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -VIGetDTCsResponse::VIGetDTCsResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +VIGetDTCsResponse::VIGetDTCsResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} VIGetDTCsResponse::~VIGetDTCsResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_data_request.cc index 5c591f6c25..1b3f6af723 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_data_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_data_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/vi_get_vehicle_data_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VIGetVehicleDataRequest::VIGetVehicleDataRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} VIGetVehicleDataRequest::~VIGetVehicleDataRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_data_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_data_response.cc index db26b1f1ba..03b88eaa0d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_data_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_data_response.cc @@ -33,11 +33,13 @@ #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VIGetVehicleDataResponse::VIGetVehicleDataResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} VIGetVehicleDataResponse::~VIGetVehicleDataResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_type_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_type_request.cc index 96d33bbf95..1998d4304b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_type_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_type_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/vi_get_vehicle_type_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VIGetVehicleTypeRequest::VIGetVehicleTypeRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} VIGetVehicleTypeRequest::~VIGetVehicleTypeRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_type_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_type_response.cc index ad8675c36b..3296784f0a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_type_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_type_response.cc @@ -31,12 +31,14 @@ */ #include "sdl_rpc_plugin/commands/hmi/vi_get_vehicle_type_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VIGetVehicleTypeResponse::VIGetVehicleTypeResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} VIGetVehicleTypeResponse::~VIGetVehicleTypeResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_is_ready_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_is_ready_request.cc index 4c139ff519..2a94cc3191 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_is_ready_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_is_ready_request.cc @@ -34,12 +34,14 @@ #include "application_manager/rpc_service.h" #include "application_manager/message_helper.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -VIIsReadyRequest::VIIsReadyRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +VIIsReadyRequest::VIIsReadyRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) , EventObserver(application_manager.event_dispatcher()) {} @@ -59,16 +61,16 @@ void VIIsReadyRequest::on_event(const event_engine::Event& event) { case hmi_apis::FunctionID::VehicleInfo_IsReady: { LOG4CXX_DEBUG(logger_, "VehicleInfo_IsReady event"); unsubscribe_from_event(hmi_apis::FunctionID::VehicleInfo_IsReady); - const bool is_available = - ChangeInterfaceState(application_manager_, - message, - HmiInterfaces::HMI_INTERFACE_VehicleInfo); + const bool is_available = app_mngr::commands::ChangeInterfaceState( + application_manager_, + message, + HmiInterfaces::HMI_INTERFACE_VehicleInfo); HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities(); hmi_capabilities.set_is_ivi_cooperating(is_available); application_manager_.GetPolicyHandler().OnVIIsReady(); - if (!CheckAvailabilityHMIInterfaces( + if (!app_mngr::commands::CheckAvailabilityHMIInterfaces( application_manager_, HmiInterfaces::HMI_INTERFACE_VehicleInfo)) { LOG4CXX_INFO( logger_, diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_is_ready_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_is_ready_response.cc index ed29a98b59..63f7511043 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_is_ready_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_is_ready_response.cc @@ -31,12 +31,14 @@ */ #include "sdl_rpc_plugin/commands/hmi/vi_is_ready_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -VIIsReadyResponse::VIIsReadyResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +VIIsReadyResponse::VIIsReadyResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} VIIsReadyResponse::~VIIsReadyResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_read_did_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_read_did_request.cc index 113aa1b38b..47be52d6a7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_read_did_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_read_did_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/vi_read_did_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -VIReadDIDRequest::VIReadDIDRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +VIReadDIDRequest::VIReadDIDRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} VIReadDIDRequest::~VIReadDIDRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_read_did_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_read_did_response.cc index bd200a9007..b1e00b2ded 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_read_did_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_read_did_response.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/vi_read_did_response.h" #include "application_manager/event_engine/event.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -VIReadDIDResponse::VIReadDIDResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +VIReadDIDResponse::VIReadDIDResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} VIReadDIDResponse::~VIReadDIDResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_subscribe_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_subscribe_vehicle_data_request.cc index fa8bb03c42..4f0162c92a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_subscribe_vehicle_data_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_subscribe_vehicle_data_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/vi_subscribe_vehicle_data_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VISubscribeVehicleDataRequest::VISubscribeVehicleDataRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} VISubscribeVehicleDataRequest::~VISubscribeVehicleDataRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_subscribe_vehicle_data_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_subscribe_vehicle_data_response.cc index 508d99940c..160f2744d5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_subscribe_vehicle_data_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_subscribe_vehicle_data_response.cc @@ -33,11 +33,13 @@ #include "application_manager/event_engine/event.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VISubscribeVehicleDataResponse::VISubscribeVehicleDataResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} VISubscribeVehicleDataResponse::~VISubscribeVehicleDataResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_unsubscribe_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_unsubscribe_vehicle_data_request.cc index 37a9597c9a..b6a885fb4c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_unsubscribe_vehicle_data_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_unsubscribe_vehicle_data_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/vi_unsubscribe_vehicle_data_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VIUnsubscribeVehicleDataRequest::VIUnsubscribeVehicleDataRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} VIUnsubscribeVehicleDataRequest::~VIUnsubscribeVehicleDataRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_unsubscribe_vehicle_data_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_unsubscribe_vehicle_data_response.cc index 0113c44145..bdbb1b83b8 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_unsubscribe_vehicle_data_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_unsubscribe_vehicle_data_response.cc @@ -33,11 +33,13 @@ #include "application_manager/event_engine/event.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VIUnsubscribeVehicleDataResponse::VIUnsubscribeVehicleDataResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} VIUnsubscribeVehicleDataResponse::~VIUnsubscribeVehicleDataResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_add_command_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_add_command_request.cc index f4f04cd205..500f6b4c11 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_add_command_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_add_command_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/vr_add_command_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VRAddCommandRequest::VRAddCommandRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} VRAddCommandRequest::~VRAddCommandRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_add_command_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_add_command_response.cc index 0b4a225fdd..a66af9e44e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_add_command_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_add_command_response.cc @@ -34,12 +34,14 @@ #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VRAddCommandResponse::VRAddCommandResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} VRAddCommandResponse::~VRAddCommandResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_change_registration_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_change_registration_request.cc index 4bb68fde97..c6b37175c4 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_change_registration_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_change_registration_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/vr_change_registration_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VRChangeRegistrationRequest::VRChangeRegistrationRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} VRChangeRegistrationRequest::~VRChangeRegistrationRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_change_registration_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_change_registration_response.cc index 6350190715..212caf6bce 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_change_registration_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_change_registration_response.cc @@ -33,12 +33,14 @@ #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VRChangeRegistrationResponse::VRChangeRegistrationResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} VRChangeRegistrationResponse::~VRChangeRegistrationResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_delete_command_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_delete_command_request.cc index 0e9d22300e..a1d16c218d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_delete_command_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_delete_command_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/vr_delete_command_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VRDeleteCommandRequest::VRDeleteCommandRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} VRDeleteCommandRequest::~VRDeleteCommandRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_delete_command_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_delete_command_response.cc index c6bd8f4d81..1cd27a3613 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_delete_command_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_delete_command_response.cc @@ -33,12 +33,14 @@ #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VRDeleteCommandResponse::VRDeleteCommandResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} VRDeleteCommandResponse::~VRDeleteCommandResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_capabilities_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_capabilities_request.cc index 08a1846c09..23678f84cd 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_capabilities_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_capabilities_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/vr_get_capabilities_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VRGetCapabilitiesRequest::VRGetCapabilitiesRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} VRGetCapabilitiesRequest::~VRGetCapabilitiesRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_capabilities_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_capabilities_response.cc index e226c19298..f2c0e3c32b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_capabilities_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_capabilities_response.cc @@ -31,12 +31,14 @@ */ #include "sdl_rpc_plugin/commands/hmi/vr_get_capabilities_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VRGetCapabilitiesResponse::VRGetCapabilitiesResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} VRGetCapabilitiesResponse::~VRGetCapabilitiesResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_language_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_language_request.cc index 7e020c0fd7..fbee753701 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_language_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_language_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/vr_get_language_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VRGetLanguageRequest::VRGetLanguageRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} VRGetLanguageRequest::~VRGetLanguageRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_language_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_language_response.cc index bd65d78405..dd0a6f86cb 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_language_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_language_response.cc @@ -34,12 +34,14 @@ #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VRGetLanguageResponse::VRGetLanguageResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} VRGetLanguageResponse::~VRGetLanguageResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_supported_languages_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_supported_languages_request.cc index aba45a2130..b668ef95b6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_supported_languages_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_supported_languages_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/vr_get_supported_languages_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VRGetSupportedLanguagesRequest::VRGetSupportedLanguagesRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} VRGetSupportedLanguagesRequest::~VRGetSupportedLanguagesRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_supported_languages_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_supported_languages_response.cc index 1f9a322533..c3579b3266 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_supported_languages_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_supported_languages_response.cc @@ -34,12 +34,14 @@ #include "interfaces/MOBILE_API.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VRGetSupportedLanguagesResponse::VRGetSupportedLanguagesResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} VRGetSupportedLanguagesResponse::~VRGetSupportedLanguagesResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_is_ready_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_is_ready_request.cc index 1a7bfd6e00..37523f69f4 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_is_ready_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_is_ready_request.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/vr_is_ready_request.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -VRIsReadyRequest::VRIsReadyRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +VRIsReadyRequest::VRIsReadyRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) , EventObserver(application_manager.event_dispatcher()) {} @@ -57,14 +59,14 @@ void VRIsReadyRequest::on_event(const event_engine::Event& event) { case hmi_apis::FunctionID::VR_IsReady: { LOG4CXX_DEBUG(logger_, "Received VR_IsReady event"); unsubscribe_from_event(hmi_apis::FunctionID::VR_IsReady); - const bool is_available = ChangeInterfaceState( + const bool is_available = app_mngr::commands::ChangeInterfaceState( application_manager_, message, HmiInterfaces::HMI_INTERFACE_VR); HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities(); hmi_capabilities.set_is_vr_cooperating(is_available); - if (!CheckAvailabilityHMIInterfaces(application_manager_, - HmiInterfaces::HMI_INTERFACE_VR)) { + if (!app_mngr::commands::CheckAvailabilityHMIInterfaces( + application_manager_, HmiInterfaces::HMI_INTERFACE_VR)) { LOG4CXX_INFO(logger_, "HmiInterfaces::HMI_INTERFACE_VR isn't available"); return; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_is_ready_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_is_ready_response.cc index b2d1be019a..0c4d07779b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_is_ready_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_is_ready_response.cc @@ -31,12 +31,14 @@ */ #include "sdl_rpc_plugin/commands/hmi/vr_is_ready_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -VRIsReadyResponse::VRIsReadyResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +VRIsReadyResponse::VRIsReadyResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} VRIsReadyResponse::~VRIsReadyResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_perform_interaction_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_perform_interaction_request.cc index ec341d2498..728f8a734b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_perform_interaction_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_perform_interaction_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/vr_perform_interaction_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VRPerformInteractionRequest::VRPerformInteractionRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} VRPerformInteractionRequest::~VRPerformInteractionRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_perform_interaction_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_perform_interaction_response.cc index 6d2dab9a6e..0740f07d98 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_perform_interaction_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_perform_interaction_response.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/vr_perform_interaction_response.h" #include "application_manager/event_engine/event.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VRPerformInteractionResponse::VRPerformInteractionResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} VRPerformInteractionResponse::~VRPerformInteractionResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_command_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_command_request.cc index 3bf95dda4f..626453c7cb 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_command_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_command_request.cc @@ -40,14 +40,16 @@ #include "utils/helpers.h" #include "utils/custom_string.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { namespace custom_str = utils::custom_string; -AddCommandRequest::AddCommandRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +AddCommandRequest::AddCommandRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) , send_ui_(false) , send_vr_(false) @@ -575,7 +577,7 @@ const std::string AddCommandRequest::GenerateMobileResponseInfo() { return ui_info_; } - return MergeInfos(ui_info_, vr_info_); + return app_mngr::commands::MergeInfos(ui_info_, vr_info_); } void AddCommandRequest::RemoveCommand() { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_command_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_command_response.cc index 84ad5af332..463c228115 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_command_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_command_response.cc @@ -34,12 +34,14 @@ #include "sdl_rpc_plugin/commands/mobile/add_command_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -AddCommandResponse::AddCommandResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +AddCommandResponse::AddCommandResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} AddCommandResponse::~AddCommandResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_sub_menu_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_sub_menu_request.cc index b756ff3a7b..5288234b37 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_sub_menu_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_sub_menu_request.cc @@ -37,12 +37,14 @@ #include "application_manager/application.h" #include "utils/helpers.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -AddSubMenuRequest::AddSubMenuRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +AddSubMenuRequest::AddSubMenuRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} AddSubMenuRequest::~AddSubMenuRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_sub_menu_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_sub_menu_response.cc index f43fa0ea73..c0481628eb 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_sub_menu_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_sub_menu_response.cc @@ -35,12 +35,14 @@ #include "application_manager/rpc_service.h" #include "application_manager/application_impl.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -AddSubMenuResponse::AddSubMenuResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +AddSubMenuResponse::AddSubMenuResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} AddSubMenuResponse::~AddSubMenuResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_maneuver_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_maneuver_request.cc index 11473cdea7..7d41ae7433 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_maneuver_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_maneuver_request.cc @@ -32,12 +32,14 @@ #include "application_manager/policies/policy_handler.h" #include "application_manager/message_helper.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { AlertManeuverRequest::AlertManeuverRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) , tts_speak_result_code_(hmi_apis::Common_Result::INVALID_ENUM) , navi_alert_maneuver_result_code_(hmi_apis::Common_Result::INVALID_ENUM) { @@ -208,12 +210,12 @@ bool AlertManeuverRequest::PrepareResponseParameters( LOG4CXX_AUTO_TRACE(logger_); using namespace helpers; - application_manager::commands::ResponseInfo navigation_alert_info( + app_mngr::commands::ResponseInfo navigation_alert_info( navi_alert_maneuver_result_code_, HmiInterfaces::HMI_INTERFACE_Navigation, application_manager_); - application_manager::commands::ResponseInfo tts_alert_info( + app_mngr::commands::ResponseInfo tts_alert_info( tts_speak_result_code_, HmiInterfaces::HMI_INTERFACE_TTS, application_manager_); @@ -231,8 +233,8 @@ bool AlertManeuverRequest::PrepareResponseParameters( } result_code = PrepareResultCodeForResponse(navigation_alert_info, tts_alert_info); - return_info = - MergeInfos(navigation_alert_info, info_navi_, tts_alert_info, info_tts_); + return_info = app_mngr::commands::MergeInfos( + navigation_alert_info, info_navi_, tts_alert_info, info_tts_); return result; } diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_maneuver_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_maneuver_response.cc index 92a427a006..e14f577f57 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_maneuver_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_maneuver_response.cc @@ -35,12 +35,14 @@ #include "application_manager/rpc_service.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { AlertManeuverResponse::AlertManeuverResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} AlertManeuverResponse::~AlertManeuverResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_request.cc index 54c93c2f38..3d2f92f490 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_request.cc @@ -42,12 +42,14 @@ #include "utils/helpers.h" #include "smart_objects/smart_object.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -AlertRequest::AlertRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +AlertRequest::AlertRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) , awaiting_ui_alert_response_(false) , awaiting_tts_speak_response_(false) @@ -196,11 +198,12 @@ void AlertRequest::on_event(const event_engine::Event& event) { bool AlertRequest::PrepareResponseParameters( mobile_apis::Result::eType& result_code, std::string& info) { - ResponseInfo ui_alert_info( + app_mngr::commands::ResponseInfo ui_alert_info( alert_result_, HmiInterfaces::HMI_INTERFACE_UI, application_manager_); - ResponseInfo tts_alert_info(tts_speak_result_, - HmiInterfaces::HMI_INTERFACE_TTS, - application_manager_); + app_mngr::commands::ResponseInfo tts_alert_info( + tts_speak_result_, + HmiInterfaces::HMI_INTERFACE_TTS, + application_manager_); bool result = PrepareResultForMobileResponse(ui_alert_info, tts_alert_info); @@ -217,12 +220,12 @@ bool AlertRequest::PrepareResponseParameters( tts_alert_info.is_unsupported_resource && HmiInterfaces::STATE_AVAILABLE == tts_alert_info.interface_state) { tts_response_info_ = "Unsupported phoneme type sent in a prompt"; - info = MergeInfos( + info = app_mngr::commands::MergeInfos( ui_alert_info, ui_response_info_, tts_alert_info, tts_response_info_); return result; } result_code = PrepareResultCodeForResponse(ui_alert_info, tts_alert_info); - info = MergeInfos( + info = app_mngr::commands::MergeInfos( ui_alert_info, ui_response_info_, tts_alert_info, tts_response_info_); // Mobile Alert request is successful when UI_Alert is successful if (is_ui_alert_sent_ && !ui_alert_info.is_ok) { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_response.cc index a1eed99acf..eca7ae9a07 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_response.cc @@ -37,12 +37,14 @@ #include "interfaces/MOBILE_API.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -AlertResponse::AlertResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +AlertResponse::AlertResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} AlertResponse::~AlertResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/change_registration_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/change_registration_request.cc index a82726c1fb..e92ef11703 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/change_registration_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/change_registration_request.cc @@ -53,12 +53,14 @@ struct IsSameNickname { }; } -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { ChangeRegistrationRequest::ChangeRegistrationRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) , ui_result_(hmi_apis::Common_Result::INVALID_ENUM) , vr_result_(hmi_apis::Common_Result::INVALID_ENUM) @@ -371,13 +373,13 @@ bool ChangeRegistrationRequest::PrepareResponseParameters( hmi_interfaces.GetInterfaceState( HmiInterfaces::InterfaceID::HMI_INTERFACE_UI); - ResponseInfo ui_properties_info( + app_mngr::commands::ResponseInfo ui_properties_info( ui_result_, HmiInterfaces::HMI_INTERFACE_UI, application_manager_); - ResponseInfo tts_properties_info( + app_mngr::commands::ResponseInfo tts_properties_info( tts_result_, HmiInterfaces::HMI_INTERFACE_TTS, application_manager_); - ResponseInfo vr_properties_info( + app_mngr::commands::ResponseInfo vr_properties_info( ui_result_, HmiInterfaces::HMI_INTERFACE_VR, application_manager_); bool result = ((!is_tts_ui_vr_unsupported) && is_tts_succeeded_unsupported && @@ -442,8 +444,8 @@ bool ChangeRegistrationRequest::PrepareResponseParameters( CheckInfo(vr_response_info_); } - response_info = - MergeInfos(ui_response_info_, vr_response_info_, tts_response_info_); + response_info = app_mngr::commands::MergeInfos( + ui_response_info_, vr_response_info_, tts_response_info_); return result; } diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/change_registration_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/change_registration_response.cc index 0f61bbe3cf..58da77aea0 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/change_registration_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/change_registration_response.cc @@ -34,12 +34,14 @@ #include "sdl_rpc_plugin/commands/mobile/change_registration_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { ChangeRegistrationResponse::ChangeRegistrationResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} ChangeRegistrationResponse::~ChangeRegistrationResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_interaction_choice_set_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_interaction_choice_set_request.cc index f2d2f53d76..7e8582f49d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_interaction_choice_set_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_interaction_choice_set_request.cc @@ -42,12 +42,14 @@ #include "utils/gen_hash.h" #include "utils/helpers.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { CreateInteractionChoiceSetRequest::CreateInteractionChoiceSetRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) , choice_set_id_(0) , expected_chs_count_(0) diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_interaction_choice_set_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_interaction_choice_set_response.cc index 954eca87fd..2c6dae7b44 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_interaction_choice_set_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_interaction_choice_set_response.cc @@ -36,12 +36,14 @@ #include "application_manager/application_impl.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { CreateInteractionChoiceSetResponse::CreateInteractionChoiceSetResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} CreateInteractionChoiceSetResponse::~CreateInteractionChoiceSetResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_command_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_command_request.cc index 45d4f74f45..8539d2122a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_command_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_command_request.cc @@ -39,12 +39,14 @@ #include "interfaces/HMI_API.h" #include "utils/helpers.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { DeleteCommandRequest::DeleteCommandRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) , is_ui_send_(false) , is_vr_send_(false) @@ -119,9 +121,9 @@ void DeleteCommandRequest::Run() { bool DeleteCommandRequest::PrepareResponseParameters( mobile_apis::Result::eType& result_code, std::string& info) { using namespace helpers; - ResponseInfo ui_delete_info( + app_mngr::commands::ResponseInfo ui_delete_info( ui_result_, HmiInterfaces::HMI_INTERFACE_UI, application_manager_); - ResponseInfo vr_delete_info( + app_mngr::commands::ResponseInfo vr_delete_info( vr_result_, HmiInterfaces::HMI_INTERFACE_VR, application_manager_); const bool result = PrepareResultForMobileResponse(ui_delete_info, vr_delete_info); @@ -129,7 +131,8 @@ bool DeleteCommandRequest::PrepareResponseParameters( const bool is_vr_or_ui_warning = Compare<hmi_apis::Common_Result::eType, EQ, ONE>( hmi_apis::Common_Result::WARNINGS, ui_result_, vr_result_); - info = MergeInfos(ui_delete_info, ui_info_, vr_delete_info, vr_info_); + info = app_mngr::commands::MergeInfos( + ui_delete_info, ui_info_, vr_delete_info, vr_info_); if (is_vr_or_ui_warning && !ui_delete_info.is_unsupported_resource && !vr_delete_info.is_unsupported_resource) { LOG4CXX_DEBUG(logger_, "VR or UI result is warning"); diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_command_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_command_response.cc index cfdb679a6a..726434627f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_command_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_command_response.cc @@ -34,12 +34,14 @@ #include "sdl_rpc_plugin/commands/mobile/delete_command_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { DeleteCommandResponse::DeleteCommandResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} DeleteCommandResponse::~DeleteCommandResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_file_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_file_request.cc index 309a708be8..c16e840660 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_file_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_file_request.cc @@ -37,12 +37,14 @@ #include "utils/file_system.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -DeleteFileRequest::DeleteFileRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +DeleteFileRequest::DeleteFileRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} DeleteFileRequest::~DeleteFileRequest() {} @@ -88,7 +90,8 @@ void DeleteFileRequest::Run() { if (file_system::FileExists(full_file_path)) { if (file_system::DeleteFile(full_file_path)) { - const AppFile* file = application->GetFile(full_file_path); + const application_manager::AppFile* file = + application->GetFile(full_file_path); if (file) { SendFileRemovedNotification(file); } @@ -104,7 +107,8 @@ void DeleteFileRequest::Run() { } } -void DeleteFileRequest::SendFileRemovedNotification(const AppFile* file) const { +void DeleteFileRequest::SendFileRemovedNotification( + const application_manager::AppFile* file) const { smart_objects::SmartObject msg_params = smart_objects::SmartObject(smart_objects::SmartType_Map); diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_file_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_file_response.cc index cf64bed049..24289df704 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_file_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_file_response.cc @@ -35,12 +35,14 @@ #include "application_manager/application_impl.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -DeleteFileResponse::DeleteFileResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +DeleteFileResponse::DeleteFileResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} DeleteFileResponse::~DeleteFileResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_interaction_choice_set_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_interaction_choice_set_request.cc index 048453a296..6cccff2b1f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_interaction_choice_set_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_interaction_choice_set_request.cc @@ -38,12 +38,14 @@ #include "interfaces/HMI_API.h" #include "application_manager/message_helper.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { DeleteInteractionChoiceSetRequest::DeleteInteractionChoiceSetRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} DeleteInteractionChoiceSetRequest::~DeleteInteractionChoiceSetRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_interaction_choice_set_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_interaction_choice_set_response.cc index ea6800203a..27e591f352 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_interaction_choice_set_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_interaction_choice_set_response.cc @@ -37,12 +37,14 @@ #include "interfaces/MOBILE_API.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { DeleteInteractionChoiceSetResponse::DeleteInteractionChoiceSetResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} DeleteInteractionChoiceSetResponse::~DeleteInteractionChoiceSetResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_sub_menu_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_sub_menu_request.cc index a6ec690b8f..499e1e2e3f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_sub_menu_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_sub_menu_request.cc @@ -38,12 +38,14 @@ #include "interfaces/HMI_API.h" #include "utils/helpers.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { DeleteSubMenuRequest::DeleteSubMenuRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} DeleteSubMenuRequest::~DeleteSubMenuRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_sub_menu_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_sub_menu_response.cc index fd542ad50d..966579e163 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_sub_menu_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_sub_menu_response.cc @@ -34,12 +34,14 @@ #include "sdl_rpc_plugin/commands/mobile/delete_sub_menu_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { DeleteSubMenuResponse::DeleteSubMenuResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} DeleteSubMenuResponse::~DeleteSubMenuResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/diagnostic_message_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/diagnostic_message_request.cc index 839a18530a..5fe4bbdc8a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/diagnostic_message_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/diagnostic_message_request.cc @@ -39,12 +39,14 @@ #include "interfaces/HMI_API.h" #include "application_manager/message_helper.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { DiagnosticMessageRequest::DiagnosticMessageRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} DiagnosticMessageRequest::~DiagnosticMessageRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/diagnostic_message_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/diagnostic_message_response.cc index ffa06ff0a8..9c3952e6df 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/diagnostic_message_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/diagnostic_message_response.cc @@ -34,12 +34,14 @@ #include "sdl_rpc_plugin/commands/mobile/diagnostic_message_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { DiagnosticMessageResponse::DiagnosticMessageResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} DiagnosticMessageResponse::~DiagnosticMessageResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/dial_number_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/dial_number_request.cc index 16b8516fb2..3c59e00e9b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/dial_number_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/dial_number_request.cc @@ -36,12 +36,14 @@ #include "application_manager/application_impl.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -DialNumberRequest::DialNumberRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +DialNumberRequest::DialNumberRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} DialNumberRequest::~DialNumberRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/dial_number_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/dial_number_response.cc index 5979a4d704..ffe43a18f7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/dial_number_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/dial_number_response.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/mobile/dial_number_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -DialNumberResponse::DialNumberResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +DialNumberResponse::DialNumberResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} DialNumberResponse::~DialNumberResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/end_audio_pass_thru_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/end_audio_pass_thru_request.cc index e6de193cca..845ca4838c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/end_audio_pass_thru_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/end_audio_pass_thru_request.cc @@ -34,12 +34,14 @@ #include "sdl_rpc_plugin/commands/mobile/end_audio_pass_thru_request.h" #include "application_manager/message_helper.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { EndAudioPassThruRequest::EndAudioPassThruRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} EndAudioPassThruRequest::~EndAudioPassThruRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/end_audio_pass_thru_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/end_audio_pass_thru_response.cc index af15d1eee8..2953a169b0 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/end_audio_pass_thru_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/end_audio_pass_thru_response.cc @@ -34,12 +34,14 @@ #include "sdl_rpc_plugin/commands/mobile/end_audio_pass_thru_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { EndAudioPassThruResponse::EndAudioPassThruResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} EndAudioPassThruResponse::~EndAudioPassThruResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/generic_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/generic_response.cc index 9e6b2ddc8a..9614e635a2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/generic_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/generic_response.cc @@ -35,7 +35,8 @@ #include "application_manager/application_impl.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_dtcs_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_dtcs_request.cc index 100bf52ebc..5951a4b066 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_dtcs_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_dtcs_request.cc @@ -37,12 +37,14 @@ #include "interfaces/HMI_API.h" #include "application_manager/message_helper.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -GetDTCsRequest::GetDTCsRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +GetDTCsRequest::GetDTCsRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} GetDTCsRequest::~GetDTCsRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_dtcs_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_dtcs_response.cc index 32ff9b0d4f..3dbc604f1d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_dtcs_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_dtcs_response.cc @@ -34,12 +34,14 @@ #include "sdl_rpc_plugin/commands/mobile/get_dtcs_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -GetDTCsResponse::GetDTCsResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +GetDTCsResponse::GetDTCsResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} GetDTCsResponse::~GetDTCsResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_request.cc index 85e6ece6a1..c9ab9a4e69 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_request.cc @@ -1,11 +1,13 @@ #include "sdl_rpc_plugin/commands/mobile/get_system_capability_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { GetSystemCapabilityRequest::GetSystemCapabilityRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} GetSystemCapabilityRequest::~GetSystemCapabilityRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_response.cc index 1353bd670e..fd3750e243 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_response.cc @@ -2,12 +2,14 @@ #include "application_manager/rpc_service.h" #include "sdl_rpc_plugin/commands/mobile/get_system_capability_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { GetSystemCapabilityResponse::GetSystemCapabilityResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} GetSystemCapabilityResponse::~GetSystemCapabilityResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_vehicle_data_request.cc index 17c89edf55..3dfcc48e7b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_vehicle_data_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_vehicle_data_request.cc @@ -39,7 +39,8 @@ #include "interfaces/MOBILE_API.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { @@ -47,7 +48,8 @@ namespace str = strings; #ifdef HMI_DBUS_API GetVehicleDataRequest::GetVehicleDataRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} GetVehicleDataRequest::~GetVehicleDataRequest() {} @@ -212,7 +214,8 @@ void GetVehicleDataRequest::on_event(const event_engine::Event& event) { } #else GetVehicleDataRequest::GetVehicleDataRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} GetVehicleDataRequest::~GetVehicleDataRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_vehicle_data_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_vehicle_data_response.cc index b0104e0ce9..7657c3ff49 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_vehicle_data_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_vehicle_data_response.cc @@ -35,12 +35,14 @@ #include "application_manager/rpc_service.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { GetVehicleDataResponse::GetVehicleDataResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} GetVehicleDataResponse::~GetVehicleDataResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_way_points_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_way_points_request.cc index 56491a4643..51b8880242 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_way_points_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_way_points_request.cc @@ -2,12 +2,14 @@ #include "sdl_rpc_plugin/commands/mobile/get_way_points_request.h" #include "application_manager/message_helper.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { GetWayPointsRequest::GetWayPointsRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) { subscribe_on_event(hmi_apis::FunctionID::UI_OnResetTimeout); } diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_way_points_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_way_points_response.cc index a78f83a4dc..84761838de 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_way_points_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_way_points_response.cc @@ -2,12 +2,14 @@ #include "sdl_rpc_plugin/commands/mobile/get_way_points_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { GetWayPointsResponse::GetWayPointsResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} GetWayPointsResponse::~GetWayPointsResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/list_files_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/list_files_request.cc index 6f83eb14b2..592f4da24a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/list_files_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/list_files_request.cc @@ -39,12 +39,14 @@ #include "sdl_rpc_plugin/mobile_command_factory.h" #include "utils/file_system.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -ListFilesRequest::ListFilesRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +ListFilesRequest::ListFilesRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} ListFilesRequest::~ListFilesRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/list_files_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/list_files_response.cc index 63408af092..07baab02ea 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/list_files_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/list_files_response.cc @@ -35,12 +35,14 @@ #include "application_manager/rpc_service.h" #include "application_manager/application_impl.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -ListFilesResponse::ListFilesResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +ListFilesResponse::ListFilesResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} ListFilesResponse::~ListFilesResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_app_interface_unregistered_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_app_interface_unregistered_notification.cc index fe2fda7373..6a0fc0bb0e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_app_interface_unregistered_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_app_interface_unregistered_notification.cc @@ -35,11 +35,13 @@ #include "application_manager/message.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnAppInterfaceUnregisteredNotification::OnAppInterfaceUnregisteredNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandNotificationImpl(message, application_manager) {} OnAppInterfaceUnregisteredNotification:: diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_audio_pass_thru_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_audio_pass_thru_notification.cc index a01ef114ee..d9fc16ed53 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_audio_pass_thru_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_audio_pass_thru_notification.cc @@ -33,11 +33,13 @@ #include "sdl_rpc_plugin/commands/mobile/on_audio_pass_thru_notification.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnAudioPassThruNotification::OnAudioPassThruNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandNotificationImpl(message, application_manager) {} OnAudioPassThruNotification::~OnAudioPassThruNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_button_event_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_button_event_notification.cc index 2b9e2ba49d..cea02018f0 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_button_event_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_button_event_notification.cc @@ -36,14 +36,16 @@ #include "application_manager/application_impl.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { namespace mobile { OnButtonEventNotification::OnButtonEventNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandNotificationImpl(message, application_manager) {} OnButtonEventNotification::~OnButtonEventNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_button_press_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_button_press_notification.cc index e7c267e3d4..bfb5f3110d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_button_press_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_button_press_notification.cc @@ -36,14 +36,16 @@ #include "application_manager/application_impl.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { namespace mobile { OnButtonPressNotification::OnButtonPressNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandNotificationImpl(message, application_manager) {} OnButtonPressNotification::~OnButtonPressNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_command_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_command_notification.cc index 3fbeb8f6b3..ff4cc61eac 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_command_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_command_notification.cc @@ -35,12 +35,14 @@ #include "application_manager/application_impl.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnCommandNotification::OnCommandNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandNotificationImpl(message, application_manager) {} OnCommandNotification::~OnCommandNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_driver_distraction_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_driver_distraction_notification.cc index 5d1684d5fe..9ac6102597 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_driver_distraction_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_driver_distraction_notification.cc @@ -36,14 +36,16 @@ #include "application_manager/application_impl.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { namespace mobile { OnDriverDistractionNotification::OnDriverDistractionNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandNotificationImpl(message, application_manager) {} OnDriverDistractionNotification::~OnDriverDistractionNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_hash_change_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_hash_change_notification.cc index b7d0a76c9b..92d84f3a46 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_hash_change_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_hash_change_notification.cc @@ -38,14 +38,16 @@ #include "interfaces/MOBILE_API.h" #include <string> -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { namespace mobile { OnHashChangeNotification::OnHashChangeNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandNotificationImpl(message, application_manager) {} OnHashChangeNotification::~OnHashChangeNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_hmi_status_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_hmi_status_notification.cc index b38c992fa7..21092f1c47 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_hmi_status_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_hmi_status_notification.cc @@ -37,11 +37,13 @@ #include "application_manager/message.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnHMIStatusNotification::OnHMIStatusNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandNotificationImpl(message, application_manager) {} OnHMIStatusNotification::~OnHMIStatusNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_hmi_status_notification_from_mobile.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_hmi_status_notification_from_mobile.cc index 97a0e03bd2..5a55b81f4f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_hmi_status_notification_from_mobile.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_hmi_status_notification_from_mobile.cc @@ -35,11 +35,13 @@ #include "application_manager/message_helper.h" #include "application_manager/message.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnHMIStatusNotificationFromMobile::OnHMIStatusNotificationFromMobile( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandNotificationFromMobileImpl(message, application_manager) {} OnHMIStatusNotificationFromMobile::~OnHMIStatusNotificationFromMobile() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_keyboard_input_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_keyboard_input_notification.cc index 73e732af26..7996cc0a8f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_keyboard_input_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_keyboard_input_notification.cc @@ -36,14 +36,16 @@ #include "application_manager/application_impl.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { namespace mobile { OnKeyBoardInputNotification::OnKeyBoardInputNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandNotificationImpl(message, application_manager) {} OnKeyBoardInputNotification::~OnKeyBoardInputNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_language_change_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_language_change_notification.cc index 0222145ea6..755854d672 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_language_change_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_language_change_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/mobile/on_language_change_notification.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnLanguageChangeNotification::OnLanguageChangeNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandNotificationImpl(message, application_manager) {} OnLanguageChangeNotification::~OnLanguageChangeNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_permissions_change_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_permissions_change_notification.cc index 8f2f4adf82..2fd028058f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_permissions_change_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_permissions_change_notification.cc @@ -35,12 +35,14 @@ #include "application_manager/message.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnPermissionsChangeNotification::OnPermissionsChangeNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandNotificationImpl(message, application_manager) {} OnPermissionsChangeNotification::~OnPermissionsChangeNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_system_request_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_system_request_notification.cc index 3f5c2dcfd8..f538d82950 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_system_request_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_system_request_notification.cc @@ -40,14 +40,16 @@ #include "application_manager/application_manager.h" #include "application_manager/policies/policy_handler_interface.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { namespace mobile { OnSystemRequestNotification::OnSystemRequestNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandNotificationImpl(message, application_manager) {} OnSystemRequestNotification::~OnSystemRequestNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_tbt_client_state_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_tbt_client_state_notification.cc index 3b2268d6a2..8115e638a2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_tbt_client_state_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_tbt_client_state_notification.cc @@ -36,12 +36,14 @@ #include "application_manager/application_impl.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnTBTClientStateNotification::OnTBTClientStateNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandNotificationImpl(message, application_manager) {} OnTBTClientStateNotification::~OnTBTClientStateNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_touch_event_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_touch_event_notification.cc index 2e9b02b0e0..057db8e395 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_touch_event_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_touch_event_notification.cc @@ -35,14 +35,16 @@ #include "application_manager/application_impl.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { namespace mobile { OnTouchEventNotification::OnTouchEventNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandNotificationImpl(message, application_manager) {} OnTouchEventNotification::~OnTouchEventNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_vehicle_data_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_vehicle_data_notification.cc index 55116340a0..fdca096ea2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_vehicle_data_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_vehicle_data_notification.cc @@ -37,12 +37,14 @@ #include "application_manager/message_helper.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVehicleDataNotification::OnVehicleDataNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandNotificationImpl(message, application_manager) {} OnVehicleDataNotification::~OnVehicleDataNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_way_point_change_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_way_point_change_notification.cc index 58b7416d72..0e9d6c5ebc 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_way_point_change_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_way_point_change_notification.cc @@ -34,11 +34,13 @@ #include "sdl_rpc_plugin/commands/mobile/on_way_point_change_notification.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnWayPointChangeNotification::OnWayPointChangeNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandNotificationImpl(message, application_manager) {} OnWayPointChangeNotification::~OnWayPointChangeNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_audio_pass_thru_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_audio_pass_thru_request.cc index f929a36b63..c1960df924 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_audio_pass_thru_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_audio_pass_thru_request.cc @@ -38,14 +38,16 @@ #include "application_manager/message_helper.h" #include "utils/helpers.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { namespace str = strings; PerformAudioPassThruRequest::PerformAudioPassThruRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) , result_tts_speak_(hmi_apis::Common_Result::INVALID_ENUM) , result_ui_(hmi_apis::Common_Result::INVALID_ENUM) { @@ -206,11 +208,12 @@ const PerformAudioPassThruRequest::ResponseParams& PerformAudioPassThruRequest::PrepareResponseParameters() { LOG4CXX_AUTO_TRACE(logger_); - ResponseInfo ui_perform_info( + app_mngr::commands::ResponseInfo ui_perform_info( result_ui_, HmiInterfaces::HMI_INTERFACE_UI, application_manager_); - ResponseInfo tts_perform_info(result_tts_speak_, - HmiInterfaces::HMI_INTERFACE_TTS, - application_manager_); + app_mngr::commands::ResponseInfo tts_perform_info( + result_tts_speak_, + HmiInterfaces::HMI_INTERFACE_TTS, + application_manager_); // Note(dtrunov): According to requirment "WARNINGS, success:true on getting // UNSUPPORTED_RESOURCE for "ttsChunks" @@ -218,8 +221,8 @@ PerformAudioPassThruRequest::PrepareResponseParameters() { HmiInterfaces::STATE_AVAILABLE == tts_perform_info.interface_state) { response_params_.result_code = mobile_apis::Result::WARNINGS; tts_info_ = "Unsupported phoneme type sent in a prompt"; - response_params_.info = - MergeInfos(ui_perform_info, ui_info_, tts_perform_info, tts_info_); + response_params_.info = app_mngr::commands::MergeInfos( + ui_perform_info, ui_info_, tts_perform_info, tts_info_); response_params_.success = true; return response_params_; } @@ -234,8 +237,8 @@ PerformAudioPassThruRequest::PrepareResponseParameters() { response_params_.success = results.second; response_params_.result_code = results.first; } - response_params_.info = - MergeInfos(ui_perform_info, ui_info_, tts_perform_info, tts_info_); + response_params_.info = app_mngr::commands::MergeInfos( + ui_perform_info, ui_info_, tts_perform_info, tts_info_); return response_params_; } @@ -401,7 +404,8 @@ void PerformAudioPassThruRequest::FinishTTSSpeak() { PerformAudioPassThruRequest::AudioPassThruResults PerformAudioPassThruRequest::PrepareAudioPassThruResultCodeForResponse( - const ResponseInfo& ui_response, const ResponseInfo& tts_response) { + const app_mngr::commands::ResponseInfo& ui_response, + const app_mngr::commands::ResponseInfo& tts_response) { mobile_apis::Result::eType result_code = mobile_apis::Result::INVALID_ENUM; hmi_apis::Common_Result::eType common_result = diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_audio_pass_thru_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_audio_pass_thru_response.cc index d0e9eabb95..6dbcf06621 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_audio_pass_thru_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_audio_pass_thru_response.cc @@ -34,12 +34,14 @@ #include "sdl_rpc_plugin/commands/mobile/perform_audio_pass_thru_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { PerformAudioPassThruResponse::PerformAudioPassThruResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} PerformAudioPassThruResponse::~PerformAudioPassThruResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_interaction_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_interaction_request.cc index e0e9eb3934..1c6b4b2863 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_interaction_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_interaction_request.cc @@ -46,7 +46,8 @@ #include "utils/custom_string.h" #include "utils/gen_hash.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { @@ -55,7 +56,8 @@ namespace custom_str = utils::custom_string; uint32_t PerformInteractionRequest::pi_requests_count_ = 0; PerformInteractionRequest::PerformInteractionRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) , interaction_mode_(mobile_apis::InteractionMode::INVALID_ENUM) , ui_response_received_(false) @@ -980,9 +982,9 @@ void PerformInteractionRequest::SendBothModeResponse( LOG4CXX_AUTO_TRACE(logger_); mobile_apis::Result::eType perform_interaction_result_code = mobile_apis::Result::INVALID_ENUM; - ResponseInfo ui_perform_info( + app_mngr::commands::ResponseInfo ui_perform_info( ui_result_code_, HmiInterfaces::HMI_INTERFACE_UI, application_manager_); - ResponseInfo vr_perform_info( + app_mngr::commands::ResponseInfo vr_perform_info( vr_result_code_, HmiInterfaces::HMI_INTERFACE_VR, application_manager_); const bool result = PrepareResultForMobileResponse(ui_perform_info, vr_perform_info); @@ -990,8 +992,8 @@ void PerformInteractionRequest::SendBothModeResponse( PrepareResultCodeForResponse(ui_perform_info, vr_perform_info); const smart_objects::SmartObject* response_params = msg_param.empty() ? NULL : &msg_param; - std::string info = - MergeInfos(ui_perform_info, ui_info_, vr_perform_info, vr_info_); + std::string info = app_mngr::commands::MergeInfos( + ui_perform_info, ui_info_, vr_perform_info, vr_info_); DisablePerformInteraction(); SendResponse(result, perform_interaction_result_code, diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_interaction_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_interaction_response.cc index 24203858b6..1e9bccee97 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_interaction_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_interaction_response.cc @@ -34,12 +34,14 @@ #include "sdl_rpc_plugin/commands/mobile/perform_interaction_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { PerformInteractionResponse::PerformInteractionResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} PerformInteractionResponse::~PerformInteractionResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/put_file_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/put_file_request.cc index 23d9055c5a..6fb8d0e6b7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/put_file_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/put_file_request.cc @@ -56,12 +56,14 @@ uint32_t GetCrc32CheckSum(const std::vector<uint8_t>& binary_data) { } // namespace -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -PutFileRequest::PutFileRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +PutFileRequest::PutFileRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) , offset_(0) , sync_file_name_() diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/put_file_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/put_file_response.cc index 46f6aac2e7..e2990f6e00 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/put_file_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/put_file_response.cc @@ -35,12 +35,14 @@ #include "utils/file_system.h" #include "application_manager/application_impl.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -PutFileResponse::PutFileResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +PutFileResponse::PutFileResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} PutFileResponse::~PutFileResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/read_did_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/read_did_request.cc index 727dcb47ee..bf894d06ce 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/read_did_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/read_did_request.cc @@ -38,12 +38,14 @@ #include "interfaces/HMI_API.h" #include "application_manager/message_helper.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -ReadDIDRequest::ReadDIDRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +ReadDIDRequest::ReadDIDRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} ReadDIDRequest::~ReadDIDRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/read_did_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/read_did_response.cc index c5218703f8..6d52142898 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/read_did_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/read_did_response.cc @@ -34,12 +34,14 @@ #include "sdl_rpc_plugin/commands/mobile/read_did_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -ReadDIDResponse::ReadDIDResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +ReadDIDResponse::ReadDIDResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} ReadDIDResponse::~ReadDIDResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_request.cc index ac219a0f96..46e6f2188a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_request.cc @@ -173,12 +173,14 @@ struct IsSameNickname { }; } -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { RegisterAppInterfaceRequest::RegisterAppInterfaceRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) , result_code_(mobile_apis::Result::INVALID_ENUM) {} @@ -397,8 +399,7 @@ void RegisterAppInterfaceRequest::Run() { SendRegisterAppInterfaceResponseToMobile(ApplicationType::kNewApplication); smart_objects::SmartObjectSPtr so = GetLockScreenIconUrlNotification(connection_key(), application); - application_manager_.GetRPCService().ManageMobileCommand( - so, commands::Command::SOURCE_SDL); + application_manager_.GetRPCService().ManageMobileCommand(so, SOURCE_SDL); } smart_objects::SmartObjectSPtr @@ -413,10 +414,8 @@ RegisterAppInterfaceRequest::GetLockScreenIconUrlNotification( (*message)[strings::params][strings::connection_key] = connection_key; (*message)[strings::params][strings::message_type] = mobile_apis::messageType::notification; - (*message)[strings::params][strings::protocol_type] = - commands::CommandImpl::mobile_protocol_type_; - (*message)[strings::params][strings::protocol_version] = - commands::CommandImpl::protocol_version_; + (*message)[strings::params][strings::protocol_type] = mobile_protocol_type_; + (*message)[strings::params][strings::protocol_version] = protocol_version_; (*message)[strings::msg_params][strings::request_type] = mobile_apis::RequestType::LOCK_SCREEN_ICON_URL; (*message)[strings::msg_params][strings::url] = @@ -827,7 +826,7 @@ void RegisterAppInterfaceRequest::SendChangeRegistrationOnHMI( } void RegisterAppInterfaceRequest::SendOnAppRegisteredNotificationToHMI( - const Application& application_impl, + const app_mngr::Application& application_impl, bool resumption, bool need_restore_vr) { using namespace smart_objects; @@ -842,8 +841,8 @@ void RegisterAppInterfaceRequest::SendOnAppRegisteredNotificationToHMI( params[strings::function_id] = static_cast<int32_t>( hmi_apis::FunctionID::BasicCommunication_OnAppRegistered); params[strings::message_type] = static_cast<int32_t>(kNotification); - params[strings::protocol_version] = commands::CommandImpl::protocol_version_; - params[strings::protocol_type] = commands::CommandImpl::hmi_protocol_type_; + params[strings::protocol_version] = protocol_version_; + params[strings::protocol_type] = hmi_protocol_type_; (*notification)[strings::msg_params] = SmartObject(SmartType_Map); smart_objects::SmartObject& msg_params = (*notification)[strings::msg_params]; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_response.cc index ae64e407db..3f9b8030df 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_response.cc @@ -38,7 +38,8 @@ #include "connection_handler/connection_handler.h" #include "application_manager/policies/policy_handler_interface.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/reset_global_properties_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/reset_global_properties_request.cc index 97d6a6fdb9..4863f5ae1d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/reset_global_properties_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/reset_global_properties_request.cc @@ -39,12 +39,14 @@ #include "interfaces/MOBILE_API.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { ResetGlobalPropertiesRequest::ResetGlobalPropertiesRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) , ui_result_(hmi_apis::Common_Result::INVALID_ENUM) , tts_result_(hmi_apis::Common_Result::INVALID_ENUM) {} @@ -288,9 +290,9 @@ bool ResetGlobalPropertiesRequest::PrepareResponseParameters( using namespace helpers; bool result = false; - ResponseInfo ui_properties_info( + app_mngr::commands::ResponseInfo ui_properties_info( ui_result_, HmiInterfaces::HMI_INTERFACE_UI, application_manager_); - ResponseInfo tts_properties_info( + app_mngr::commands::ResponseInfo tts_properties_info( tts_result_, HmiInterfaces::HMI_INTERFACE_TTS, application_manager_); HmiInterfaces::InterfaceState tts_interface_state = @@ -308,10 +310,10 @@ bool ResetGlobalPropertiesRequest::PrepareResponseParameters( PrepareResultForMobileResponse(ui_properties_info, tts_properties_info); out_result_code = PrepareResultCodeForResponse(ui_properties_info, tts_properties_info); - out_response_info = MergeInfos(tts_properties_info, - tts_response_info_, - ui_properties_info, - ui_response_info_); + out_response_info = app_mngr::commands::MergeInfos(tts_properties_info, + tts_response_info_, + ui_properties_info, + ui_response_info_); } return result; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/reset_global_properties_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/reset_global_properties_response.cc index 4fbb564713..675d85c398 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/reset_global_properties_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/reset_global_properties_response.cc @@ -34,12 +34,14 @@ #include "sdl_rpc_plugin/commands/mobile/reset_global_properties_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { ResetGlobalPropertiesResponse::ResetGlobalPropertiesResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} ResetGlobalPropertiesResponse::~ResetGlobalPropertiesResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/scrollable_message_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/scrollable_message_request.cc index 4287f8cd96..f69332cddf 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/scrollable_message_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/scrollable_message_request.cc @@ -41,12 +41,14 @@ #include "interfaces/HMI_API.h" #include "utils/helpers.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { ScrollableMessageRequest::ScrollableMessageRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) { subscribe_on_event(hmi_apis::FunctionID::UI_OnResetTimeout); } diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/scrollable_message_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/scrollable_message_response.cc index 180588cca9..772a85baac 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/scrollable_message_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/scrollable_message_response.cc @@ -36,12 +36,14 @@ #include "interfaces/HMI_API.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { ScrollableMessageResponse::ScrollableMessageResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} void ScrollableMessageResponse::Run() { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_haptic_data_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_haptic_data_request.cc index 14d16e1085..7d412e1e03 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_haptic_data_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_haptic_data_request.cc @@ -33,14 +33,16 @@ #include "sdl_rpc_plugin/commands/mobile/send_haptic_data_request.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { namespace custom_str = utils::custom_string; SendHapticDataRequest::SendHapticDataRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} SendHapticDataRequest::~SendHapticDataRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_haptic_data_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_haptic_data_response.cc index 5997b8454e..e925363369 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_haptic_data_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_haptic_data_response.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/mobile/send_haptic_data_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { SendHapticDataResponse::SendHapticDataResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} SendHapticDataResponse::~SendHapticDataResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_location_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_location_request.cc index 12ebcb0a93..a2777fc9b5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_location_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_location_request.cc @@ -35,12 +35,14 @@ #include "application_manager/message_helper.h" #include "utils/custom_string.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { SendLocationRequest::SendLocationRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} SendLocationRequest::~SendLocationRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_location_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_location_response.cc index be12b20bdb..1f27afaee0 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_location_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_location_response.cc @@ -36,12 +36,14 @@ #include "application_manager/application_impl.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { SendLocationResponse::SendLocationResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} SendLocationResponse::~SendLocationResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_app_icon_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_app_icon_request.cc index 752b9f34ed..8d6416cd9b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_app_icon_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_app_icon_request.cc @@ -41,12 +41,14 @@ #include "utils/file_system.h" #include "utils/helpers.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -SetAppIconRequest::SetAppIconRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +SetAppIconRequest::SetAppIconRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) , is_icons_saving_enabled_(false) { const std::string path = diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_app_icon_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_app_icon_response.cc index 1084eb10dd..cd79c3ab95 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_app_icon_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_app_icon_response.cc @@ -34,12 +34,14 @@ #include "sdl_rpc_plugin/commands/mobile/set_app_icon_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -SetAppIconResponse::SetAppIconResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +SetAppIconResponse::SetAppIconResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} SetAppIconResponse::~SetAppIconResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_display_layout_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_display_layout_request.cc index 859340f91e..806670d6e2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_display_layout_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_display_layout_request.cc @@ -36,12 +36,14 @@ #include "application_manager/message_helper.h" #include "application_manager/application_impl.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { SetDisplayLayoutRequest::SetDisplayLayoutRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} SetDisplayLayoutRequest::~SetDisplayLayoutRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_display_layout_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_display_layout_response.cc index e50c0809c4..506a8cb4a6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_display_layout_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_display_layout_response.cc @@ -35,12 +35,14 @@ #include "application_manager/application_impl.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { SetDisplayLayoutResponse::SetDisplayLayoutResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} SetDisplayLayoutResponse::~SetDisplayLayoutResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_global_properties_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_global_properties_request.cc index b37f837e01..a54fc3e9ac 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_global_properties_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_global_properties_request.cc @@ -40,12 +40,14 @@ #include "interfaces/HMI_API.h" #include "utils/helpers.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { SetGlobalPropertiesRequest::SetGlobalPropertiesRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) , is_ui_send_(false) , is_tts_send_(false) @@ -320,10 +322,10 @@ bool SetGlobalPropertiesRequest::PrepareResponseParameters( LOG4CXX_AUTO_TRACE(logger_); using namespace helpers; - ResponseInfo ui_properties_info( + app_mngr::commands::ResponseInfo ui_properties_info( ui_result_, HmiInterfaces::HMI_INTERFACE_UI, application_manager_); - ResponseInfo tts_properties_info( + app_mngr::commands::ResponseInfo tts_properties_info( tts_result_, HmiInterfaces::HMI_INTERFACE_TTS, application_manager_); const bool result = PrepareResultForMobileResponse(ui_properties_info, tts_properties_info); @@ -332,18 +334,18 @@ bool SetGlobalPropertiesRequest::PrepareResponseParameters( (tts_properties_info.is_unsupported_resource)) { result_code = mobile_apis::Result::WARNINGS; tts_response_info_ = "Unsupported phoneme type sent in a prompt"; - info = MergeInfos(tts_properties_info, - tts_response_info_, - ui_properties_info, - ui_response_info_); + info = app_mngr::commands::MergeInfos(tts_properties_info, + tts_response_info_, + ui_properties_info, + ui_response_info_); return result; } result_code = PrepareResultCodeForResponse(ui_properties_info, tts_properties_info); - info = MergeInfos(tts_properties_info, - tts_response_info_, - ui_properties_info, - ui_response_info_); + info = app_mngr::commands::MergeInfos(tts_properties_info, + tts_response_info_, + ui_properties_info, + ui_response_info_); return result; } diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_global_properties_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_global_properties_response.cc index 668308a048..f859237f1f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_global_properties_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_global_properties_response.cc @@ -34,12 +34,14 @@ #include "sdl_rpc_plugin/commands/mobile/set_global_properties_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { SetGlobalPropertiesResponse::SetGlobalPropertiesResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} SetGlobalPropertiesResponse::~SetGlobalPropertiesResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_icon_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_icon_request.cc index 31b1985086..ec5aea85ae 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_icon_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_icon_request.cc @@ -39,12 +39,14 @@ #include "interfaces/HMI_API.h" #include "utils/file_system.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -SetIconRequest::SetIconRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +SetIconRequest::SetIconRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} SetIconRequest::~SetIconRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_icon_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_icon_response.cc index 39446c0f68..5448fc3aa5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_icon_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_icon_response.cc @@ -35,12 +35,14 @@ #include "application_manager/application_manager.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -SetIconResponse::SetIconResponse(const MessageSharedPtr& message, - ApplicationManager& app_man) +SetIconResponse::SetIconResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& app_man) : CommandResponseImpl(message, app_man) {} SetIconResponse::~SetIconResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_media_clock_timer_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_media_clock_timer_request.cc index a098f56669..5ed3a51e18 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_media_clock_timer_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_media_clock_timer_request.cc @@ -38,12 +38,14 @@ #include "interfaces/MOBILE_API.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { SetMediaClockRequest::SetMediaClockRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} SetMediaClockRequest::~SetMediaClockRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_media_clock_timer_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_media_clock_timer_response.cc index 4f1c855826..8240094265 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_media_clock_timer_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_media_clock_timer_response.cc @@ -34,12 +34,14 @@ #include "sdl_rpc_plugin/commands/mobile/set_media_clock_timer_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { SetMediaClockTimerResponse::SetMediaClockTimerResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} SetMediaClockTimerResponse::~SetMediaClockTimerResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_constant_tbt_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_constant_tbt_request.cc index 30f6815e37..47f5522cae 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_constant_tbt_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_constant_tbt_request.cc @@ -41,12 +41,14 @@ #include "interfaces/MOBILE_API.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { ShowConstantTBTRequest::ShowConstantTBTRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} ShowConstantTBTRequest::~ShowConstantTBTRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_constant_tbt_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_constant_tbt_response.cc index 6225c23dd4..6131bc1be6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_constant_tbt_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_constant_tbt_response.cc @@ -35,12 +35,14 @@ #include "application_manager/rpc_service.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { ShowConstantTBTResponse::ShowConstantTBTResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_request.cc index 25163af225..27a5eeb4f0 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_request.cc @@ -39,12 +39,14 @@ #include "utils/file_system.h" #include "utils/helpers.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -ShowRequest::ShowRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +ShowRequest::ShowRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) , core_result_code_(mobile_apis::Result::INVALID_ENUM) {} @@ -266,7 +268,8 @@ void ShowRequest::Run() { StartAwaitForInterface(HmiInterfaces::HMI_INTERFACE_UI); SendHMIRequest(hmi_apis::FunctionID::UI_Show, &msg_params, true); - MessageSharedPtr persistentData = new smart_objects::SmartObject(msg_params); + app_mngr::commands::MessageSharedPtr persistentData = + new smart_objects::SmartObject(msg_params); app->set_show_command(*persistentData); } diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_response.cc index 2e59b3aa07..61c4d19f5f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_response.cc @@ -36,12 +36,14 @@ #include "application_manager/application_impl.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -ShowResponse::ShowResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +ShowResponse::ShowResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} ShowResponse::~ShowResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/slider_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/slider_request.cc index 1f7afe96a4..d332ed45fe 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/slider_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/slider_request.cc @@ -38,12 +38,14 @@ #include "utils/helpers.h" #include "config_profile/profile.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -SliderRequest::SliderRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +SliderRequest::SliderRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) { subscribe_on_event(hmi_apis::FunctionID::UI_OnResetTimeout); } diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/slider_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/slider_response.cc index c19d08bc95..69ac9fcb1f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/slider_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/slider_response.cc @@ -34,12 +34,14 @@ #include "sdl_rpc_plugin/commands/mobile/slider_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -SliderResponse::SliderResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +SliderResponse::SliderResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} SliderResponse::~SliderResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/speak_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/speak_request.cc index 1e9589e30a..9f6bf2e250 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/speak_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/speak_request.cc @@ -38,12 +38,14 @@ #include "application_manager/message_helper.h" #include "utils/helpers.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -SpeakRequest::SpeakRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +SpeakRequest::SpeakRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) { subscribe_on_event(hmi_apis::FunctionID::TTS_OnResetTimeout); } diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/speak_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/speak_response.cc index ca4f69ecd8..d3ffc4a3f4 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/speak_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/speak_response.cc @@ -36,12 +36,14 @@ #include "application_manager/application_impl.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -SpeakResponse::SpeakResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +SpeakResponse::SpeakResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} SpeakResponse::~SpeakResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_button_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_button_request.cc index ecf239e8e4..ce46a47d6e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_button_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_button_request.cc @@ -33,14 +33,16 @@ #include "sdl_rpc_plugin/commands/mobile/subscribe_button_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { namespace str = strings; SubscribeButtonRequest::SubscribeButtonRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} SubscribeButtonRequest::~SubscribeButtonRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_button_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_button_response.cc index f34046935f..53bc5b7ace 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_button_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_button_response.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/mobile/subscribe_button_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { SubscribeButtonResponse::SubscribeButtonResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} SubscribeButtonResponse::~SubscribeButtonResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_vehicle_data_request.cc index d78f019e35..4fd121ba54 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_vehicle_data_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_vehicle_data_request.cc @@ -40,11 +40,13 @@ #include "application_manager/message_helper.h" #include "utils/helpers.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { SubscribeVehicleDataRequest::SubscribeVehicleDataRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} SubscribeVehicleDataRequest::~SubscribeVehicleDataRequest() {} @@ -257,7 +259,7 @@ void SubscribeVehicleDataRequest::on_event(const event_engine::Event& event) { if (!vi_waiting_for_subscribe_.empty()) { LOG4CXX_DEBUG(logger_, "Subscribing to all pending VehicleData"); - VehicleInfoSubscriptions::const_iterator key = + app_mngr::VehicleInfoSubscriptions::const_iterator key = vi_waiting_for_subscribe_.begin(); for (; key != vi_waiting_for_subscribe_.end(); ++key) { app->SubscribeToIVI(*key); @@ -299,7 +301,7 @@ void SubscribeVehicleDataRequest::AddAlreadySubscribedVI( return std::string(); }; - VehicleInfoSubscriptions::const_iterator it_same_app = + app_mngr::VehicleInfoSubscriptions::const_iterator it_same_app = vi_already_subscribed_by_this_app_.begin(); for (; vi_already_subscribed_by_this_app_.end() != it_same_app; ++it_same_app) { @@ -308,7 +310,7 @@ void SubscribeVehicleDataRequest::AddAlreadySubscribedVI( msg_params[vi_to_string(*it_same_app)][strings::data_type] = *it_same_app; } - VehicleInfoSubscriptions::const_iterator it_another_app = + app_mngr::VehicleInfoSubscriptions::const_iterator it_another_app = vi_already_subscribed_by_another_apps_.begin(); for (; vi_already_subscribed_by_another_apps_.end() != it_another_app; ++it_another_app) { @@ -384,7 +386,7 @@ void SubscribeVehicleDataRequest::CheckVISubscriptions( smart_objects::SmartObject& out_request_params, bool& out_result) { // counter for items to subscribe - VehicleInfoSubscriptions::size_type items_to_subscribe = 0; + app_mngr::VehicleInfoSubscriptions::size_type items_to_subscribe = 0; // counter for subscribed items by application uint32_t subscribed_items = 0; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_vehicle_data_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_vehicle_data_response.cc index 37cb6e9f1f..b29d34b22e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_vehicle_data_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_vehicle_data_response.cc @@ -36,11 +36,13 @@ #include "application_manager/application_impl.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { SubscribeVehicleDataResponse::SubscribeVehicleDataResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} SubscribeVehicleDataResponse::~SubscribeVehicleDataResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_way_points_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_way_points_request.cc index b9c1391dc8..2dd1f6579d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_way_points_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_way_points_request.cc @@ -2,12 +2,14 @@ #include "sdl_rpc_plugin/commands/mobile/subscribe_way_points_request.h" #include "application_manager/message_helper.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { SubscribeWayPointsRequest::SubscribeWayPointsRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} SubscribeWayPointsRequest::~SubscribeWayPointsRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_way_points_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_way_points_response.cc index 39b7ddb00d..9d6986969f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_way_points_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_way_points_response.cc @@ -2,12 +2,14 @@ #include "application_manager/rpc_service.h" #include "sdl_rpc_plugin/commands/mobile/subscribe_way_points_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { SubscribeWayPointsResponse::SubscribeWayPointsResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} SubscribeWayPointsResponse::~SubscribeWayPointsResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/system_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/system_request.cc index 1c612dd8c3..5001226ff9 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/system_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/system_request.cc @@ -47,7 +47,8 @@ Copyright (c) 2013, Ford Motor Company #include "utils/helpers.h" #include "utils/custom_string.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; CREATE_LOGGERPTR_LOCAL(logger_, "ApplicationManager") namespace { @@ -431,8 +432,9 @@ uint32_t SystemRequest::index = 0; const std::string kSYNC = "SYNC"; const std::string kIVSU = "IVSU"; -SystemRequest::SystemRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +SystemRequest::SystemRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} SystemRequest::~SystemRequest() {} @@ -558,7 +560,8 @@ void SystemRequest::Run() { << file_name << " within previously saved app file in " << binary_data_folder); - const AppFile* file = application->GetFile(app_full_file_path); + const application_manager::AppFile* file = + application->GetFile(app_full_file_path); if (!file || !file->is_download_complete || !file_system::MoveFile(app_full_file_path, file_dst_path)) { LOG4CXX_DEBUG(logger_, "Binary data not found."); diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/system_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/system_response.cc index 094a58b1d3..388c896ea5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/system_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/system_response.cc @@ -34,12 +34,14 @@ #include "sdl_rpc_plugin/commands/mobile/system_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -SystemResponse::SystemResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +SystemResponse::SystemResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} SystemResponse::~SystemResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unregister_app_interface_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unregister_app_interface_request.cc index cf7690c3d6..969bfb5c3f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unregister_app_interface_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unregister_app_interface_request.cc @@ -35,7 +35,8 @@ #include "application_manager/rpc_service.h" #include "application_manager/message_helper.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { @@ -52,7 +53,7 @@ void UnregisterAppInterfaceRequest::Run() { MessageHelper::GetOnAppInterfaceUnregisteredNotificationToMobile( connection_key(), mobile_api::AppInterfaceUnregisteredReason::INVALID_ENUM), - commands::Command::SOURCE_SDL); + SOURCE_SDL); application_manager_.EndNaviServices(connection_key()); application_manager_.UnregisterApplication(connection_key(), mobile_apis::Result::SUCCESS); diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unregister_app_interface_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unregister_app_interface_response.cc index d23cf6005a..4b79772952 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unregister_app_interface_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unregister_app_interface_response.cc @@ -33,7 +33,8 @@ #include "sdl_rpc_plugin/commands/mobile/unregister_app_interface_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_button_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_button_request.cc index cc05a011d3..8b0d4e29af 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_button_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_button_request.cc @@ -35,14 +35,16 @@ #include "application_manager/application_impl.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { namespace str = strings; UnsubscribeButtonRequest::UnsubscribeButtonRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} UnsubscribeButtonRequest::~UnsubscribeButtonRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_button_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_button_response.cc index 7a970ae2f9..6332a93c58 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_button_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_button_response.cc @@ -34,12 +34,14 @@ #include "sdl_rpc_plugin/commands/mobile/unsubscribe_button_response.h" #include "smart_objects/smart_object.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UnsubscribeButtonResponse::UnsubscribeButtonResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} UnsubscribeButtonResponse::~UnsubscribeButtonResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_vehicle_data_request.cc index 69304714b2..8d5617abb6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_vehicle_data_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_vehicle_data_request.cc @@ -41,11 +41,13 @@ #include "application_manager/smart_object_keys.h" #include "utils/helpers.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UnsubscribeVehicleDataRequest::UnsubscribeVehicleDataRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} UnsubscribeVehicleDataRequest::~UnsubscribeVehicleDataRequest() {} @@ -386,7 +388,7 @@ void UnsubscribeVehicleDataRequest::AddAlreadyUnsubscribedVI( smart_objects::SmartObject& response) const { LOG4CXX_AUTO_TRACE(logger_); using namespace mobile_apis; - VehicleInfoSubscriptions::const_iterator it_same_app = + app_mngr::VehicleInfoSubscriptions::const_iterator it_same_app = vi_already_unsubscribed_by_this_app_.begin(); for (; vi_already_unsubscribed_by_this_app_.end() != it_same_app; ++it_same_app) { @@ -394,7 +396,7 @@ void UnsubscribeVehicleDataRequest::AddAlreadyUnsubscribedVI( VehicleDataResultCode::VDRC_DATA_NOT_SUBSCRIBED; } - VehicleInfoSubscriptions::const_iterator it_another_app = + app_mngr::VehicleInfoSubscriptions::const_iterator it_another_app = vi_still_subscribed_by_another_apps_.begin(); for (; vi_still_subscribed_by_another_apps_.end() != it_another_app; ++it_another_app) { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_vehicle_data_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_vehicle_data_response.cc index 61b5dc3b5c..5c3ce620f8 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_vehicle_data_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_vehicle_data_response.cc @@ -34,11 +34,13 @@ #include "sdl_rpc_plugin/commands/mobile/unsubscribe_vehicle_data_response.h" #include "smart_objects/smart_object.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UnsubscribeVehicleDataResponse::UnsubscribeVehicleDataResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} UnsubscribeVehicleDataResponse::~UnsubscribeVehicleDataResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_way_points_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_way_points_request.cc index 82d94b8a12..8ae05b4432 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_way_points_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_way_points_request.cc @@ -2,12 +2,14 @@ #include "sdl_rpc_plugin/commands/mobile/unsubscribe_way_points_request.h" #include "application_manager/message_helper.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UnSubscribeWayPointsRequest::UnSubscribeWayPointsRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} UnSubscribeWayPointsRequest::~UnSubscribeWayPointsRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_way_points_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_way_points_response.cc index 9da4b697b4..9dca8e8c57 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_way_points_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_way_points_response.cc @@ -2,12 +2,14 @@ #include "sdl_rpc_plugin/commands/mobile/unsubscribe_way_points_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UnsubscribeWayPointsResponse::UnsubscribeWayPointsResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} UnsubscribeWayPointsResponse::~UnsubscribeWayPointsResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/update_turn_list_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/update_turn_list_request.cc index dae8b0dc94..82a3749f29 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/update_turn_list_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/update_turn_list_request.cc @@ -41,14 +41,16 @@ #include "interfaces/HMI_API.h" #include "utils/custom_string.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { namespace custom_str = utils::custom_string; UpdateTurnListRequest::UpdateTurnListRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} UpdateTurnListRequest::~UpdateTurnListRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/update_turn_list_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/update_turn_list_response.cc index 3f1ebf32b2..2d39a5919a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/update_turn_list_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/update_turn_list_response.cc @@ -35,12 +35,14 @@ #include "application_manager/rpc_service.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UpdateTurnListResponse::UpdateTurnListResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} UpdateTurnListResponse::~UpdateTurnListResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/hmi_command_factory.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/hmi_command_factory.cc index cf73771c2a..1cd9414ca3 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/hmi_command_factory.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/hmi_command_factory.cc @@ -294,14 +294,15 @@ #include "sdl_rpc_plugin/commands/hmi/rc_get_capabilities_response.h" CREATE_LOGGERPTR_GLOBAL(logger_, "ApplicationManager") -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; HMICommandFactory::HMICommandFactory(ApplicationManager& application_manager) : application_manager_(application_manager) {} CommandSharedPtr HMICommandFactory::CreateCommand( - const commands::MessageSharedPtr& message, - commands::Command::CommandSource source) { + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::commands::Command::CommandSource source) { const int function_id = (*message)[strings::params][strings::function_id].asInt(); LOG4CXX_DEBUG( diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/mobile_command_factory.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/mobile_command_factory.cc index e182d344af..656126c464 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/mobile_command_factory.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/mobile_command_factory.cc @@ -144,15 +144,16 @@ #include "utils/make_shared.h" CREATE_LOGGERPTR_GLOBAL(logger_, "ApplicationManager") -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; MobileCommandFactory::MobileCommandFactory( ApplicationManager& application_manager) : application_manager_(application_manager) {} CommandSharedPtr MobileCommandFactory::CreateCommand( - const commands::MessageSharedPtr& message, - commands::Command::CommandSource source) { + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::commands::Command::CommandSource source) { CommandSharedPtr command; const int function_id = (*message)[strings::params][strings::function_id].asInt(); @@ -696,7 +697,7 @@ CommandSharedPtr MobileCommandFactory::CreateCommand( break; } case mobile_apis::FunctionID::OnHMIStatusID: { - if (commands::Command::SOURCE_SDL == source) { + if (app_mngr::commands::Command::SOURCE_SDL == source) { command.reset(new commands::OnHMIStatusNotification( message, application_manager_)); } else { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/sdl_command_factory.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/sdl_command_factory.cc index 37f0360404..514cab8037 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/sdl_command_factory.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/sdl_command_factory.cc @@ -37,12 +37,13 @@ #include "sdl_rpc_plugin/hmi_command_factory.h" #include "sdl_rpc_plugin/mobile_command_factory.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; SDLCommandFactory::SDLCommandFactory( - ApplicationManager& app_manager, - rpc_service::RPCService& rpc_service, - HMICapabilities& hmi_capabilities, + app_mngr::ApplicationManager& app_manager, + app_mngr::rpc_service::RPCService& rpc_service, + app_mngr::HMICapabilities& hmi_capabilities, policy::PolicyHandlerInterface& policy_handler) : app_manager_(app_manager) , rpc_service_(rpc_service) @@ -52,10 +53,10 @@ SDLCommandFactory::SDLCommandFactory( mobile_command_factory_.reset(new MobileCommandFactory(app_manager)); } -CommandSharedPtr SDLCommandFactory::CreateCommand( - const commands::MessageSharedPtr& message, - commands::Command::CommandSource source) { - if (commands::Command::SOURCE_HMI == source) { +app_mngr::CommandSharedPtr SDLCommandFactory::CreateCommand( + const app_mngr::commands::MessageSharedPtr& message, + app_mngr::commands::Command::CommandSource source) { + if (app_mngr::commands::Command::SOURCE_HMI == source) { return hmi_command_factory_->CreateCommand(message, source); } else { return mobile_command_factory_->CreateCommand(message, source); diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/sdl_rpc_plugin.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/sdl_rpc_plugin.cc index 67fbe4e26a..ebe77bccb0 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/sdl_rpc_plugin.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/sdl_rpc_plugin.cc @@ -9,7 +9,7 @@ bool SDLRPCPlugin::Init( application_manager::rpc_service::RPCService& rpc_service, application_manager::HMICapabilities& hmi_capabilities, policy::PolicyHandlerInterface& policy_handler) { - command_factory_.reset(new application_manager::SDLCommandFactory( + command_factory_.reset(new sdl_rpc_plugin::SDLCommandFactory( app_manager, rpc_service, hmi_capabilities, policy_handler)); return true; } diff --git a/src/components/application_manager/src/application_impl.cc b/src/components/application_manager/src/application_impl.cc index 8fb88ad5ff..9798ef8113 100644 --- a/src/components/application_manager/src/application_impl.cc +++ b/src/components/application_manager/src/application_impl.cc @@ -1132,7 +1132,7 @@ bool ApplicationImpl::RemoveExtension(AppExtensionUID uid) { } void ApplicationImpl::RemoveExtensions() { - application_manager_.GetPluginManager().RemoveAppExtension(app_id_); + // application_manager_.GetPluginManager().RemoveAppExtension(app_id_); } #endif // SDL_REMOTE_CONTROL diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc index 6a037641f4..29e8178b82 100644 --- a/src/components/application_manager/src/application_manager_impl.cc +++ b/src/components/application_manager/src/application_manager_impl.cc @@ -39,13 +39,11 @@ #include <bson_object.h> #include "application_manager/application_manager_impl.h" -#include "application_manager/mobile_command_factory.h" #include "application_manager/commands/command_impl.h" #include "application_manager/commands/command_notification_impl.h" #include "application_manager/message_helper.h" #include "application_manager/rpc_service_impl.h" #include "application_manager/rpc_handler_impl.h" -#include "application_manager/sdl_command_factory.h" #include "application_manager/mobile_message_handler.h" #include "application_manager/policies/policy_handler.h" #include "application_manager/hmi_capabilities_impl.h" @@ -54,6 +52,7 @@ #include "application_manager/app_launch/app_launch_data_db.h" #include "application_manager/app_launch/app_launch_data_json.h" #include "application_manager/helpers/application_helper.h" +#include "application_manager/plugin_manager/rpc_plugin_manager_impl.h" #include "protocol_handler/protocol_handler.h" #include "hmi_message_handler/hmi_message_handler.h" #include "application_manager/command_holder_impl.h" @@ -192,6 +191,11 @@ ApplicationManagerImpl::ApplicationManagerImpl( clearing_timer->Start(timeout_ms, timer::kSingleShot); timer_pool_.push_back(clearing_timer); rpc_handler_.reset(new rpc_handler::RPCHandlerImpl(*this)); + rpc_service_.reset(new rpc_service::RPCServiceImpl(*this, + request_ctrl_, + protocol_handler_, + hmi_handler_, + *commands_holder_)); commands_holder_.reset(new CommandHolderImpl(*this)); } @@ -1689,13 +1693,7 @@ protocol_handler::ProtocolHandler& ApplicationManagerImpl::protocol_handler() void ApplicationManagerImpl::set_protocol_handler( protocol_handler::ProtocolHandler* handler) { protocol_handler_ = handler; - rpc_service_.reset(new rpc_service::RPCServiceImpl(*this, - request_ctrl_, - protocol_handler_, - hmi_handler_, - *commands_holder_)); - command_factory_.reset(new SDLCommandFactory( - *this, *rpc_service_, *hmi_capabilities_, *policy_handler_)); + rpc_service_->set_protocol_handler(handler); } void ApplicationManagerImpl::StartDevicesDiscovery() { @@ -1730,6 +1728,12 @@ void ApplicationManagerImpl::RemoveHMIFakeParameters( bool ApplicationManagerImpl::Init(resumption::LastState& last_state, media_manager::MediaManager* media_manager) { LOG4CXX_TRACE(logger_, "Init application manager"); + plugin_manager_.reset(new plugin_manager::RPCPluginManagerImpl( + *this, *rpc_service_, *hmi_capabilities_, *policy_handler_)); + if (!plugin_manager_->LoadPlugins(get_settings().plugins_folder())) { + LOG4CXX_ERROR(logger_, "Plugins are not loaded"); + return false; + } const std::string app_storage_folder = get_settings().app_storage_folder(); if (!InitDirectory(app_storage_folder, TYPE_STORAGE) || !IsReadWriteAllowed(app_storage_folder, TYPE_STORAGE)) { @@ -1785,7 +1789,6 @@ bool ApplicationManagerImpl::Init(resumption::LastState& last_state, } app_launch_ctrl_.reset(new app_launch::AppLaunchCtrlImpl( *app_launch_dto_.get(), *this, settings_)); - return true; } diff --git a/src/components/application_manager/src/plugin_manager/rpc_plugin_manager_impl.cc b/src/components/application_manager/src/plugin_manager/rpc_plugin_manager_impl.cc index fb502c8564..946b806c74 100644 --- a/src/components/application_manager/src/plugin_manager/rpc_plugin_manager_impl.cc +++ b/src/components/application_manager/src/plugin_manager/rpc_plugin_manager_impl.cc @@ -1,5 +1,4 @@ #include "application_manager/plugin_manager/rpc_plugin_manager_impl.h" - #include <dlfcn.h> #include "utils/file_system.h" @@ -9,6 +8,16 @@ namespace plugin_manager { CREATE_LOGGERPTR_GLOBAL(logger_, "PluginManager") +RPCPluginManagerImpl::RPCPluginManagerImpl( + ApplicationManager& app_manager, + rpc_service::RPCService& rpc_service, + HMICapabilities& hmi_capabilities, + policy::PolicyHandlerInterface& policy_handler) + : app_manager_(app_manager) + , rpc_service_(rpc_service) + , hmi_capabilities_(hmi_capabilities) + , policy_handler_(policy_handler) {} + bool IsLibraryFile(const std::string& file_path) { size_t pos = file_path.find_last_of("."); if (std::string::npos == pos) { @@ -60,7 +69,8 @@ uint32_t RPCPluginManagerImpl::LoadPlugins(const std::string& plugins_path) { LOG4CXX_DEBUG(logger_, "Loaded " << plugin->PluginName() << " plugin from " << full_name); - if (plugin->Init()) { + if (plugin->Init( + app_manager_, rpc_service_, hmi_capabilities_, policy_handler_)) { loaded_plugins_.push_back(std::move(plugin)); } else { LOG4CXX_ERROR(logger_, diff --git a/src/components/application_manager/src/request_controller.cc b/src/components/application_manager/src/request_controller.cc index f341967842..e052e347f0 100644 --- a/src/components/application_manager/src/request_controller.cc +++ b/src/components/application_manager/src/request_controller.cc @@ -34,7 +34,7 @@ #include "application_manager/request_controller.h" #include "application_manager/commands/command_request_impl.h" -#include "application_manager/commands/hmi/request_to_hmi.h" +#include "application_manager/commands/request_to_hmi.h" #include "utils/make_shared.h" #include "utils/timer_task_impl.h" diff --git a/src/components/application_manager/src/rpc_handler_impl.cc b/src/components/application_manager/src/rpc_handler_impl.cc index 251373a568..f971e911bb 100644 --- a/src/components/application_manager/src/rpc_handler_impl.cc +++ b/src/components/application_manager/src/rpc_handler_impl.cc @@ -145,19 +145,6 @@ void RPCHandlerImpl::Handle(const impl::MessageFromHmi message) { LOG4CXX_ERROR(logger_, "Null-pointer message received."); return; } - -#ifdef SDL_REMOTE_CONTROL - if (app_manager_.GetPluginManager().IsHMIMessageForPlugin(message)) { - functional_modules::ProcessResult result = - app_manager_.GetPluginManager().ProcessHMIMessage(message); - if (functional_modules::ProcessResult::PROCESSED == result || - functional_modules::ProcessResult::FAILED == result) { - LOG4CXX_INFO(logger_, "Message is processed by plugin."); - return; - } - } -#endif - ProcessMessageFromHMI(message); } diff --git a/src/components/application_manager/src/rpc_service_impl.cc b/src/components/application_manager/src/rpc_service_impl.cc index d051d14c74..8db33947a2 100644 --- a/src/components/application_manager/src/rpc_service_impl.cc +++ b/src/components/application_manager/src/rpc_service_impl.cc @@ -126,7 +126,7 @@ bool RPCServiceImpl::ManageMobileCommand( LOG4CXX_WARN(logger_, "Filed to find plugin : " << plugin.error()); return false; } - auto factory = plugin->GetCommandFactory(); + application_manager::CommandFactory& factory = (*plugin).GetCommandFactory(); auto command = factory.CreateCommand(message, source); if (!command) { @@ -259,15 +259,15 @@ bool RPCServiceImpl::ManageHMICommand( MessageHelper::PrintSmartObject(*message); const int32_t function_id = (*(message.get()))[strings::params][strings::function_id].asInt(); - auto plugin = - app_manager_.GetPluginManager().FindPluginToProcess(function_id, source); + auto plugin = app_manager_.GetPluginManager().FindPluginToProcess( + function_id, commands::Command::SOURCE_HMI); if (!plugin) { LOG4CXX_WARN(logger_, "Filed to find plugin : " << plugin.error()); return false; } - auto factory = plugin->GetCommandFactory(); - auto command = factory.CreateCommand(message, source); + application_manager::CommandFactory& factory = (*plugin).GetCommandFactory(); + auto command = factory.CreateCommand(message, commands::Command::SOURCE_HMI); if (!command) { LOG4CXX_WARN(logger_, "Failed to create command from smart object"); @@ -425,12 +425,13 @@ void RPCServiceImpl::SendMessageToMobile( (*message)[strings::params][strings::function_id].asUInt()); if (function_id == mobile_apis::FunctionID::RegisterAppInterfaceID && (*message)[strings::msg_params][strings::success].asBool()) { - LOG4CXX_INFO(logger_, - "Registered app " - << app->app_id() << " is " - << (app_manager_.GetPluginManager().IsAppForPlugins(app) - ? "" - : "not ") << "for plugins."); + // LOG4CXX_INFO(logger_, + // "Registered app " + // << app->app_id() << " is " + // << + // (app_manager_.GetPluginManager().IsAppForPlugins(app) + // ? "" + // : "not ") << "for plugins."); } #endif // SDL_REMOTE_CONTROL } else if (app) { @@ -533,6 +534,11 @@ void RPCServiceImpl::SendPostMessageToHMI(const MessagePtr& message) { messages_to_hmi_.PostMessage(impl::MessageToHmi(message)); } +void RPCServiceImpl::set_protocol_handler( + protocol_handler::ProtocolHandler* handler) { + protocol_handler_ = handler; +} + bool RPCServiceImpl::ConvertSOtoMessage( const NsSmartDeviceLink::NsSmartObjects::SmartObject& message, Message& output) { diff --git a/src/components/application_manager/test/message_helper/CMakeLists.txt b/src/components/application_manager/test/message_helper/CMakeLists.txt index 8ebb2dea0e..d115ad8b40 100755 --- a/src/components/application_manager/test/message_helper/CMakeLists.txt +++ b/src/components/application_manager/test/message_helper/CMakeLists.txt @@ -47,13 +47,6 @@ set(LIBRARIES Utils ) -if(REMOTE_CONTROL) - SET (LIBRARIES - FunctionalModule - ${LIBRARIES} - ) -endif(REMOTE_CONTROL) - set(SOURCES ${COMPONENTS_DIR}/application_manager/test/message_helper/message_helper_test.cc ) diff --git a/src/components/include/application_manager/application_manager.h b/src/components/include/application_manager/application_manager.h index 21665aaa9b..543b4aa2b6 100644 --- a/src/components/include/application_manager/application_manager.h +++ b/src/components/include/application_manager/application_manager.h @@ -142,10 +142,11 @@ class ApplicationManager { /** * @brief set_protocol_handler * @param handler - * set protocol handler and initialize rpc_service + * set protocol handler */ virtual void set_protocol_handler( protocol_handler::ProtocolHandler* handler) = 0; + virtual void set_connection_handler( connection_handler::ConnectionHandler* handler) = 0; diff --git a/src/components/include/application_manager/rpc_service.h b/src/components/include/application_manager/rpc_service.h index 9665cc1cf6..34e14dc990 100644 --- a/src/components/include/application_manager/rpc_service.h +++ b/src/components/include/application_manager/rpc_service.h @@ -35,6 +35,7 @@ #include "application_manager/commands/command.h" #include "application_manager/message.h" +#include "protocol_handler/protocol_handler.h" namespace application_manager { namespace rpc_service { @@ -72,6 +73,14 @@ class RPCService { */ virtual void SendMessageToHMI(const commands::MessageSharedPtr message) = 0; + /** + * @brief set_protocol_handler + * @param handler + * set protocol handler + */ + virtual void set_protocol_handler( + protocol_handler::ProtocolHandler* handler) = 0; + #ifdef SDL_REMOTE_CONTROL virtual void SendPostMessageToMobile(const MessagePtr& message) = 0; virtual void SendPostMessageToHMI(const MessagePtr& message) = 0; diff --git a/src/components/media_manager/src/audio/audio_stream_sender_thread.cc b/src/components/media_manager/src/audio/audio_stream_sender_thread.cc index 681460f6d3..1aacbe4c28 100644 --- a/src/components/media_manager/src/audio/audio_stream_sender_thread.cc +++ b/src/components/media_manager/src/audio/audio_stream_sender_thread.cc @@ -38,7 +38,6 @@ #include <string> #include <string.h> #include "application_manager/application_manager.h" -#include "application_manager/mobile_command_factory.h" #include "application_manager/application_impl.h" #include "application_manager/rpc_service.h" #include "application_manager/commands/command.h" |