summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAKalinich-Luxoft <AKalinich@luxoft.com>2018-03-02 12:55:17 +0200
committerAKalinich-Luxoft <AKalinich@luxoft.com>2018-03-02 12:55:17 +0200
commit74837cf41e96439eb131227c961405b3af5091bb (patch)
treedd48f72526b44bb7f4d8f631eeb1e18bde931163
parent721779a52005033f44a728f9771c0a9ed93cff77 (diff)
downloadsdl_core-feature/last_mile_navigation.tar.gz
Updated description, added new deprecated macrofeature/last_mile_navigation
-rw-r--r--src/components/application_manager/include/application_manager/application_manager_impl.h1
-rw-r--r--src/components/application_manager/include/application_manager/commands/command_impl.h15
2 files changed, 8 insertions, 8 deletions
diff --git a/src/components/application_manager/include/application_manager/application_manager_impl.h b/src/components/application_manager/include/application_manager/application_manager_impl.h
index 51541c89fd..ecfe19da19 100644
--- a/src/components/application_manager/include/application_manager/application_manager_impl.h
+++ b/src/components/application_manager/include/application_manager/application_manager_impl.h
@@ -1142,7 +1142,6 @@ class ApplicationManagerImpl
*/
DEPRECATED void ResetPhoneCallAppList();
- // TODO(AOleynik): Temporary added, to fix build. Should be reworked.
connection_handler::ConnectionHandler& connection_handler() const OVERRIDE;
protocol_handler::ProtocolHandler& protocol_handler() const OVERRIDE;
diff --git a/src/components/application_manager/include/application_manager/commands/command_impl.h b/src/components/application_manager/include/application_manager/commands/command_impl.h
index 8c67156215..4bca90c0fa 100644
--- a/src/components/application_manager/include/application_manager/commands/command_impl.h
+++ b/src/components/application_manager/include/application_manager/commands/command_impl.h
@@ -161,11 +161,10 @@ class CommandImpl : public Command {
bool ReplaceMobileWithHMIAppId(smart_objects::SmartObject& message);
/**
- * DEPRECATED
* @brief Parses mobile message and replaces mobile app id with HMI app id
* @param message Message to replace its ids
*/
- void ReplaceMobileByHMIAppId(smart_objects::SmartObject& message);
+ DEPRECATED void ReplaceMobileByHMIAppId(smart_objects::SmartObject& message);
/**
* @brief Parses message from HMI and replaces HMI app id with mobile app id
@@ -175,16 +174,16 @@ class CommandImpl : public Command {
bool ReplaceHMIWithMobileAppId(smart_objects::SmartObject& message);
/**
- * DEPRECATED
* @brief Parses message from HMI and replaces HMI app id with mobile app id
* @param message Message to replace its ids
*/
- void ReplaceHMIByMobileAppId(smart_objects::SmartObject& message);
+ DEPRECATED void ReplaceHMIByMobileAppId(smart_objects::SmartObject& message);
/**
* @brief Validate string syntax in smart object
* @param obj Smart object to check
- * @return true if syntax if all object strings is correct otherwise false
+ * @return true if syntax of all strings in the smart object is valid
+ * otherwise returns false
*/
bool ValidateSmartObjectStrings(const smart_objects::SmartObject& obj) const;
@@ -192,7 +191,8 @@ class CommandImpl : public Command {
* @brief Validate string syntax in smart map
* @param obj Smart map to check
* @param key Map iterator
- * @return true if syntax if all map strings is correct otherwise false
+ * @return true if syntax of all strings in the smart object is valid
+ * otherwise returns false
*/
bool ValidateSmartMapStrings(const smart_objects::SmartObject& obj,
std::set<std::string>::const_iterator key) const;
@@ -200,7 +200,8 @@ class CommandImpl : public Command {
/**
* @brief Check string syntax
* @param obj Smart string object
- * @return true if syntax of string is correct otherwise false
+ * @return true if syntax of string in smart object is valid otherwise returns
+ * false
*/
bool ValidateSmartString(const smart_objects::SmartObject& obj) const;