diff options
Diffstat (limited to 'src/components/include/policy')
4 files changed, 5 insertions, 20 deletions
diff --git a/src/components/include/policy/policy_external/policy/policy_listener.h b/src/components/include/policy/policy_external/policy/policy_listener.h index e850a3fa2b..c023f3c7fc 100644 --- a/src/components/include/policy/policy_external/policy/policy_listener.h +++ b/src/components/include/policy/policy_external/policy/policy_listener.h @@ -137,7 +137,6 @@ class PolicyListener { virtual void GetRegisteredLinks( std::map<std::string, std::string>& out_links) const = 0; -#ifdef SDL_REMOTE_CONTROL /** * Gets devices ids by policy application id * @param policy_app_id @@ -173,8 +172,6 @@ class PolicyListener { virtual void OnUpdateHMIStatus(const std::string& device_id, const std::string& policy_app_id, const std::string& hmi_level) = 0; - -#endif // SDL_REMOTE_CONTROL }; } // namespace policy #endif // SRC_COMPONENTS_INCLUDE_POLICY_POLICY_EXTERNAL_POLICY_POLICY_LISTENER_H_ diff --git a/src/components/include/policy/policy_external/policy/policy_manager.h b/src/components/include/policy/policy_external/policy/policy_manager.h index 7970d525c5..57f6d2f802 100644 --- a/src/components/include/policy/policy_external/policy/policy_manager.h +++ b/src/components/include/policy/policy_external/policy/policy_manager.h @@ -42,14 +42,11 @@ #include "policy/policy_listener.h" #include "policy/usage_statistics/statistics_manager.h" #include "policy/cache_manager_interface.h" - -#ifdef SDL_REMOTE_CONTROL #include "policy/access_remote.h" -#endif // SDL_REMOTE_CONTROL namespace policy { class PolicySettings; -typedef utils::SharedPtr<utils::Callable> StatusNotifier; +typedef std::shared_ptr<utils::Callable> StatusNotifier; class PolicyManager : public usage_statistics::StatisticsManager { public: @@ -565,7 +562,6 @@ class PolicyManager : public usage_statistics::StatisticsManager { */ virtual AppIdURL GetNextUpdateUrl(const EndpointUrls& urls) = 0; -#ifdef SDL_REMOTE_CONTROL /** * @brief Assigns new HMI types for specified application * @param application_id Unique application id @@ -613,8 +609,7 @@ class PolicyManager : public usage_statistics::StatisticsManager { * @param access_remote pointer to new access_remote instance */ virtual void set_access_remote( - utils::SharedPtr<AccessRemote> access_remote) = 0; -#endif // SDL_REMOTE_CONTROL + std::shared_ptr<AccessRemote> access_remote) = 0; /** * @brief Checks if there is existing URL in the EndpointUrls vector with diff --git a/src/components/include/policy/policy_regular/policy/policy_listener.h b/src/components/include/policy/policy_regular/policy/policy_listener.h index e8de37d5de..3f6f555bcc 100644 --- a/src/components/include/policy/policy_regular/policy/policy_listener.h +++ b/src/components/include/policy/policy_regular/policy/policy_listener.h @@ -112,7 +112,6 @@ class PolicyListener { */ virtual void OnCertificateUpdated(const std::string& certificate_data) = 0; -#ifdef SDL_REMOTE_CONTROL /** * Gets devices ids by policy application id * @param policy_app_id @@ -148,8 +147,6 @@ class PolicyListener { virtual void OnUpdateHMIStatus(const std::string& device_id, const std::string& policy_app_id, const std::string& hmi_level) = 0; - -#endif // SDL_REMOTE_CONTROL }; } // namespace policy #endif // SRC_COMPONENTS_INCLUDE_POLICY_POLICY_REGULAR_POLICY_POLICY_LISTENER_H_ diff --git a/src/components/include/policy/policy_regular/policy/policy_manager.h b/src/components/include/policy/policy_regular/policy/policy_manager.h index 84d48a691e..ee0bae7118 100644 --- a/src/components/include/policy/policy_regular/policy/policy_manager.h +++ b/src/components/include/policy/policy_regular/policy/policy_manager.h @@ -42,14 +42,11 @@ #include "policy/policy_listener.h" #include "policy/usage_statistics/statistics_manager.h" #include "policy/cache_manager_interface.h" - -#ifdef SDL_REMOTE_CONTROL #include "policy/access_remote.h" -#endif // SDL_REMOTE_CONTROL namespace policy { class PolicySettings; -typedef utils::SharedPtr<utils::Callable> StatusNotifier; +typedef std::shared_ptr<utils::Callable> StatusNotifier; class PolicyManager : public usage_statistics::StatisticsManager { public: @@ -543,7 +540,7 @@ class PolicyManager : public usage_statistics::StatisticsManager { * urls vector */ virtual AppIdURL GetNextUpdateUrl(const EndpointUrls& urls) = 0; -#ifdef SDL_REMOTE_CONTROL + /** * @brief Assigns new HMI types for specified application * @param application_id Unique application id @@ -592,8 +589,7 @@ class PolicyManager : public usage_statistics::StatisticsManager { * @param access_remote pointer to new access_remote instance */ virtual void set_access_remote( - utils::SharedPtr<AccessRemote> access_remote) = 0; -#endif // SDL_REMOTE_CONTROL + std::shared_ptr<AccessRemote> access_remote) = 0; /** * @brief Checks if there is existing URL in the EndpointUrls vector with |