int -> enum.

SVN revision: 52589

legacy/edje/src/lib/Edje.h

@@ -58,9 +58,7 @@ extern "C" {
  * These routines are used for Edje.
  */
 
-
-/* FIXDOC: Define these? */
-enum _Edje_Message_Type
+typedef enum _Edje_Message_Type
 {
    EDJE_MESSAGE_NONE = 0,
 
@@ -79,26 +77,23 @@ enum _Edje_Message_Type
 
    EDJE_MESSAGE_STRING_INT_SET = 10,
    EDJE_MESSAGE_STRING_FLOAT_SET = 11
-};
-typedef enum _Edje_Message_Type Edje_Message_Type;
+} Edje_Message_Type;
 
-enum _Edje_Aspect_Control
+typedef enum _Edje_Aspect_Control
 {
    EDJE_ASPECT_CONTROL_NONE = 0,
    EDJE_ASPECT_CONTROL_NEITHER = 1,
    EDJE_ASPECT_CONTROL_HORIZONTAL = 2,
    EDJE_ASPECT_CONTROL_VERTICAL = 3,
    EDJE_ASPECT_CONTROL_BOTH = 4
-};
-typedef enum _Edje_Aspect_Control Edje_Aspect_Control;
+} Edje_Aspect_Control;
 
-enum _Edje_Object_Table_Homogeneous_Mode
+typedef enum _Edje_Object_Table_Homogeneous_Mode
 {
    EDJE_OBJECT_TABLE_HOMOGENEOUS_NONE = 0,
    EDJE_OBJECT_TABLE_HOMOGENEOUS_TABLE = 1,
    EDJE_OBJECT_TABLE_HOMOGENEOUS_ITEM = 2
-};
-typedef enum _Edje_Object_Table_Homogeneous_Mode Edje_Object_Table_Homogeneous_Mode;
+} Edje_Object_Table_Homogeneous_Mode;
 
 typedef enum _Edje_Part_Type
 {
@@ -160,7 +155,7 @@ typedef enum _Edje_Tween_Mode
    EDJE_TWEEN_MODE_LAST       = 5
 } Edje_Tween_Mode;
 
-enum _Edje_Cursor
+typedef enum _Edje_Cursor
 {
    EDJE_CURSOR_MAIN,
    EDJE_CURSOR_SELECTION_BEGIN,
@@ -170,8 +165,7 @@ enum _Edje_Cursor
    EDJE_CURSOR_USER,
    EDJE_CURSOR_USER_EXTRA,
    // more later
-};
-typedef enum _Edje_Cursor Edje_Cursor;
+} Edje_Cursor;
 
 typedef struct _Edje_Message_String           Edje_Message_String;
 typedef struct _Edje_Message_Int              Edje_Message_Int;
@@ -243,15 +237,15 @@ struct _Edje_Message_String_Float_Set
    double val[1];
 };
 
-enum
+typedef enum _Edje_Drag_Dir
 {
    EDJE_DRAG_DIR_NONE = 0,
    EDJE_DRAG_DIR_X = 1,
    EDJE_DRAG_DIR_Y = 2,
    EDJE_DRAG_DIR_XY = 3
-};
+} Edje_Drag_Dir;
 
-enum
+typedef enum _Edje_Load_Error
 {
    EDJE_LOAD_ERROR_NONE = 0,
    EDJE_LOAD_ERROR_GENERIC = 1,
@@ -263,9 +257,9 @@ enum
    EDJE_LOAD_ERROR_INCOMPATIBLE_FILE = 7,
    EDJE_LOAD_ERROR_UNKNOWN_COLLECTION = 8,
    EDJE_LOAD_ERROR_RECURSIVE_REFERENCE = 9
-};
+} Edje_Load_Error;
 
-enum _Edje_External_Param_Type
+typedef enum _Edje_External_Param_Type
 {
   EDJE_EXTERNAL_PARAM_TYPE_INT,
   EDJE_EXTERNAL_PARAM_TYPE_DOUBLE,
@@ -273,8 +267,7 @@ enum _Edje_External_Param_Type
   EDJE_EXTERNAL_PARAM_TYPE_BOOL,
   EDJE_EXTERNAL_PARAM_TYPE_CHOICE,
   EDJE_EXTERNAL_PARAM_TYPE_MAX
-};
-typedef enum _Edje_External_Param_Type Edje_External_Param_Type;
+} Edje_External_Param_Type;
 
 EAPI const char *edje_external_param_type_str(Edje_External_Param_Type type) EINA_PURE;
 
@@ -395,7 +388,6 @@ struct _Edje_External_Type
   const char  *(*translate) (void *data, const char *orig); /**< called to translate parameters_info name properties for use in user interfaces that support internationalization (i18n) */
 
   Edje_External_Param_Info *parameters_info;
-
   void                     *data;
 };
 typedef struct _Edje_External_Type Edje_External_Type;
@@ -441,7 +433,6 @@ typedef void (*Edje_Message_Handler_Cb) (void *data, Evas_Object *obj, Edje_Mess
    EAPI int          edje_collection_cache_get       (void);
    EAPI void         edje_collection_cache_flush     (void);
 
-
    /* edje_util.c */
    EAPI Eina_Bool    edje_color_class_set            (const char *color_class, int r, int g, int b, int a, int r2, int g2, int b2, int a2, int r3, int g3, int b3, int a3);
    EAPI Eina_Bool    edje_color_class_get            (const char *color_class, int *r, int *g, int *b, int *a, int *r2, int *g2, int *b2, int *a2, int *r3, int *g3, int *b3, int *a3);
@@ -464,8 +455,8 @@ typedef void (*Edje_Message_Handler_Cb) (void *data, Evas_Object *obj, Edje_Mess
    /* edje_load.c */
    EAPI Eina_Bool        edje_object_file_set        (Evas_Object *obj, const char *file, const char *group);
    EAPI void             edje_object_file_get        (const Evas_Object *obj, const char **file, const char **group);
-   EAPI int          edje_object_load_error_get      (const Evas_Object *obj);
-   EAPI const char  *edje_load_error_str             (int error);
+   EAPI Edje_Load_Error  edje_object_load_error_get  (const Evas_Object *obj);
+   EAPI const char      *edje_load_error_str         (Edje_Load_Error error);
 
    /* edje_util.c */
    EAPI Eina_Bool    edje_object_preload             (Evas_Object *obj, Eina_Bool cancel);

legacy/edje/src/lib/edje_calc.c

@@ -1658,6 +1658,9 @@ _edje_image_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *p3, Edj
 		     case EVAS_LOAD_ERROR_UNKNOWN_FORMAT:
 			ERR("Error type: EVAS_LOAD_ERROR_UNKNOWN_FORMAT");
 			break;
+                    default:
+			ERR("Error type: ???");
+                       break;
 		    }
 	       }
 	  }

legacy/edje/src/lib/edje_load.c

@@ -81,7 +81,7 @@ edje_object_file_get(const Evas_Object *obj, const char **file, const char **gro
  * EDJE_LOAD_ERROR_UNKNOWN_COLLECTION: Unknown Collection\n
  * EDJE_LOAD_ERROR_RECURSIVE_REFERENCE: Recursive Reference\n
  */
-EAPI int
+EAPI Edje_Load_Error
 edje_object_load_error_get(const Evas_Object *obj)
 {
    Edje *ed;
@@ -92,7 +92,7 @@ edje_object_load_error_get(const Evas_Object *obj)
 }
 
 EAPI const char *
-edje_load_error_str(int error)
+edje_load_error_str(Edje_Load_Error error)
 {
    switch (error)
      {