diff options
author | Mykola Korniichuk <mkorniichuk@luxoft.com> | 2018-10-30 18:45:52 +0200 |
---|---|---|
committer | Mykola Korniichuk <mkorniichuk@luxoft.com> | 2018-12-04 13:38:14 +0200 |
commit | 176e6bb7cadd8fc58016f78bdfe23b41cd7f2213 (patch) | |
tree | e630914cc6ba8dfa693edfce02da21adb621e970 | |
parent | ad229382f8df084c7a63027248807c7f7f03448d (diff) | |
download | sdl_core-176e6bb7cadd8fc58016f78bdfe23b41cd7f2213.tar.gz |
discard changes in policy_table/enums
4 files changed, 0 insertions, 24 deletions
diff --git a/src/components/policy/policy_external/include/policy/policy_table/enums.h b/src/components/policy/policy_external/include/policy/policy_table/enums.h index 69ab98007b..34864c5602 100644 --- a/src/components/policy/policy_external/include/policy/policy_table/enums.h +++ b/src/components/policy/policy_external/include/policy/policy_table/enums.h @@ -434,11 +434,6 @@ enum FunctionID { SendHapticDataID = 49, /** - * @brief ShowAppMenuID. - */ - ShowAppMenuID = 50, - - /** * @brief OnHMIStatusID. */ OnHMIStatusID = 32768, diff --git a/src/components/policy/policy_external/src/policy_table/enums.cc b/src/components/policy/policy_external/src/policy_table/enums.cc index fbba806f86..27db505e3f 100644 --- a/src/components/policy/policy_external/src/policy_table/enums.cc +++ b/src/components/policy/policy_external/src/policy_table/enums.cc @@ -881,11 +881,6 @@ bool EnumFromJsonString(const std::string& literal, FunctionID* result) { return true; } - if ("ShowAppMenu" == literal) { - *result = ShowAppMenuID; - return true; - } - if ("CreateInteractionChoiceSet" == literal) { *result = CreateInteractionChoiceSetID; return true; diff --git a/src/components/policy/policy_regular/include/policy/policy_table/enums.h b/src/components/policy/policy_regular/include/policy/policy_table/enums.h index ba6a68be48..1f10db9f6f 100644 --- a/src/components/policy/policy_regular/include/policy/policy_table/enums.h +++ b/src/components/policy/policy_regular/include/policy/policy_table/enums.h @@ -420,11 +420,6 @@ enum FunctionID { SendHapticDataID = 49, /** - * @brief ShowAppMenuID. - **/ - ShowAppMenuID = 50, - - /** * @brief OnHMIStatusID. */ OnHMIStatusID = 32768, diff --git a/src/components/policy/policy_regular/src/policy_table/enums.cc b/src/components/policy/policy_regular/src/policy_table/enums.cc index 2420ddbafa..428e18d0bd 100644 --- a/src/components/policy/policy_regular/src/policy_table/enums.cc +++ b/src/components/policy/policy_regular/src/policy_table/enums.cc @@ -727,8 +727,6 @@ bool IsValidEnum(FunctionID val) { return true; case DeleteSubMenuID: return true; - case ShowAppMenuID: - return true; case CreateInteractionChoiceSetID: return true; case PerformInteractionID: @@ -876,8 +874,6 @@ const char* EnumToJsonString(FunctionID val) { return "AddSubMenu"; case DeleteSubMenuID: return "DeleteSubMenu"; - case ShowAppMenuID: - return "ShowAppMenu"; case CreateInteractionChoiceSetID: return "CreateInteractionChoiceSet"; case PerformInteractionID: @@ -1048,11 +1044,6 @@ bool EnumFromJsonString(const std::string& literal, FunctionID* result) { return true; } - if ("ShowAppMenu" == literal) { - *result = ShowAppMenuID; - return true; - } - if ("CreateInteractionChoiceSet" == literal) { *result = CreateInteractionChoiceSetID; return true; |