diff options
| author | Jacob Keeler <jacob.keeler@livioradio.com> | 2018-07-05 16:43:46 -0400 |
|---|---|---|
| committer | Jacob Keeler <jacob.keeler@livioradio.com> | 2018-07-05 17:04:55 -0400 |
| commit | b8d3227c3421f9408fbba3c7d392d4ae68790bfa (patch) | |
| tree | f60eb58045351d9fb32ab33af8eb91ecdea3a4b2 /src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile | |
| parent | 92d03d64236864a191c5e8ab9fa3c1c35111a486 (diff) | |
| parent | 3ca6e219ad6325e4ae5486df0f1071c90430a259 (diff) | |
| download | sdl_core-b8d3227c3421f9408fbba3c7d392d4ae68790bfa.tar.gz | |
Merge remote-tracking branch 'origin/feature/remove_qt_hmi_api_dbus' into develop
# Conflicts:
# src/components/application_manager/CMakeLists.txt
# src/components/application_manager/include/application_manager/commands/mobile/get_vehicle_data_request.h
# src/components/application_manager/include/application_manager/commands/mobile/subscribe_vehicle_data_request.h
# src/components/application_manager/include/application_manager/commands/mobile/unsubscribe_vehicle_data_request.h
# src/components/application_manager/src/commands/mobile/get_vehicle_data_request.cc
# src/components/application_manager/src/commands/mobile/subscribe_vehicle_data_request.cc
# src/components/application_manager/src/commands/mobile/unsubscribe_vehicle_data_request.cc
# src/components/application_manager/src/hmi_command_factory.cc
# src/components/application_manager/src/message_helper/message_helper.cc
# src/components/application_manager/test/commands/hmi/dummy_hmi_commands_test.cc
# src/components/application_manager/test/commands/hmi/hmi_notifications/hmi_notifications_test.cc
# src/components/application_manager/test/commands/mobile/get_vehicle_data_request_test.cc
Diffstat (limited to 'src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile')
3 files changed, 0 insertions, 44 deletions
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/get_vehicle_data_request.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/get_vehicle_data_request.h index 17ae1ffd09..04a131da8f 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/get_vehicle_data_request.h +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/get_vehicle_data_request.h @@ -73,22 +73,6 @@ class GetVehicleDataRequest : public app_mngr::commands::CommandRequestImpl { protected: virtual void on_event(const app_mngr::event_engine::Event& event); -#ifdef HMI_DBUS_API - private: - void SendRequestsToHmi(const int32_t app_id); - - struct HmiRequest { - hmi_apis::Common_Result::eType status; - bool complete; - smart_objects::SmartObject value; - const char* str; - hmi_apis::FunctionID::eType func_id; - }; - - typedef std::vector<HmiRequest> HmiRequests; - HmiRequests hmi_requests_; -#endif // #ifdef HMI_DBUS_API - DISALLOW_COPY_AND_ASSIGN(GetVehicleDataRequest); }; diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/subscribe_vehicle_data_request.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/subscribe_vehicle_data_request.h index d324d5ca24..6e084e0869 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/subscribe_vehicle_data_request.h +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/subscribe_vehicle_data_request.h @@ -87,20 +87,6 @@ class SubscribeVehicleDataRequest */ bool Init() FINAL; -#ifdef HMI_DBUS_API - private: - struct HmiRequest { - hmi_apis::Common_Result::eType status; - bool complete; - smart_objects::SmartObject value; - const char* str; - hmi_apis::FunctionID::eType func_id; - }; - - typedef std::vector<HmiRequest> HmiRequests; - HmiRequests hmi_requests_; -#endif // #ifdef HMI_DBUS_API - private: /** * @brief Checks, if any app is subscribed for particular VI parameter diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/unsubscribe_vehicle_data_request.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/unsubscribe_vehicle_data_request.h index 5730048b85..e04d1fb97a 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/unsubscribe_vehicle_data_request.h +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/unsubscribe_vehicle_data_request.h @@ -84,20 +84,6 @@ class UnsubscribeVehicleDataRequest */ bool Init() FINAL; -#ifdef HMI_DBUS_API - private: - struct HmiRequest { - hmi_apis::Common_Result::eType status; - bool complete; - smart_objects::SmartObject value; - const char* str; - hmi_apis::FunctionID::eType func_id; - }; - - typedef std::vector<HmiRequest> HmiRequests; - HmiRequests hmi_requests_; -#endif // #ifdef HMI_DBUS_API - private: /** * @brief Checks, if any app is subscribed for particular VI parameter |