summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-05-25 19:22:46 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-05-29 10:49:16 +0900
commit5540ab8c6fdb0f6a96d16af31d5a0c8ca8bd1c3e (patch)
tree3ae9397f99d1eff30538c14f98dac85a3cf7876d
parent71678f301ad609219a72b5d517837f21b69d85e3 (diff)
edje: Remove Message_Type from EO
See the previous commits, Eina_Value is used directly, no need to specify the type.
-rw-r--r--src/lib/edje/Edje_Legacy.h49
-rw-r--r--src/lib/edje/edje_types.eot25
2 files changed, 49 insertions, 25 deletions
diff --git a/src/lib/edje/Edje_Legacy.h b/src/lib/edje/Edje_Legacy.h
index b0df94e237..0512f184b0 100644
--- a/src/lib/edje/Edje_Legacy.h
+++ b/src/lib/edje/Edje_Legacy.h
@@ -97,6 +97,55 @@ EAPI void *edje_object_signal_callback_del (Evas_Object *obj, const char
97 */ 97 */
98EAPI void *edje_object_signal_callback_del_full(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func, void *data); 98EAPI void *edje_object_signal_callback_del_full(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func, void *data);
99 99
100
101/** Identifiers of Edje message types, which can be sent back and forth code
102 * and a given Edje object's theme file/group.
103 *
104 * @ref edje_object_message_send
105 * @ref edje_object_message_handler_set
106 */
107typedef enum
108{
109 EDJE_MESSAGE_NONE = 0, /**< No message type */
110 EDJE_MESSAGE_SIGNAL = 1, /**< DO NOT USE THIS */
111 EDJE_MESSAGE_STRING = 2, /**< A message with a string as value. Use
112 * #Edje_Message_String structs as message body, for
113 * this type. */
114 EDJE_MESSAGE_INT = 3, /**< A message with an integer number as value. Use
115 * #Edje_Message_Int structs as message body, for this
116 * type. */
117 EDJE_MESSAGE_FLOAT = 4, /**< A message with a floating pointer number as
118 * value. Use #Edje_Message_Float structs as message
119 * body, for this type. */
120 EDJE_MESSAGE_STRING_SET = 5, /**< A message with a list of strings as value.
121 * Use #Edje_Message_String_Set structs as
122 * message body, for this type. */
123 EDJE_MESSAGE_INT_SET = 6, /**< A message with a list of integer numbers as
124 * value. Use #Edje_Message_Int_Set structs as
125 * message body, for this type. */
126 EDJE_MESSAGE_FLOAT_SET = 7, /**< A message with a list of floating point
127 * numbers as value. Use #Edje_Message_Float_Set
128 * structs as message body, for this type. */
129 EDJE_MESSAGE_STRING_INT = 8, /**< A message with a struct containing a string
130 * and an integer number as value. Use
131 * #Edje_Message_String_Int structs as message
132 * body, for this type. */
133 EDJE_MESSAGE_STRING_FLOAT = 9, /**< A message with a struct containing a
134 * string and a floating point number as
135 * value. Use #Edje_Message_String_Float
136 * structs as message body, for this type. */
137 EDJE_MESSAGE_STRING_INT_SET = 10, /**< A message with a struct containing a
138 * string and list of integer numbers as
139 * value. Use #Edje_Message_String_Int_Set
140 * structs as message body, for this type.
141 */
142 EDJE_MESSAGE_STRING_FLOAT_SET = 11 /**< A message with a struct containing a
143 * string and list of floating point
144 * numbers as value. Use
145 * #Edje_Message_String_Float_Set structs
146 * as message body, for this type. */
147} Edje_Message_Type;
148
100/** 149/**
101 * @brief Sets an Edje message handler function for a given Edje object. 150 * @brief Sets an Edje message handler function for a given Edje object.
102 * 151 *
diff --git a/src/lib/edje/edje_types.eot b/src/lib/edje/edje_types.eot
index 36dec6fb42..2237b4082f 100644
--- a/src/lib/edje/edje_types.eot
+++ b/src/lib/edje/edje_types.eot
@@ -152,31 +152,6 @@ struct Edje.External.Param {
152 s: string; [[Used by both string and choice]] 152 s: string; [[Used by both string and choice]]
153} 153}
154 154
155enum Edje.Message_Type {
156 [[Identifiers of Edje message types, which can be sent back and forth code and a given Edje object's theme file/group.
157 \@ref edje_object_message_send, \@ref edje_object_message_handler_set.
158 ]]
159 legacy: Edje_Message;
160
161 none = 0, [[No message type]]
162
163 signal = 1, [[DO NOT USE THIS]]
164
165 string = 2, [[A message with a string as value. Use #Edje_Message_String structs as message body, for this type.]]
166 int = 3, [[A message with an integer number as value. Use #Edje_Message_Int structs as message body, for this type.]]
167 float = 4, [[A message with a floating pointer number as value. Use #Edje_Message_Float structs as message body, for this type.]]
168
169 string_set = 5, [[A message with a list of strings as value. Use #Edje_Message_String_Set structs as message body, for this type.]]
170 int_set = 6, [[A message with a list of integer numbers as value. Use #Edje_Message_Int_Set structs as message body, for this type.]]
171 float_set = 7, [[A message with a list of floating point numbers as value. Use #Edje_Message_Float_Set structs as message body, for this type.]]
172
173 string_int = 8, [[A message with a struct containing a string and an integer number as value. Use #Edje_Message_String_Int structs as message body, for this type.]]
174 string_float = 9, [[A message with a struct containing a string and a floating point number as value. Use #Edje_Message_String_Float structs as message body, for this type.]]
175
176 string_int_set = 10, [[A message with a struct containing a string and list of integer numbers as value. Use #Edje_Message_String_Int_Set structs as message body, for this type.]]
177 string_float_set = 11 [[A message with a struct containing a string and list of floating point numbers as value. Use #Edje_Message_String_Float_Set structs as message body, for this type.]]
178}
179
180 155
181struct Edje.Perspective; [[Perspective info for maps inside edje objects]] 156struct Edje.Perspective; [[Perspective info for maps inside edje objects]]
182 157