tasn pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=a023a04b53c52aa3fd65b5ac9054d5fd706c31d5
commit a023a04b53c52aa3fd65b5ac9054d5fd706c31d5
Author: Tom Hacohen <t...@stosb.com>
Date: Wed Jun 10 17:23:30 2015 +0100
Edje object: Fix remaining Eolian warnings.
---
src/lib/edje/Edje_Common.h | 117 --------------------------------------------
src/lib/edje/edje_object.eo | 24 ++++-----
src/lib/edje/edje_types.eot | 92 ++++++++++++++++++++++++++++++++++
3 files changed, 104 insertions(+), 129 deletions(-)
diff --git a/src/lib/edje/Edje_Common.h b/src/lib/edje/Edje_Common.h
index 4aa3da2..668eab0 100644
--- a/src/lib/edje/Edje_Common.h
+++ b/src/lib/edje/Edje_Common.h
@@ -322,20 +322,6 @@ EAPI void edje_collection_cache_flush (void);
*/
/**
- * The possible types the parameters of an EXTERNAL part can be.
- */
-typedef enum _Edje_External_Param_Type
-{
- EDJE_EXTERNAL_PARAM_TYPE_INT, /**< Parameter value is an integer. */
- EDJE_EXTERNAL_PARAM_TYPE_DOUBLE, /**< Parameter value is a double. */
- EDJE_EXTERNAL_PARAM_TYPE_STRING, /**< Parameter value is a string. */
- EDJE_EXTERNAL_PARAM_TYPE_BOOL, /**< Parameter value is boolean. */
- EDJE_EXTERNAL_PARAM_TYPE_CHOICE, /**< Parameter value is one of a set of
- predefined string choices. */
- EDJE_EXTERNAL_PARAM_TYPE_MAX /**< Sentinel. Don't use. */
-} Edje_External_Param_Type;
-
-/**
* Flags that determine how a parameter may be accessed in different
* circumstances.
*/
@@ -362,25 +348,6 @@ typedef enum _Edje_External_Param_Flags
EAPI const char *edje_external_param_type_str(Edje_External_Param_Type type)
EINA_PURE;
/**
- * Struct that holds parameters for parts of type EXTERNAL.
- */
-struct _Edje_External_Param
-{
- const char *name; /**< The name of the parameter. */
- Edje_External_Param_Type type; /**< The type of the parameter. This defines
- which of the next three variables holds
- the value for it. */
- // XXX these could be in a union, but eet doesn't support them (or does it?)
- int i; /**< Used by both integer and boolean */
- double d; /**< Used by double */
- const char *s; /**< Used by both string and choice */
-};
-/**
- * Struct that holds parameters for parts of type EXTERNAL.
- */
-typedef struct _Edje_External_Param Edje_External_Param;
-
-/**
* Helper macro to indicate an EXTERNAL's integer parameter is undefined.
*/
#define EDJE_EXTERNAL_INT_UNSET INT_MAX
@@ -994,62 +961,6 @@ typedef enum _Edje_Text_Filter_Type
EDJE_TEXT_FILTER_MARKUP = 2 /**< Markup type filter */
} Edje_Text_Filter_Type;
-/**
- * @typedef Edje_Input_Panel_Lang
- *
- */
-typedef enum _Edje_Input_Panel_Lang
-{
- EDJE_INPUT_PANEL_LANG_AUTOMATIC, /**< Automatic @since 1.2 */
- EDJE_INPUT_PANEL_LANG_ALPHABET /**< Alphabet @since 1.2 */
-} Edje_Input_Panel_Lang;
-
-typedef enum _Edje_Input_Panel_Return_Key_Type
-{
- EDJE_INPUT_PANEL_RETURN_KEY_TYPE_DEFAULT, /**< Default @since 1.2 */
- EDJE_INPUT_PANEL_RETURN_KEY_TYPE_DONE, /**< Done @since 1.2 */
- EDJE_INPUT_PANEL_RETURN_KEY_TYPE_GO, /**< Go @since 1.2 */
- EDJE_INPUT_PANEL_RETURN_KEY_TYPE_JOIN, /**< Join @since 1.2 */
- EDJE_INPUT_PANEL_RETURN_KEY_TYPE_LOGIN, /**< Login @since 1.2 */
- EDJE_INPUT_PANEL_RETURN_KEY_TYPE_NEXT, /**< Next @since 1.2 */
- EDJE_INPUT_PANEL_RETURN_KEY_TYPE_SEARCH, /**< Search or magnifier icon
@since 1.2 */
- EDJE_INPUT_PANEL_RETURN_KEY_TYPE_SEND, /**< Send @since 1.2 */
- EDJE_INPUT_PANEL_RETURN_KEY_TYPE_SIGNIN /**< Sign-in @since 1.8 */
-} Edje_Input_Panel_Return_Key_Type;
-
-/**
- * @typedef Edje_Input_Panel_Layout
- * @brief Edje input panel layout
- */
-typedef enum _Edje_Input_Panel_Layout
-{
- EDJE_INPUT_PANEL_LAYOUT_NORMAL, /**< Default layout */
- EDJE_INPUT_PANEL_LAYOUT_NUMBER, /**< Number layout */
- EDJE_INPUT_PANEL_LAYOUT_EMAIL, /**< Email layout */
- EDJE_INPUT_PANEL_LAYOUT_URL, /**< URL layout */
- EDJE_INPUT_PANEL_LAYOUT_PHONENUMBER, /**< Phone Number layout */
- EDJE_INPUT_PANEL_LAYOUT_IP, /**< IP layout */
- EDJE_INPUT_PANEL_LAYOUT_MONTH, /**< Month layout */
- EDJE_INPUT_PANEL_LAYOUT_NUMBERONLY, /**< Number Only layout */
- EDJE_INPUT_PANEL_LAYOUT_INVALID, /**< Never use this */
- EDJE_INPUT_PANEL_LAYOUT_HEX, /**< Hexadecimal layout @since 1.2
*/
- EDJE_INPUT_PANEL_LAYOUT_TERMINAL, /**< Command-line terminal layout
including esc, alt, ctrl key, so on (no auto-correct, no auto-capitalization)
@since 1.2 */
- EDJE_INPUT_PANEL_LAYOUT_PASSWORD, /**< Like normal, but no
auto-correct, no auto-capitalization etc. @since 1.2 */
- EDJE_INPUT_PANEL_LAYOUT_DATETIME, /**< Date and time layout @since
1.8 */
- EDJE_INPUT_PANEL_LAYOUT_EMOTICON /**< Emoticon layout @since 1.10 */
-} Edje_Input_Panel_Layout;
-
-/*
- * @typedef Edje_Input_Hints
- * @brief Edje input hints
- */
-typedef enum
-{
- EDJE_INPUT_HINT_NONE = 0, /**< No active hints @since
1.12 */
- EDJE_INPUT_HINT_AUTO_COMPLETE = 1 << 0, /**< Suggest word auto
completion @since 1.12 */
- EDJE_INPUT_HINT_SENSITIVE_DATA = 1 << 1, /**< Typed text should not
be stored. @since 1.12 */
-} Edje_Input_Hints;
-
enum
{
EDJE_INPUT_PANEL_LAYOUT_NORMAL_VARIATION_NORMAL, /**< The plain
normal layout @since 1.12 */
@@ -1947,34 +1858,6 @@ EAPI void edje_language_set (const
char *locale);
* @{
*/
-/**
- * Identifiers of Edje message types, which can be sent back and forth
- * code and a given Edje object's theme file/group.
- *
- * @see edje_object_message_send()
- * @see edje_object_message_handler_set()
- */
-typedef enum _Edje_Message_Type
-{
- EDJE_MESSAGE_NONE = 0,
-
- EDJE_MESSAGE_SIGNAL = 1, /* DONT USE THIS */
-
- EDJE_MESSAGE_STRING = 2, /**< A message with a string as value. Use
#Edje_Message_String structs as message body, for this type. */
- EDJE_MESSAGE_INT = 3, /**< A message with an integer number as value. Use
#Edje_Message_Int structs as message body, for this type. */
- EDJE_MESSAGE_FLOAT = 4, /**< A message with a floating pointer number as
value. Use #Edje_Message_Float structs as message body, for this type. */
-
- EDJE_MESSAGE_STRING_SET = 5, /**< A message with a list of strings as
value. Use #Edje_Message_String_Set structs as message body, for this type. */
- EDJE_MESSAGE_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. */
- EDJE_MESSAGE_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. */
-
- EDJE_MESSAGE_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. */
- EDJE_MESSAGE_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. */
-
- EDJE_MESSAGE_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. */
- EDJE_MESSAGE_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. */
-} Edje_Message_Type;
-
typedef struct _Edje_Message_String Edje_Message_String;
typedef struct _Edje_Message_Int Edje_Message_Int;
typedef struct _Edje_Message_Float Edje_Message_Float;
diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/edje_object.eo
index d606582..76355e7 100755
--- a/src/lib/edje/edje_object.eo
+++ b/src/lib/edje/edje_object.eo
@@ -480,7 +480,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
@return @c EDJE_EXTERNAL_PARAM_TYPE_MAX on errors, or another value
from #Edje_External_Param_Type on success. */
- return: Edje_External_Param_Type;
+ return: Edje.External.Param_Type;
params {
@in part: const(char)*; /*@ The part name */
@out param: const(char); /*@ the parameter name to use. */
@@ -982,7 +982,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
params {
@in part: const(char)*; /*@ The part name */
- @in layout: Edje_Input_Panel_Layout; /*@ layout type */
+ @in layout: Edje.Input_Panel.Layout; /*@ layout type */
}
}
part_text_input_panel_layout_get @const {
@@ -993,7 +993,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
@see edje_object_part_text_input_panel_layout_set
@since 1.1 */
- return: Edje_Input_Panel_Layout;
+ return: Edje.Input_Panel.Layout;
params {
@in part: const(char)*; /*@ The part name */
}
@@ -1026,7 +1026,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
params {
@in part: const(char)*; /*@ The part name */
- @in lang: Edje_Input_Panel_Lang; /*@ the language to be set to the
input panel. */
+ @in lang: Edje.Input_Panel.Lang; /*@ the language to be set to the
input panel. */
}
}
part_text_input_panel_language_get @const {
@@ -1037,7 +1037,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
@return input panel language type
@since 1.2.0 */
- return: Edje_Input_Panel_Lang;
+ return: Edje.Input_Panel.Lang;
params {
@in part: const(char)*; /*@ The part name */
}
@@ -1317,7 +1317,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
edje_object_message_handler_set(). */
params {
- @in type: Edje_Message_Type; /*@ The type of message to send to @p
obj */
+ @in type: Edje.Message_Type; /*@ The type of message to send to @p
obj */
@in id: int; /*@ A identification number for the message to be
sent */
@in msg: void *; /*@ The message's body, a struct depending on @p
type */
}
@@ -1749,7 +1749,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
params {
@in part: const(char)*; /*@ The part name */
- @in return_key_type: Edje_Input_Panel_Return_Key_Type; /*@ The
type of "return" key on the input panel */
+ @in return_key_type: Edje.Input_Panel.Return_Key_Type; /*@ The
type of "return" key on the input panel */
}
}
part_text_input_panel_return_key_type_get @const {
@@ -1760,7 +1760,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
@return The type of "return" key on the input panel
@since 1.2.0 */
- return: Edje_Input_Panel_Return_Key_Type;
+ return: Edje.Input_Panel.Return_Key_Type;
params {
@in part: const(char)*; /*@ The part name */
}
@@ -1823,7 +1823,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
return: bool;
params {
@in part: const(char)*; /*@ The part name */
- @in param: const(Edje_External_Param)*; /*@ the parameter details,
including its name, type and
+ @in param: const(Edje.External.Param)*; /*@ the parameter details,
including its name, type and
actual value. This pointer should be valid, and the
parameter must exist in
#Edje_External_Type.parameters_info, with the exact type,
@@ -1852,7 +1852,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
return: bool;
params {
@in part: const(char)*; /*@ The part name */
- @out param: Edje_External_Param; /*@ the parameter details. It is
used as both input and
+ @out param: Edje.External.Param; /*@ the parameter details. It is
used as both input and
output variable. This pointer should be valid, and the
parameter must exist in
#Edje_External_Type.parameters_info, with the exact type,
@@ -2019,7 +2019,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
params {
@in part: const(char)*; /*@ The part name */
- @in input_hints: Edje_Input_Hints; /*@ input hints */
+ @in input_hints: Edje.Input_Hints; /*@ input hints */
}
}
part_text_input_hint_get @const {
@@ -2028,7 +2028,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
@return The value of input hint
@since 1.12.0 */
- return: Edje_Input_Hints;
+ return: Edje.Input_Hints;
params {
@in part: const(char)*; /*@ The part name */
}
diff --git a/src/lib/edje/edje_types.eot b/src/lib/edje/edje_types.eot
index eb2dabd..d17a3d4 100644
--- a/src/lib/edje/edje_types.eot
+++ b/src/lib/edje/edje_types.eot
@@ -40,6 +40,98 @@ enum Edje.Text.Autocapital_Type {
allcharacter [[All characters mode value]]
}
+enum Edje.Input_Hints {
+ legacy: Edje_Input_Hint;
+
+ none = 0, [[No active hints @since 1.12]]
+ auto_complete = 1 << 0, [[Suggest word auto completion @since 1.12]]
+ sensitive_data = 1 << 1 [[Typed text should not be stored. @since
1.12]]
+}
+
+enum Edje.Input_Panel.Lang {
+ automatic, [[Automatic @since 1.2]]
+ alphabet [[Alphabet @since 1.2]]
+}
+
+enum Edje.Input_Panel.Return_Key_Type {
+ default, [[Default @since 1.2]]
+ done, [[Done @since 1.2]]
+ go, [[Go @since 1.2]]
+ join, [[Join @since 1.2]]
+ login, [[Login @since 1.2]]
+ next, [[Next @since 1.2]]
+ search, [[Search or magnifier icon @since 1.2]]
+ send, [[Send @since 1.2]]
+ signin [[Sign-in @since 1.8]]
+}
+
+enum Edje.Input_Panel.Layout {
+ normal, [[Default layout]]
+ number, [[Number layout]]
+ email, [[Email layout]]
+ url, [[URL layout]]
+ phonenumber, [[Phone Number layout]]
+ ip, [[IP layout]]
+ month, [[Month layout]]
+ numberonly, [[Number Only layout]]
+ invalid, [[Never use this]]
+ hex, [[Hexadecimal layout @since 1.2]]
+ terminal, [[Command-line terminal layout including esc, alt, ctrl
key, so on (no auto-correct, no auto-capitalization) @since 1.2]]
+ password, [[Like normal, but no auto-correct, no auto-capitalization
etc. @since 1.2]]
+ datetime, [[Date and time layout @since 1.8]]
+ emoticon [[Emoticon layout @since 1.10]]
+}
+
+enum Edje.External.Param_Type {
+ [[The possible types the parameters of an EXTERNAL part can be.]]
+
+ int, /**< Parameter value is an integer. */
+ double, /**< Parameter value is a double. */
+ string, /**< Parameter value is a string. */
+ bool, /**< Parameter value is boolean. */
+ choice, /**< Parameter value is one of a set of
+ predefined string choices. */
+ max /**< Sentinel. Don't use. */
+}
+
+struct Edje.External.Param {
+ [[Struct that holds parameters for parts of type EXTERNAL.]]
+ name: const(char) *; [[The name of the parameter.]]
+ type: Edje.External.Param_Type; [[The type of the parameter. This defines
+ which of the next three variables holds
+ the value for it.]]
+ // XXX these could be in a union, but eet doesn't support them (or does it?)
+ i: int; [[Used by both integer and boolean]]
+ d: double; [[Used by double]]
+ s: const(char) *; [[Used by both string and choice]]
+}
+
+enum Edje.Message_Type {
+ [[Identifiers of Edje message types, which can be sent back and forth code
and a given Edje object's theme file/group.
+ @Edje.Object.message_send() @Edje.Object.message_handler_set()
+ ]]
+ legacy: Edje_Message;
+
+ none = 0,
+
+ signal = 1, [[DONT USE THIS]]
+
+ string = 2, [[A message with a string as value. Use #Edje_Message_String
structs as message body, for this type.]]
+ int = 3, [[A message with an integer number as value. Use #Edje_Message_Int
structs as message body, for this type.]]
+ float = 4, [[A message with a floating pointer number as value. Use
#Edje_Message_Float structs as message body, for this type.]]
+
+ string_set = 5, [[A message with a list of strings as value. Use
#Edje_Message_String_Set structs as message body, for this type.]]
+ 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.]]
+ 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.]]
+
+ 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.]]
+ 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.]]
+
+ 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.]]
+ 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.]]
+}
+
+
struct Edje.Perspective; [[Perspective info for maps inside edje objects]]
/* FIXME-cb: Ignore cb types that should be fixed. */
--
