Enlightenment CVS committal
Author : sebastid
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_cache.c edje_data.c edje_load.c edje_main.c
edje_message_queue.c edje_program.c edje_smart.c edje_text.c
edje_util.c
Log Message:
Fix EAPI warnings.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_cache.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- edje_cache.c 30 Nov 2005 09:56:14 -0000 1.4
+++ edje_cache.c 7 Jan 2006 08:54:30 -0000 1.5
@@ -268,7 +268,7 @@
-void
+EAPI void
edje_file_cache_set(int count)
{
if (count < 0) count = 0;
@@ -276,13 +276,13 @@
_edje_cache_file_clean();
}
-int
+EAPI int
edje_file_cache_get(void)
{
return _edje_file_cache_size;
}
-void
+EAPI void
edje_file_cache_flush(void)
{
int ps;
@@ -293,7 +293,7 @@
_edje_file_cache_size = ps;
}
-void
+EAPI void
edje_collection_cache_set(int count)
{
Evas_List *l;
@@ -310,13 +310,13 @@
/* FIXME: freach in file hash too! */
}
-int
+EAPI int
edje_collection_cache_get(void)
{
return _edje_collection_cache_size;
}
-void
+EAPI void
edje_collection_cache_flush(void)
{
int ps;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_data.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- edje_data.c 30 Nov 2005 15:36:34 -0000 1.27
+++ edje_data.c 7 Jan 2006 08:54:30 -0000 1.28
@@ -1,23 +1,23 @@
#include "Edje.h"
#include "edje_private.h"
-Eet_Data_Descriptor *_edje_edd_edje_file = NULL;
-Eet_Data_Descriptor *_edje_edd_edje_style = NULL;
-Eet_Data_Descriptor *_edje_edd_edje_style_tag = NULL;
-Eet_Data_Descriptor *_edje_edd_edje_data = NULL;
-Eet_Data_Descriptor *_edje_edd_edje_font_directory = NULL;
-Eet_Data_Descriptor *_edje_edd_edje_font_directory_entry = NULL;
-Eet_Data_Descriptor *_edje_edd_edje_image_directory = NULL;
-Eet_Data_Descriptor *_edje_edd_edje_image_directory_entry = NULL;
-Eet_Data_Descriptor *_edje_edd_edje_program = NULL;
-Eet_Data_Descriptor *_edje_edd_edje_program_target = NULL;
-Eet_Data_Descriptor *_edje_edd_edje_program_after = NULL;
-Eet_Data_Descriptor *_edje_edd_edje_part_collection_directory = NULL;
-Eet_Data_Descriptor *_edje_edd_edje_part_collection_directory_entry = NULL;
-Eet_Data_Descriptor *_edje_edd_edje_part_collection = NULL;
-Eet_Data_Descriptor *_edje_edd_edje_part = NULL;
-Eet_Data_Descriptor *_edje_edd_edje_part_description = NULL;
-Eet_Data_Descriptor *_edje_edd_edje_part_image_id = NULL;
+EAPI Eet_Data_Descriptor *_edje_edd_edje_file = NULL;
+EAPI Eet_Data_Descriptor *_edje_edd_edje_style = NULL;
+EAPI Eet_Data_Descriptor *_edje_edd_edje_style_tag = NULL;
+EAPI Eet_Data_Descriptor *_edje_edd_edje_data = NULL;
+EAPI Eet_Data_Descriptor *_edje_edd_edje_font_directory = NULL;
+EAPI Eet_Data_Descriptor *_edje_edd_edje_font_directory_entry = NULL;
+EAPI Eet_Data_Descriptor *_edje_edd_edje_image_directory = NULL;
+EAPI Eet_Data_Descriptor *_edje_edd_edje_image_directory_entry = NULL;
+EAPI Eet_Data_Descriptor *_edje_edd_edje_program = NULL;
+EAPI Eet_Data_Descriptor *_edje_edd_edje_program_target = NULL;
+EAPI Eet_Data_Descriptor *_edje_edd_edje_program_after = NULL;
+EAPI Eet_Data_Descriptor *_edje_edd_edje_part_collection_directory = NULL;
+EAPI Eet_Data_Descriptor *_edje_edd_edje_part_collection_directory_entry =
NULL;
+EAPI Eet_Data_Descriptor *_edje_edd_edje_part_collection = NULL;
+EAPI Eet_Data_Descriptor *_edje_edd_edje_part = NULL;
+EAPI Eet_Data_Descriptor *_edje_edd_edje_part_description = NULL;
+EAPI Eet_Data_Descriptor *_edje_edd_edje_part_image_id = NULL;
#define NEWD(str, typ) \
{ eddc.name = str; eddc.size = sizeof(typ); }
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_load.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -3 -r1.80 -r1.81
--- edje_load.c 30 Nov 2005 15:36:34 -0000 1.80
+++ edje_load.c 7 Jan 2006 08:54:30 -0000 1.81
@@ -23,7 +23,7 @@
*
* This loads the EET file and sets up the Edje.
*/
-int
+EAPI int
edje_object_file_set(Evas_Object *obj, const char *file, const char *part)
{
Edje *ed;
@@ -336,7 +336,7 @@
*
* This gets the EET file location and group for the given Evas_Object.
*/
-void
+EAPI void
edje_object_file_get(Evas_Object *obj, const char **file, const char **part)
{
Edje *ed;
@@ -366,7 +366,7 @@
* 6: Unknown Format\n
* 7: Incompatible File
*/
-int
+EAPI int
edje_object_load_error_get(Evas_Object *obj)
{
Edje *ed;
@@ -382,7 +382,7 @@
*
* @return The Evas_List of files
*/
-Evas_List *
+EAPI Evas_List *
edje_file_collection_list(const char *file)
{
Evas_List *lst = NULL;
@@ -416,7 +416,7 @@
*
* Frees the file collection.
*/
-void
+EAPI void
edje_file_collection_list_free(Evas_List *lst)
{
while (lst)
@@ -432,7 +432,7 @@
* @param key The data key
* @return The file data string
*/
-char *
+EAPI char *
edje_file_data_get(const char *file, const char *key)
{
Edje_File *edf;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_main.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- edje_main.c 30 Nov 2005 15:36:34 -0000 1.47
+++ edje_main.c 7 Jan 2006 08:54:30 -0000 1.48
@@ -2,9 +2,10 @@
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
+#include <time.h>
+
#include "Edje.h"
#include "edje_private.h"
-#include <time.h>
static int initted = 0;
@@ -14,7 +15,7 @@
*
* @return The new init count.
*/
-int
+EAPI int
edje_init(void)
{
initted++;
@@ -33,7 +34,7 @@
*
* @return The new init count.
*/
-int
+EAPI int
edje_shutdown(void)
{
initted--;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_message_queue.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- edje_message_queue.c 30 Nov 2005 15:36:34 -0000 1.21
+++ edje_message_queue.c 7 Jan 2006 08:54:30 -0000 1.22
@@ -8,7 +8,7 @@
static Evas_List *msgq = NULL;
static Evas_List *tmp_msgq = NULL;
-void
+EAPI void
edje_object_message_send(Evas_Object *obj, Edje_Message_Type type, int id,
void *msg)
{
Edje *ed;
@@ -18,7 +18,7 @@
_edje_message_send(ed, EDJE_QUEUE_SCRIPT, type, id, msg);
}
-void
+EAPI void
edje_object_message_handler_set(Evas_Object *obj, void (*func) (void *data,
Evas_Object *obj, Edje_Message_Type type, int id, void *msg), void *data)
{
Edje *ed;
@@ -28,7 +28,7 @@
_edje_message_cb_set(ed, func, data);
}
-void
+EAPI void
edje_object_message_signal_process(Evas_Object *obj)
{
Evas_List *l, *tmpq = NULL;
@@ -74,7 +74,7 @@
}
}
-void
+EAPI void
edje_message_signal_process(void)
{
_edje_message_queue_process();
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_program.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- edje_program.c 30 Nov 2005 15:36:34 -0000 1.48
+++ edje_program.c 7 Jan 2006 08:54:30 -0000 1.49
@@ -15,7 +15,7 @@
*
* Sets the frametime in seconds, by default this is 1/30.
*/
-void
+EAPI void
edje_frametime_set(double t)
{
ecore_animator_frametime_set(t);
@@ -27,7 +27,7 @@
*
* Returns the frametime in seconds, by default this is 1/30.
*/
-double
+EAPI double
edje_frametime_get(void)
{
return ecore_animator_frametime_get();
@@ -43,7 +43,7 @@
*
* Creates a callback for the object to execute the given function.
*/
-void
+EAPI void
edje_object_signal_callback_add(Evas_Object *obj, const char *emission, const
char *source, void (*func) (void *data, Evas_Object *o, const char *emission,
const char *source), void *data)
{
Edje *ed;
@@ -77,7 +77,7 @@
*
* Deletes an existing callback
*/
-void *
+EAPI void *
edje_object_signal_callback_del(Evas_Object *obj, const char *emission, const
char *source, void (*func) (void *data, Evas_Object *o, const char *emission,
const char *source))
{
Edje *ed;
@@ -126,7 +126,7 @@
* This sends a signal to the edje. These are defined in the programs
* section of an edc.
*/
-void
+EAPI void
edje_object_signal_emit(Evas_Object *obj, const char *emission, const char
*source)
{
Edje *ed;
@@ -146,7 +146,7 @@
* This sets the Edje to play or pause depending on the parameter.
* This has no effect if the Edje is already in that state.
*/
-void
+EAPI void
edje_object_play_set(Evas_Object *obj, int play)
{
Edje *ed;
@@ -183,7 +183,7 @@
* @return 0 if Edje not connected, Edje delete_me, or Edje paused\n
* 1 if Edje set to play
*/
-int
+EAPI int
edje_object_play_get(Evas_Object *obj)
{
Edje *ed;
@@ -202,7 +202,7 @@
*
* Stop or start an Edje animation.
*/
-void
+EAPI void
edje_object_animation_set(Evas_Object *obj, int on)
{
Edje *ed;
@@ -254,7 +254,7 @@
* @return 0 on Error or if not animated\n
* 1 if animated
*/
-int
+EAPI int
edje_object_animation_get(Evas_Object *obj)
{
Edje *ed;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_smart.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- edje_smart.c 23 Nov 2005 14:00:39 -0000 1.26
+++ edje_smart.c 7 Jan 2006 08:54:30 -0000 1.27
@@ -24,7 +24,7 @@
*
* Creates the Edje smart object, returning the Evas_Object handle.
*/
-Evas_Object *
+EAPI Evas_Object *
edje_object_add(Evas *evas)
{
if (!_edje_smart)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_text.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- edje_text.c 30 Nov 2005 15:36:34 -0000 1.48
+++ edje_text.c 7 Jan 2006 08:54:30 -0000 1.49
@@ -18,7 +18,6 @@
void
_edje_text_part_on_add(Edje *ed, Edje_Real_Part *ep)
{
- int i;
Evas_List *tmp;
Edje_Part *pt = ep->part;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_util.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -3 -r1.70 -r1.71
--- edje_util.c 5 Dec 2005 10:08:30 -0000 1.70
+++ edje_util.c 7 Jan 2006 08:54:30 -0000 1.71
@@ -19,7 +19,7 @@
/* FIXDOC: Expand */
/** Freeze all objects in the Edje.
*/
-void
+EAPI void
edje_freeze(void)
{
Evas_List *l;
@@ -31,7 +31,7 @@
/* FIXDOC: Expand */
/** Thaw all objects in Edje.
*/
-void
+EAPI void
edje_thaw(void)
{
Evas_List *l;
@@ -41,7 +41,7 @@
}
/* FIXDOC: Expand */
-void
+EAPI void
edje_fontset_append_set(char *fonts)
{
if (_edje_fontset_append)
@@ -50,7 +50,7 @@
}
/* FIXDOC: Expand */
-const char *
+EAPI const char *
edje_fontset_append_get(void)
{
return _edje_fontset_append;
@@ -63,7 +63,7 @@
* @param key The data key
* @return The data string
*/
-const char *
+EAPI const char *
edje_object_data_get(Evas_Object *obj, const char *key)
{
Edje *ed;
@@ -93,7 +93,7 @@
* This puts all changes on hold. Successive freezes will nest,
* requiring an equal number of thaws.
*/
-int
+EAPI int
edje_object_freeze(Evas_Object *obj)
{
Edje *ed;
@@ -110,7 +110,7 @@
*
* This allows frozen changes to occur.
*/
-int
+EAPI int
edje_object_thaw(Evas_Object *obj)
{
Edje *ed;
@@ -137,7 +137,7 @@
*
* Sets the color class for the Edje.
*/
-void
+EAPI void
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)
{
Evas_List *members;
@@ -225,7 +225,7 @@
* Applies the color class to the object, where the first color is the
* object, the second is the outline, and the third is the shadow.
*/
-void
+EAPI void
edje_object_color_class_set(Evas_Object *obj, 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)
{
Edje *ed;
@@ -303,7 +303,7 @@
*
* This sets the Edje text class ?!
*/
-void
+EAPI void
edje_text_class_set(const char *text_class, const char *font, Evas_Font_Size
size)
{
Evas_List *members;
@@ -371,7 +371,7 @@
*
* Sets the text class for the Edje.
*/
-void
+EAPI void
edje_object_text_class_set(Evas_Object *obj, const char *text_class, const
char *font, Evas_Font_Size size)
{
Edje *ed;
@@ -426,7 +426,7 @@
* @return 0 on Error\n
* 1 if Edje part exists
*/
-int
+EAPI int
edje_object_part_exists(Evas_Object *obj, const char *part)
{
Edje *ed;
@@ -449,7 +449,7 @@
*
* Gets the Edje part geometry
*/
-void
+EAPI void
edje_object_part_geometry_get(Evas_Object *obj, const char *part, Evas_Coord
*x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h )
{
Edje *ed;
@@ -480,7 +480,7 @@
}
/* FIXDOC: New Function */
-void
+EAPI void
edje_object_text_change_cb_set(Evas_Object *obj, void (*func) (void *data,
Evas_Object *obj, const char *part), void *data)
{
Edje *ed;
@@ -496,7 +496,7 @@
* @param part The part name
* @param text The text string
*/
-void
+EAPI void
edje_object_part_text_set(Evas_Object *obj, const char *part, const char *text)
{
Edje *ed;
@@ -526,7 +526,7 @@
* @param part The part name
* @return The text string
*/
-const char *
+EAPI const char *
edje_object_part_text_get(Evas_Object *obj, const char *part)
{
Edje *ed;
@@ -550,7 +550,7 @@
* for the part affect the swallowed object. (e.g. resize, move, show,
* raise/lower, etc.).
*/
-void
+EAPI void
edje_object_part_swallow(Evas_Object *obj, const char *part, Evas_Object
*obj_swallow)
{
Edje *ed;
@@ -632,7 +632,7 @@
*
* This sets the minimum size restriction for the object.
*/
-void
+EAPI void
edje_extern_object_min_size_set(Evas_Object *obj, Evas_Coord minw, Evas_Coord
minh)
{
int mw, mh;
@@ -658,7 +658,7 @@
*
* This sets the maximum size restriction for the object.
*/
-void
+EAPI void
edje_extern_object_max_size_set(Evas_Object *obj, Evas_Coord maxw, Evas_Coord
maxh)
{
int mw, mh;
@@ -681,7 +681,7 @@
*
* Causes the edje to regurgitate a previously swallowed object. :)
*/
-void
+EAPI void
edje_object_part_unswallow(Evas_Object *obj, Evas_Object *obj_swallow)
{
Edje *ed;
@@ -718,7 +718,7 @@
* @param part The part name
* @return The swallowed object
*/
-Evas_Object *
+EAPI Evas_Object *
edje_object_part_swallow_get(Evas_Object *obj, const char *part)
{
Edje *ed;
@@ -739,7 +739,7 @@
* Gets the object's minimum size values from the Edje. These are set
* to zero if no Edje is connected to the Evas Object.
*/
-void
+EAPI void
edje_object_size_min_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh)
{
Edje *ed;
@@ -763,7 +763,7 @@
* Gets the object's maximum size values from the Edje. These are set
* to zero if no Edje is connected to the Evas Object.
*/
-void
+EAPI void
edje_object_size_max_get(Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh)
{
Edje *ed;
@@ -799,7 +799,7 @@
* Forces the object @p obj to recalculation layout regardless of
* freeze/thaw.
*/
-void
+EAPI void
edje_object_calc_force(Evas_Object *obj)
{
Edje *ed;
@@ -821,7 +821,7 @@
*
* Calculates the object's minimum size ?!
*/
-void
+EAPI void
edje_object_size_min_calc(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh)
{
Edje *ed;
@@ -949,7 +949,7 @@
* "" for other states
*/
/* FIXME: Correctly return other states */
-const char *
+EAPI const char *
edje_object_part_state_get(Evas_Object *obj, const char *part, double *val_ret)
{
Edje *ed;
@@ -997,7 +997,7 @@
* 2: Dragable in Y direction\n
* 3: Dragable in X & Y directions
*/
-int
+EAPI int
edje_object_part_drag_dir_get(Evas_Object *obj, const char *part)
{
Edje *ed;
@@ -1027,7 +1027,7 @@
*
* Places the dragable object at the given location.
*/
-void
+EAPI void
edje_object_part_drag_value_set(Evas_Object *obj, const char *part, double dx,
double dy)
{
Edje *ed;
@@ -1066,7 +1066,7 @@
* Gets the drag location values.
*/
/* FIXME: Should this be x and y instead of dx/dy? */
-void
+EAPI void
edje_object_part_drag_value_get(Evas_Object *obj, const char *part, double
*dx, double *dy)
{
Edje *ed;
@@ -1103,7 +1103,7 @@
*
* Sets the size of the dragable object.
*/
-void
+EAPI void
edje_object_part_drag_size_set(Evas_Object *obj, const char *part, double dw,
double dh)
{
Edje *ed;
@@ -1138,7 +1138,7 @@
*
* Gets the dragable object size.
*/
-void
+EAPI void
edje_object_part_drag_size_get(Evas_Object *obj, const char *part, double *dw,
double *dh)
{
Edje *ed;
@@ -1170,7 +1170,7 @@
*
* Sets the x,y step increments for a dragable object.
*/
-void
+EAPI void
edje_object_part_drag_step_set(Evas_Object *obj, const char *part, double dx,
double dy)
{
Edje *ed;
@@ -1202,7 +1202,7 @@
*
* Gets the x and y step increments for the dragable object.
*/
-void
+EAPI void
edje_object_part_drag_step_get(Evas_Object *obj, const char *part, double *dx,
double *dy)
{
Edje *ed;
@@ -1234,7 +1234,7 @@
*
* Sets the x,y page step increment values.
*/
-void
+EAPI void
edje_object_part_drag_page_set(Evas_Object *obj, const char *part, double dx,
double dy)
{
Edje *ed;
@@ -1266,7 +1266,7 @@
*
* Gets the x,y page step increments for the dragable object.
*/
-void
+EAPI void
edje_object_part_drag_page_get(Evas_Object *obj, const char *part, double *dx,
double *dy)
{
Edje *ed;
@@ -1299,7 +1299,7 @@
* Steps x,y where the step increment is the amount set by
* edje_object_part_drag_step_set.
*/
-void
+EAPI void
edje_object_part_drag_step(Evas_Object *obj, const char *part, double dx,
double dy)
{
Edje *ed;
@@ -1337,7 +1337,7 @@
* Pages x,y where the increment is defined by
edje_object_part_drag_page_set.\n
* WARNING: Paging is bugged!
*/
-void
+EAPI void
edje_object_part_drag_page(Evas_Object *obj, const char *part, double dx,
double dy)
{
Edje *ed;
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
