summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2010-09-22 10:52:54 +0000
committerCarsten Haitzler <raster@rasterman.com>2010-09-22 10:52:54 +0000
commit21ec26bed308e373ebe14ca471615106cd96e536 (patch)
treeb38f04344c8c90d9411f97b32496fcd192775d6b
parentc105d1bcf460bcbb9f47a1054aea3c5881a3760f (diff)
move some simple #define constants to typedefs. api compatible tho.
SVN revision: 52575
Diffstat (limited to '')
-rw-r--r--legacy/evas/src/lib/Evas.h108
-rw-r--r--legacy/evas/src/lib/canvas/evas_object_image.c6
-rw-r--r--legacy/evas/src/lib/main.c2
3 files changed, 58 insertions, 58 deletions
diff --git a/legacy/evas/src/lib/Evas.h b/legacy/evas/src/lib/Evas.h
index 28a8634c5c..66d2eb88da 100644
--- a/legacy/evas/src/lib/Evas.h
+++ b/legacy/evas/src/lib/Evas.h
@@ -205,7 +205,7 @@ typedef struct _Evas_Smart_Cb_Description Evas_Smart_Cb_Description;
205 * @see evas_map_dup() 205 * @see evas_map_dup()
206 * @ingroup Evas_Object_Group_Map 206 * @ingroup Evas_Object_Group_Map
207 */ 207 */
208typedef struct _Evas_Map Evas_Map; 208typedef struct _Evas_Map Evas_Map;
209 209
210/** 210/**
211 * @typedef Evas 211 * @typedef Evas
@@ -214,25 +214,25 @@ typedef struct _Evas_Map Evas_Map;
214 * @see evas_free() 214 * @see evas_free()
215 * @ingroup Evas_Canvas 215 * @ingroup Evas_Canvas
216 */ 216 */
217typedef struct _Evas Evas; 217typedef struct _Evas Evas;
218 218
219/** 219/**
220 * @typedef Evas_Object 220 * @typedef Evas_Object
221 * An Evas Object handle. 221 * An Evas Object handle.
222 * @ingroup Evas_Object_Group 222 * @ingroup Evas_Object_Group
223 */ 223 */
224typedef struct _Evas_Object Evas_Object; 224typedef struct _Evas_Object Evas_Object;
225 225
226typedef void Evas_Performance; /**< An Evas Performance handle */ 226typedef void Evas_Performance; /**< An Evas Performance handle */
227typedef struct _Evas_Modifier Evas_Modifier; /**< An Evas Modifier */ 227typedef struct _Evas_Modifier Evas_Modifier; /**< An Evas Modifier */
228typedef struct _Evas_Lock Evas_Lock; /**< An Evas Lock */ 228typedef struct _Evas_Lock Evas_Lock; /**< An Evas Lock */
229typedef struct _Evas_Smart Evas_Smart; /**< An Evas Smart Object handle */ 229typedef struct _Evas_Smart Evas_Smart; /**< An Evas Smart Object handle */
230typedef struct _Evas_Native_Surface Evas_Native_Surface; /**< A generic datatype for engine specific native surface information */ 230typedef struct _Evas_Native_Surface Evas_Native_Surface; /**< A generic datatype for engine specific native surface information */
231typedef unsigned long long Evas_Modifier_Mask; /**< An Evas modifier mask type */ 231typedef unsigned long long Evas_Modifier_Mask; /**< An Evas modifier mask type */
232 232
233typedef int Evas_Coord; 233typedef int Evas_Coord;
234typedef int Evas_Font_Size; 234typedef int Evas_Font_Size;
235typedef int Evas_Angle; 235typedef int Evas_Angle;
236 236
237struct _Evas_Coord_Rectangle /**< A rectangle in Evas_Coord */ 237struct _Evas_Coord_Rectangle /**< A rectangle in Evas_Coord */
238{ 238{
@@ -279,7 +279,6 @@ typedef enum _Evas_Aspect_Control
279 EVAS_ASPECT_CONTROL_BOTH = 4 279 EVAS_ASPECT_CONTROL_BOTH = 4
280} Evas_Aspect_Control; 280} Evas_Aspect_Control;
281 281
282
283typedef struct _Evas_Pixel_Import_Source Evas_Pixel_Import_Source; /**< A source description of pixels for importing pixels */ 282typedef struct _Evas_Pixel_Import_Source Evas_Pixel_Import_Source; /**< A source description of pixels for importing pixels */
284typedef struct _Evas_Engine_Info Evas_Engine_Info; /**< A generic Evas Engine information structure */ 283typedef struct _Evas_Engine_Info Evas_Engine_Info; /**< A generic Evas Engine information structure */
285typedef struct _Evas_Device Evas_Device; /**< A source device handle - where the event came from */ 284typedef struct _Evas_Device Evas_Device; /**< A source device handle - where the event came from */
@@ -296,25 +295,44 @@ typedef struct _Evas_Event_Key_Down Evas_Event_Key_Down; /**< Event structure
296typedef struct _Evas_Event_Key_Up Evas_Event_Key_Up; /**< Event structure for #EVAS_CALLBACK_KEY_UP event callbacks */ 295typedef struct _Evas_Event_Key_Up Evas_Event_Key_Up; /**< Event structure for #EVAS_CALLBACK_KEY_UP event callbacks */
297typedef struct _Evas_Event_Hold Evas_Event_Hold; /**< Event structure for #EVAS_CALLBACK_HOLD event callbacks */ 296typedef struct _Evas_Event_Hold Evas_Event_Hold; /**< Event structure for #EVAS_CALLBACK_HOLD event callbacks */
298 297
299/* load error identifiers, see evas_load_error_str() */ 298typedef enum _Evas_Load_Error
300#define EVAS_LOAD_ERROR_NONE 0 /**< No error on load */ 299{
301#define EVAS_LOAD_ERROR_GENERIC 1 /**< A non-specific error occurred */ 300 EVAS_LOAD_ERROR_NONE = 0, /**< No error on load */
302#define EVAS_LOAD_ERROR_DOES_NOT_EXIST 2 /**< File (or file path) does not exist */ 301 EVAS_LOAD_ERROR_GENERIC = 1, /**< A non-specific error occurred */
303#define EVAS_LOAD_ERROR_PERMISSION_DENIED 3 /**< Permission deinied to an existing file (or path) */ 302 EVAS_LOAD_ERROR_DOES_NOT_EXIST = 2, /**< File (or file path) does not exist */
304#define EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED 4 /**< Allocation of resources failure prevented load */ 303 EVAS_LOAD_ERROR_PERMISSION_DENIED = 3, /**< Permission deinied to an existing file (or path) */
305#define EVAS_LOAD_ERROR_CORRUPT_FILE 5 /**< File corrupt (but was detected as a known format) */ 304 EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED = 4, /**< Allocation of resources failure prevented load */
306#define EVAS_LOAD_ERROR_UNKNOWN_FORMAT 6 /**< File is not a known format */ 305 EVAS_LOAD_ERROR_CORRUPT_FILE = 5, /**< File corrupt (but was detected as a known format) */
307 306 EVAS_LOAD_ERROR_UNKNOWN_FORMAT = 6 /**< File is not a known format */
308#define EVAS_ALLOC_ERROR_NONE 0 /**< No allocation error */ 307} Evas_Load_Error; /**< Load error you can get from loading of files - see evas_load_error_str() too */
309#define EVAS_ALLOC_ERROR_FATAL 1 /**< Allocation failed despite attempts to free up memory */ 308
310#define EVAS_ALLOC_ERROR_RECOVERED 2 /**< Allocation succeeded, but extra memory had to be found by freeing up speculative resources */ 309typedef enum _Evas_Alloc_Error
311 310{
312#define EVAS_TEXT_INVALID -1 311 EVAS_ALLOC_ERROR_NONE = 0, /**< No allocation error */
313#define EVAS_TEXT_SPECIAL -2 312 EVAS_ALLOC_ERROR_FATAL = 1, /**< Allocation failed despite attempts to free up memory */
313 EVAS_ALLOC_ERROR_RECOVERED = 2 /**< Allocation succeeded, but extra memory had to be found by freeing up speculative resources */
314} Evas_Alloc_Error; /**< Possible allocation errors returned by evas_alloc_error() */
315
316typedef enum _Evas_Fill_Spread
317{
318 EVAS_TEXTURE_REFLECT = 0, /**< image fill tiling mode - tiling reflects */
319 EVAS_TEXTURE_REPEAT = 1, /**< tiling repeats */
320 EVAS_TEXTURE_RESTRICT = 2, /**< tiling clamps - range offset ignored */
321 EVAS_TEXTURE_RESTRICT_REFLECT = 3, /**< tiling clamps and any range offset reflects */
322 EVAS_TEXTURE_RESTRICT_REPEAT = 4, /**< tiling clamps and any range offset repeats */
323 EVAS_TEXTURE_PAD = 5 /**< tiling extends with end values */
324} Evas_Fill_Spread; /**< Fill types used for evas_object_image_fill_spread_set() */
325
326typedef enum _Evas_Pixel_Import_Pixel_Format
327{
328 EVAS_PIXEL_FORMAT_NONE = 0, /**< No pixel format */
329 EVAS_PIXEL_FORMAT_ARGB32 = 1, /**< ARGB 32bit pixel format with A in the high byte per 32bit pixel word */
330 EVAS_PIXEL_FORMAT_YUV420P_601 = 2 /**< YUV 420 Planar format with CCIR 601 color encoding wuth contiguous planes in the order Y, U and V */
331} Evas_Pixel_Import_Pixel_Format; /**< Pixel format for import call. See evas_object_image_pixels_import() */
314 332
315struct _Evas_Pixel_Import_Source 333struct _Evas_Pixel_Import_Source
316{ 334{
317 int format; /**< pixel format type ie ARGB32, YUV420P_601 etc. */ 335 Evas_Pixel_Import_Pixel_Format format; /**< pixel format type ie ARGB32, YUV420P_601 etc. */
318 int w, h; /**< width and height of source in pixels */ 336 int w, h; /**< width and height of source in pixels */
319 void **rows; /**< an array of pointers (size depends on format) pointing to left edge of each scanline */ 337 void **rows; /**< an array of pointers (size depends on format) pointing to left edge of each scanline */
320}; 338};
@@ -335,19 +353,10 @@ struct _Evas_Native_Surface
335#define EVAS_LAYER_MIN -32768 /**< bottom-most layer number */ 353#define EVAS_LAYER_MIN -32768 /**< bottom-most layer number */
336#define EVAS_LAYER_MAX 32767 /**< top-most layer number */ 354#define EVAS_LAYER_MAX 32767 /**< top-most layer number */
337 355
338#define EVAS_PIXEL_FORMAT_NONE 0 /**< No pixel format */ 356#define EVAS_COLOR_SPACE_ARGB 0 /**< Not used for anything */
339#define EVAS_PIXEL_FORMAT_ARGB32 1 /**< ARGB 32bit pixel format with A in the high byte per 32bit pixel word */ 357#define EVAS_COLOR_SPACE_AHSV 1 /**< Not used for anything */
340#define EVAS_PIXEL_FORMAT_YUV420P_601 2 /**< YUV 420 Planar format with CCIR 601 color encoding wuth contiguous planes in the order Y, U and V */ 358#define EVAS_TEXT_INVALID -1 /**< Not used for anything */
341 359#define EVAS_TEXT_SPECIAL -2 /**< Not used for anything */
342#define EVAS_COLOR_SPACE_ARGB 0 /**< ARGB color space */
343#define EVAS_COLOR_SPACE_AHSV 1 /**< AHSV color space */
344
345#define EVAS_TEXTURE_REFLECT 0 /**< image fill tiling mode - tiling reflects */
346#define EVAS_TEXTURE_REPEAT 1 /**< tiling repeats */
347#define EVAS_TEXTURE_RESTRICT 2 /**< tiling clamps - range offset ignored */
348#define EVAS_TEXTURE_RESTRICT_REFLECT 3 /**< tiling clamps and any range offset reflects */
349#define EVAS_TEXTURE_RESTRICT_REPEAT 4 /**< tiling clamps and any range offset repeats */
350#define EVAS_TEXTURE_PAD 5 /**< tiling extends with end values */
351 360
352#define EVAS_HINT_EXPAND 1.0 /**< Use with evas_object_size_hint_weight_set(), evas_object_size_hint_weight_get(), evas_object_size_hint_expand_set(), evas_object_size_hint_expand_get() */ 361#define EVAS_HINT_EXPAND 1.0 /**< Use with evas_object_size_hint_weight_set(), evas_object_size_hint_weight_get(), evas_object_size_hint_expand_set(), evas_object_size_hint_expand_get() */
353#define EVAS_HINT_FILL -1.0 /**< Use with evas_object_size_hint_align_set(), evas_object_size_hint_align_get(), evas_object_size_hint_fill_set(), evas_object_size_hint_fill_get() */ 362#define EVAS_HINT_FILL -1.0 /**< Use with evas_object_size_hint_align_set(), evas_object_size_hint_align_get(), evas_object_size_hint_fill_set(), evas_object_size_hint_fill_get() */
@@ -628,7 +637,7 @@ typedef void (*Evas_Async_Events_Put_Cb)(void *target, Evas_Callback_Type t
628 EAPI int evas_init (void); 637 EAPI int evas_init (void);
629 EAPI int evas_shutdown (void); 638 EAPI int evas_shutdown (void);
630 639
631 EAPI int evas_alloc_error (void); 640 EAPI Evas_Alloc_Error evas_alloc_error (void);
632 641
633 EAPI int evas_async_events_fd_get (void) EINA_WARN_UNUSED_RESULT EINA_PURE; 642 EAPI int evas_async_events_fd_get (void) EINA_WARN_UNUSED_RESULT EINA_PURE;
634 EAPI int evas_async_events_process (void); 643 EAPI int evas_async_events_process (void);
@@ -745,7 +754,6 @@ typedef void (*Evas_Async_Events_Put_Cb)(void *target, Evas_Callback_Type t
745 EAPI Eina_Bool evas_pointer_inside_get (const Evas *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1); 754 EAPI Eina_Bool evas_pointer_inside_get (const Evas *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
746 EAPI void evas_sync(Evas *e) EINA_ARG_NONNULL(1); 755 EAPI void evas_sync(Evas *e) EINA_ARG_NONNULL(1);
747 756
748
749/** 757/**
750 * @defgroup Evas_Event_Freezing_Group Event Freezing Functions 758 * @defgroup Evas_Event_Freezing_Group Event Freezing Functions
751 * 759 *
@@ -812,7 +820,6 @@ typedef void (*Evas_Async_Events_Put_Cb)(void *target, Evas_Callback_Type t
812 EAPI void evas_image_cache_set (Evas *e, int size) EINA_ARG_NONNULL(1); 820 EAPI void evas_image_cache_set (Evas *e, int size) EINA_ARG_NONNULL(1);
813 EAPI int evas_image_cache_get (const Evas *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE; 821 EAPI int evas_image_cache_get (const Evas *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE;
814 822
815
816/** 823/**
817 * @defgroup Evas_Font_Group Font Functions 824 * @defgroup Evas_Font_Group Font Functions
818 * 825 *
@@ -894,7 +901,6 @@ typedef void (*Evas_Async_Events_Put_Cb)(void *target, Evas_Callback_Type t
894 EAPI Evas_Object *evas_object_above_get (const Evas_Object *obj) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE; 901 EAPI Evas_Object *evas_object_above_get (const Evas_Object *obj) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE;
895 EAPI Evas_Object *evas_object_below_get (const Evas_Object *obj) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE; 902 EAPI Evas_Object *evas_object_below_get (const Evas_Object *obj) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE;
896 903
897
898/** 904/**
899 * @defgroup Evas_Object_Group_Events Object Events 905 * @defgroup Evas_Object_Group_Events Object Events
900 * 906 *
@@ -1222,12 +1228,12 @@ typedef void (*Evas_Object_Image_Pixels_Get_Cb) (void *data, Evas_Object *o);
1222 EAPI double evas_object_image_border_scale_get (const Evas_Object *obj); 1228 EAPI double evas_object_image_border_scale_get (const Evas_Object *obj);
1223 EAPI void evas_object_image_fill_set (Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h) EINA_ARG_NONNULL(1); 1229 EAPI void evas_object_image_fill_set (Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h) EINA_ARG_NONNULL(1);
1224 EAPI void evas_object_image_fill_get (const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) EINA_ARG_NONNULL(1); 1230 EAPI void evas_object_image_fill_get (const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) EINA_ARG_NONNULL(1);
1225 EAPI void evas_object_image_fill_spread_set (Evas_Object *obj, int tile_mode) EINA_ARG_NONNULL(1); 1231 EAPI void evas_object_image_fill_spread_set (Evas_Object *obj, Evas_Fill_Spread spread) EINA_ARG_NONNULL(1);
1226 EAPI int evas_object_image_fill_spread_get (const Evas_Object *obj) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE; 1232 EAPI Evas_Fill_Spread evas_object_image_fill_spread_get (const Evas_Object *obj) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE;
1227 EAPI void evas_object_image_size_set (Evas_Object *obj, int w, int h) EINA_ARG_NONNULL(1); 1233 EAPI void evas_object_image_size_set (Evas_Object *obj, int w, int h) EINA_ARG_NONNULL(1);
1228 EAPI void evas_object_image_size_get (const Evas_Object *obj, int *w, int *h) EINA_ARG_NONNULL(1); 1234 EAPI void evas_object_image_size_get (const Evas_Object *obj, int *w, int *h) EINA_ARG_NONNULL(1);
1229 EAPI int evas_object_image_stride_get (const Evas_Object *obj) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE; 1235 EAPI int evas_object_image_stride_get (const Evas_Object *obj) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE;
1230 EAPI int evas_object_image_load_error_get (const Evas_Object *obj) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE; 1236 EAPI Evas_Load_Error evas_object_image_load_error_get (const Evas_Object *obj) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE;
1231 EAPI void evas_object_image_data_set (Evas_Object *obj, void *data) EINA_ARG_NONNULL(1); 1237 EAPI void evas_object_image_data_set (Evas_Object *obj, void *data) EINA_ARG_NONNULL(1);
1232 EAPI void *evas_object_image_data_convert (Evas_Object *obj, Evas_Colorspace to_cspace) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE; 1238 EAPI void *evas_object_image_data_convert (Evas_Object *obj, Evas_Colorspace to_cspace) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE;
1233 EAPI void *evas_object_image_data_get (const Evas_Object *obj, Eina_Bool for_writing) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE; 1239 EAPI void *evas_object_image_data_get (const Evas_Object *obj, Eina_Bool for_writing) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE;
@@ -1313,7 +1319,6 @@ typedef void (*Evas_Object_Image_Pixels_Get_Cb) (void *data, Evas_Object *o);
1313 EAPI void evas_object_text_outline_color_get(const Evas_Object *obj, int *r, int *g, int *b, int *a) EINA_ARG_NONNULL(1); 1319 EAPI void evas_object_text_outline_color_get(const Evas_Object *obj, int *r, int *g, int *b, int *a) EINA_ARG_NONNULL(1);
1314 EAPI void evas_object_text_style_pad_get (const Evas_Object *obj, int *l, int *r, int *t, int *b) EINA_ARG_NONNULL(1); 1320 EAPI void evas_object_text_style_pad_get (const Evas_Object *obj, int *l, int *r, int *t, int *b) EINA_ARG_NONNULL(1);
1315 1321
1316
1317/** 1322/**
1318 * @defgroup Evas_Object_Textblock Textblock Object Functions 1323 * @defgroup Evas_Object_Textblock Textblock Object Functions
1319 * 1324 *
@@ -1793,7 +1798,6 @@ struct _Evas_Smart_Cb_Description
1793 1798
1794 EAPI void evas_smart_objects_calculate (Evas *e); 1799 EAPI void evas_smart_objects_calculate (Evas *e);
1795 1800
1796
1797/** 1801/**
1798 * @defgroup Evas_Smart_Object_Clipped Clipped Smart Object 1802 * @defgroup Evas_Smart_Object_Clipped Clipped Smart Object
1799 * 1803 *
@@ -2036,7 +2040,6 @@ struct _Evas_Smart_Cb_Description
2036 EAPI Eina_Bool evas_object_box_option_property_get(Evas_Object *o, Evas_Object_Box_Option *opt, int property, ...) EINA_ARG_NONNULL(1, 2); 2040 EAPI Eina_Bool evas_object_box_option_property_get(Evas_Object *o, Evas_Object_Box_Option *opt, int property, ...) EINA_ARG_NONNULL(1, 2);
2037 EAPI Eina_Bool evas_object_box_option_property_vget(Evas_Object *o, Evas_Object_Box_Option *opt, int property, va_list args) EINA_ARG_NONNULL(1, 2); 2041 EAPI Eina_Bool evas_object_box_option_property_vget(Evas_Object *o, Evas_Object_Box_Option *opt, int property, va_list args) EINA_ARG_NONNULL(1, 2);
2038 2042
2039
2040/** 2043/**
2041 * @defgroup Evas_Object_Table Table Smart Object. 2044 * @defgroup Evas_Object_Table Table Smart Object.
2042 * 2045 *
@@ -2067,7 +2070,6 @@ struct _Evas_Smart_Cb_Description
2067 EAPI Eina_List *evas_object_table_children_get(const Evas_Object *o) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC; 2070 EAPI Eina_List *evas_object_table_children_get(const Evas_Object *o) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC;
2068 EAPI Evas_Object *evas_object_table_child_get(const Evas_Object *o, unsigned short col, unsigned short row) EINA_ARG_NONNULL(1); 2071 EAPI Evas_Object *evas_object_table_child_get(const Evas_Object *o, unsigned short col, unsigned short row) EINA_ARG_NONNULL(1);
2069 2072
2070
2071/** 2073/**
2072 * @defgroup Evas_Cserve Shared Image Cache Server 2074 * @defgroup Evas_Cserve Shared Image Cache Server
2073 * 2075 *
@@ -2148,7 +2150,6 @@ struct _Evas_Smart_Cb_Description
2148 EAPI Eina_Bool evas_cserve_config_set (const Evas_Cserve_Config *config) EINA_WARN_UNUSED_RESULT EINA_PURE; 2150 EAPI Eina_Bool evas_cserve_config_set (const Evas_Cserve_Config *config) EINA_WARN_UNUSED_RESULT EINA_PURE;
2149 EAPI void evas_cserve_disconnect (void); 2151 EAPI void evas_cserve_disconnect (void);
2150 2152
2151
2152/** 2153/**
2153 * @defgroup Evas_Utils General Utilities 2154 * @defgroup Evas_Utils General Utilities
2154 * 2155 *
@@ -2201,7 +2202,6 @@ struct _Evas_Smart_Cb_Description
2201 EAPI Eina_Bool evas_object_key_grab (Evas_Object *obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers, Eina_Bool exclusive) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1, 2); 2202 EAPI Eina_Bool evas_object_key_grab (Evas_Object *obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers, Eina_Bool exclusive) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1, 2);
2202 EAPI void evas_object_key_ungrab (Evas_Object *obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers) EINA_ARG_NONNULL(1, 2); 2203 EAPI void evas_object_key_ungrab (Evas_Object *obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers) EINA_ARG_NONNULL(1, 2);
2203 2204
2204
2205#ifdef __cplusplus 2205#ifdef __cplusplus
2206} 2206}
2207#endif 2207#endif
diff --git a/legacy/evas/src/lib/canvas/evas_object_image.c b/legacy/evas/src/lib/canvas/evas_object_image.c
index ed377d3100..66026e5188 100644
--- a/legacy/evas/src/lib/canvas/evas_object_image.c
+++ b/legacy/evas/src/lib/canvas/evas_object_image.c
@@ -641,7 +641,7 @@ evas_object_image_fill_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y,
641 * EVAS_TEXTURE_RESTRICT, or EVAS_TEXTURE_PAD. 641 * EVAS_TEXTURE_RESTRICT, or EVAS_TEXTURE_PAD.
642 */ 642 */
643EAPI void 643EAPI void
644evas_object_image_fill_spread_set(Evas_Object *obj, int spread) 644evas_object_image_fill_spread_set(Evas_Object *obj, Evas_Fill_Spread spread)
645{ 645{
646 Evas_Object_Image *o; 646 Evas_Object_Image *o;
647 647
@@ -665,7 +665,7 @@ evas_object_image_fill_spread_set(Evas_Object *obj, int spread)
665 * @param obj The given evas image object. 665 * @param obj The given evas image object.
666 * @return The current spread mode of the image object. 666 * @return The current spread mode of the image object.
667 */ 667 */
668EAPI int 668EAPI Evas_Fill_Spread
669evas_object_image_fill_spread_get(const Evas_Object *obj) 669evas_object_image_fill_spread_get(const Evas_Object *obj)
670{ 670{
671 Evas_Object_Image *o; 671 Evas_Object_Image *o;
@@ -817,7 +817,7 @@ evas_object_image_stride_get(const Evas_Object *obj)
817 * the @c EVAS_LOAD_ERROR_* values. @c EVAS_LOAD_ERROR_NONE is 817 * the @c EVAS_LOAD_ERROR_* values. @c EVAS_LOAD_ERROR_NONE is
818 * returned if there was no error. 818 * returned if there was no error.
819 */ 819 */
820EAPI int 820EAPI Evas_Load_Error
821evas_object_image_load_error_get(const Evas_Object *obj) 821evas_object_image_load_error_get(const Evas_Object *obj)
822{ 822{
823 Evas_Object_Image *o; 823 Evas_Object_Image *o;
diff --git a/legacy/evas/src/lib/main.c b/legacy/evas/src/lib/main.c
index 9f973838c4..f73d39726e 100644
--- a/legacy/evas/src/lib/main.c
+++ b/legacy/evas/src/lib/main.c
@@ -60,7 +60,7 @@ static int _evas_debug_abort = 0;
60 * 60 *
61 * @ingroup Evas_Group 61 * @ingroup Evas_Group
62 */ 62 */
63EAPI int 63EAPI Evas_Alloc_Error
64evas_alloc_error(void) 64evas_alloc_error(void)
65{ 65{
66 return _evas_alloc_error; 66 return _evas_alloc_error;