Removed old rule trigger types (moved to context package)

Change-Id: I9a932234f9ceb27bf006df901222d4baed2df36f
Signed-off-by: Somin Kim <somin926.kim@samsung.com>

diff --git a/include/TriggerRuleTypes.h b/include/TriggerRuleTypes.h
index 7ca1057..886d119 100644 (file)
--- a/include/TriggerRuleTypes.h
+++ b/include/TriggerRuleTypes.h
@@ -64,38 +64,7 @@
 //#define TRIG_RULE_OP_CONTAIN                                 "contain"
 
 /* Old Rule Keys */
-#define OLD_TRIG_RULE_KEY_LOGICAL_CONJUNCTION "and"
-#define OLD_TRIG_RULE_KEY_LOGICAL_DISJUNCTION "or"
-
-#define OLD_TRIG_RULE_KEY_DESCRIPTION "DESCRIPTION"
-#define OLD_TRIG_RULE_KEY_DETAILS "DETAILS"
-#define OLD_TRIG_RULE_KEY_EVENT "EVENT"
-#define OLD_TRIG_RULE_KEY_EVENT_ITEM "ITEM_NAME"
-#define OLD_TRIG_RULE_KEY_EVENT_OPERATOR "ITEM_OPERATOR"
-#define OLD_TRIG_RULE_KEY_EVENT_OPTION "OPTION"
-#define OLD_TRIG_RULE_KEY_OPERATOR "OPERATOR"
-#define OLD_TRIG_RULE_KEY_CONDITION "CONDITION"
-#define OLD_TRIG_RULE_KEY_CONDITION_ITEM "ITEM_NAME"
-#define OLD_TRIG_RULE_KEY_CONDITION_OPERATOR "ITEM_OPERATOR"
-#define OLD_TRIG_RULE_KEY_CONDITION_OPTION "OPTION"
-#define OLD_TRIG_RULE_KEY_DATA_ARR "DATA_ARR"
-#define OLD_TRIG_RULE_KEY_DATA_KEY "DATA_KEY"
-#define OLD_TRIG_RULE_KEY_DATA_KEY_OPERATOR "DATA_KEY_OPERATOR"
-#define OLD_TRIG_RULE_KEY_DATA_VALUE_ARR "DATA_VALUE_ARR"
-#define OLD_TRIG_RULE_KEY_DATA_VALUE_OPERATOR_ARR "DATA_VALUE_OPER_ARR"
-#define OLD_TRIG_RULE_KEY_ACTION "ACTION"
-#define OLD_TRIG_RULE_KEY_ACTION_TYPE "ACTION_TYPE"
-#define OLD_TRIG_RULE_KEY_ACTION_APP_CONTROL "ACTION_APP_CONTROL"
-#define OLD_TRIG_RULE_KEY_ACTION_NOTI_TITLE "ACTION_NOTI_TITLE"
-#define OLD_TRIG_RULE_KEY_ACTION_NOTI_CONTENT "ACTION_NOTI_CONTENT"
-#define OLD_TRIG_RULE_KEY_ACTION_NOTI_ICON_PATH "ACTION_NOTI_ICON_PATH"
-#define OLD_TRIG_RULE_KEY_ACTION_DBUS_NAME "ACTION_DBUS_NAME"
-#define OLD_TRIG_RULE_KEY_ACTION_DBUS_OBJECT "ACTION_DBUS_OBJ"
-#define OLD_TRIG_RULE_KEY_ACTION_DBUS_INTERFACE "ACTION_DBUS_IFACE"
-#define OLD_TRIG_RULE_KEY_ACTION_DBUS_METHOD "ACTION_DBUS_METHOD"
-#define OLD_TRIG_RULE_KEY_ACTION_DBUS_PARAMETER "ACTION_DBUS_PARAM"
-#define OLD_TRIG_RULE_KEY_ACTION_TYPE_APP_CONTROL "app_control"
-#define OLD_TRIG_RULE_KEY_ACTION_TYPE_NOTIFICATION "notification"
-#define OLD_TRIG_RULE_KEY_ACTION_TYPE_DBUS_CALL "dbus_call"
+#define TRIG_RULE_LOGICAL_CONJUNCTION "and"
+#define TRIG_RULE_LOGICAL_DISJUNCTION "or"
 
 #endif /* _CONTEXT_TRIGGER_RULE_TYPES_H_ */