Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/engrave
Dir : e17/libs/engrave/src/lib
Modified Files:
engrave_file.c engrave_file.h engrave_group.c engrave_group.h
engrave_image.c engrave_image.h engrave_out.c engrave_part.c
engrave_part.h engrave_part_state.c engrave_part_state.h
engrave_program.c engrave_program.h
Log Message:
- function name changes (_has_ -> _count)
- image_value_get -> image_compression_value_get
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_file.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- engrave_file.c 13 Nov 2004 20:50:20 -0000 1.8
+++ engrave_file.c 13 Nov 2004 21:06:56 -0000 1.9
@@ -106,59 +106,55 @@
}
/**
- * engrave_file_has_images - check if the file has images
+ * engrave_file_images_count - get the number of images
* @param ef: The Engrave_File to check for images
*
- * @return Returns 1 if the file contains images, 0 otherwise
+ * @return Returns the number of images, 0 otherwise
*/
int
-engrave_file_has_images(Engrave_File *ef)
+engrave_file_images_count(Engrave_File *ef)
{
if (!ef) return 0;
- if (evas_list_count(ef->images) > 0) return 1;
- return 0;
+ return evas_list_count(ef->images);
}
/**
- * engrave_file_has_data - check if the file has data
+ * engrave_file_data_count - count data blocks in file
* @param ef: The Engrave_File to check for data
*
- * @return Returns 1 if the file contains data, 0 otherwise
+ * @return Returns number of data blocks, 0 otherwise
*/
int
-engrave_file_has_data(Engrave_File *ef)
+engrave_file_data_count(Engrave_File *ef)
{
if (!ef) return 0;
- if (evas_list_count(ef->data) > 0) return 1;
- return 0;
+ return evas_list_count(ef->data);
}
/**
- * engrave_file_has_groups - check if the file has groups
+ * engrave_file_groups_count - count the groups in the file
* @param ef: The Engrave_File to check for groups
*
- * @return Returns 1 if the file contains groups, 0 otherwise
+ * @return Returns then number of groups, 0 otherwise
*/
int
-engrave_file_has_groups(Engrave_File *ef)
+engrave_file_groups_count(Engrave_File *ef)
{
if (!ef) return 0;
- if (evas_list_count(ef->groups) > 0) return 1;
- return 0;
+ return evas_list_count(ef->groups);
}
/**
- * engrave_file_has_fonts - check if the file has fonts
+ * engrave_file_fonts_count - count the fonts in the file
* @param ef: The Engrave_File to check for fonts
*
- * @return Returns 1 if the file contains fonts, 0 otherwise
+ * @return Returns the number of fonts in the file, 0 otherwise
*/
int
-engrave_file_has_fonts(Engrave_File *ef)
+engrave_file_fonts_count(Engrave_File *ef)
{
if (!ef) return 0;
- if (evas_list_count(ef->fonts) > 0) return 1;
- return 0;
+ return evas_list_count(ef->fonts);
}
/**
@@ -176,7 +172,7 @@
{
Evas_List *l;
- if (!engrave_file_has_images(ef)) return;
+ if (!engrave_file_images_count(ef)) return;
for (l = ef->images; l; l = l->next) {
Engrave_Image *image = l->data;
if (image) func(image, data);
@@ -198,7 +194,7 @@
{
Evas_List *l;
- if (!engrave_file_has_data(ef)) return;
+ if (!engrave_file_data_count(ef)) return;
for (l = ef->data; l; l = l->next) {
Engrave_Data *data = l->data;
if (data) func(data, udata);
@@ -220,7 +216,7 @@
{
Evas_List *l;
- if (!engrave_file_has_groups(ef)) return;
+ if (!engrave_file_groups_count(ef)) return;
for (l = ef->groups; l; l = l->next) {
Engrave_Group *group = l->data;
if (group) func(group, data);
@@ -242,7 +238,7 @@
{
Evas_List *l;
- if (!engrave_file_has_fonts(ef)) return;
+ if (!engrave_file_fonts_count(ef)) return;
for (l = ef->fonts; l; l = l->next) {
Engrave_Font *font = l->data;
if (font) func(font, data);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_file.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- engrave_file.h 12 Nov 2004 20:08:56 -0000 1.5
+++ engrave_file.h 13 Nov 2004 21:06:56 -0000 1.6
@@ -39,10 +39,10 @@
Engrave_Image *engrave_file_image_by_name_find(Engrave_File *ef,
char *name);
-int engrave_file_has_images(Engrave_File *ef);
-int engrave_file_has_data(Engrave_File *ef);
-int engrave_file_has_groups(Engrave_File *ef);
-int engrave_file_has_fonts(Engrave_File *ef);
+int engrave_file_images_count(Engrave_File *ef);
+int engrave_file_data_count(Engrave_File *ef);
+int engrave_file_groups_count(Engrave_File *ef);
+int engrave_file_fonts_count(Engrave_File *ef);
void engrave_file_image_foreach(Engrave_File *ef,
void (*func)(Engrave_Image *, void *),
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_group.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- engrave_group.c 13 Nov 2004 20:50:20 -0000 1.7
+++ engrave_group.c 13 Nov 2004 21:06:56 -0000 1.8
@@ -152,45 +152,42 @@
}
/**
- * engrave_group_has_data - check if this group has a data block
+ * engrave_group_data_count - count the data blocks in the group
* @param eg: The Engrave_Group to check if there is data
*
- * @return Returns 1 if data exists, 0 otherwise.
+ * @return Returns number of data blocks, 0 otherwise.
*/
int
-engrave_group_has_data(Engrave_Group *eg)
+engrave_group_data_count(Engrave_Group *eg)
{
if (!eg) return 0;
- if (evas_list_count(eg->data) > 0) return 1;
- return 0;
+ return evas_list_count(eg->data);
}
/**
- * engrave_group_has_parts - check if this group has part blocks
+ * engrave_group_parts_count - returns the number of parts in the group
* @param eg: The Engrave_Group to check if there are parts
*
- * @return Returns 1 if parts exist, 0 otherwise.
+ * @return Returns the number of parts, 0 otherwise.
*/
int
-engrave_group_has_parts(Engrave_Group *eg)
+engrave_group_parts_count(Engrave_Group *eg)
{
if (!eg) return 0;
- if (evas_list_count(eg->parts) > 0) return 1;
- return 0;
+ return evas_list_count(eg->parts);
}
/**
- * engrave_group_has_programs - check if this group has program blocks
+ * engrave_group_programs_count - get number of programs in the group
* @param eg: The Engrave_Group to check if there are programs
*
- * @return Returns 1 if programs exist, 0 otherwise.
+ * @return Returns number of programs, 0 otherwise.
*/
int
-engrave_group_has_programs(Engrave_Group *eg)
+engrave_group_programs_count(Engrave_Group *eg)
{
if (!eg) return 0;
- if (evas_list_count(eg->programs) > 0) return 1;
- return 0;
+ return evas_list_count(eg->programs);
}
/**
@@ -207,7 +204,7 @@
{
Evas_List *l;
- if (!engrave_group_has_data(eg)) return;
+ if (!engrave_group_data_count(eg)) return;
for (l = eg->data; l; l = l->next) {
Engrave_Data *d = l->data;
if (d) func(d, data);
@@ -303,7 +300,7 @@
{
Evas_List *l;
- if (!engrave_group_has_parts(eg)) return;
+ if (!engrave_group_parts_count(eg)) return;
for (l = eg->parts; l; l = l->next) {
Engrave_Part *p = l->data;
if (p) func(p, data);
@@ -324,7 +321,7 @@
{
Evas_List *l;
- if (!engrave_group_has_programs(eg)) return;
+ if (!engrave_group_programs_count(eg)) return;
for (l = eg->programs; l; l = l->next) {
Engrave_Program *p = l->data;
if (p) func(p, data);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_group.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- engrave_group.h 12 Nov 2004 20:08:57 -0000 1.5
+++ engrave_group.h 13 Nov 2004 21:06:56 -0000 1.6
@@ -57,9 +57,9 @@
void engrave_group_min_size_get(Engrave_Group *eg, int *w, int *h);
void engrave_group_max_size_get(Engrave_Group *eg, int *w, int *h);
-int engrave_group_has_data(Engrave_Group *eg);
-int engrave_group_has_parts(Engrave_Group *eg);
-int engrave_group_has_programs(Engrave_Group *eg);
+int engrave_group_data_count(Engrave_Group *eg);
+int engrave_group_parts_count(Engrave_Group *eg);
+int engrave_group_programs_count(Engrave_Group *eg);
void engrave_group_data_foreach(Engrave_Group *eg,
void (*func)(Engrave_Data *, void *), void *data);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_image.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- engrave_image.c 13 Nov 2004 20:50:20 -0000 1.6
+++ engrave_image.c 13 Nov 2004 21:06:56 -0000 1.7
@@ -102,13 +102,13 @@
}
/**
- * engrave_image_value_get - get the image compression value
+ * engrave_image_compression_value_get - get the image compression value
* @param ei: The Engrave_Image to get the value from
*
* @return Returns the compression value of the image or 0 if not set.
*/
double
-engrave_image_value_get(Engrave_Image *ei)
+engrave_image_compression_value_get(Engrave_Image *ei)
{
return (ei ? ei->value : 0.0);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_image.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- engrave_image.h 12 Nov 2004 07:28:29 -0000 1.4
+++ engrave_image.h 13 Nov 2004 21:06:56 -0000 1.5
@@ -36,7 +36,7 @@
char *engrave_image_name_get(Engrave_Image *ei);
char *engrave_image_path_get(Engrave_Image *ei);
Engrave_Image_Type engrave_image_type_get(Engrave_Image *ei);
-double engrave_image_value_get(Engrave_Image *ei);
+double engrave_image_compression_value_get(Engrave_Image *ei);
/**
* @}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_out.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- engrave_out.c 13 Nov 2004 20:50:20 -0000 1.14
+++ engrave_out.c 13 Nov 2004 21:06:57 -0000 1.15
@@ -215,7 +215,7 @@
engrave_out_data(out, "max", "%d %d", w, h);
/* data */
- if (engrave_group_has_data(group))
+ if (engrave_group_data_count(group) > 0)
{
engrave_out_start(out, "data");
engrave_group_data_foreach(group, _engrave_output_data, out);
@@ -542,7 +542,7 @@
if (engrave_image_type_get(image) == ENGRAVE_IMAGE_TYPE_LOSSY)
engrave_out_data(out, "image", "\"%s\" %s %.2f", name,
_image_type_string[engrave_image_type_get(image)],
- engrave_image_value_get(image));
+ engrave_image_compression_value_get(image));
else
engrave_out_data(out, "image", "\"%s\" %s", name,
_image_type_string[engrave_image_type_get(image)]);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_part.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- engrave_part.c 13 Nov 2004 20:50:20 -0000 1.8
+++ engrave_part.c 13 Nov 2004 21:06:57 -0000 1.9
@@ -371,17 +371,16 @@
}
/**
- * engrave_part_has_states - check if the part has states
+ * engrave_part_states_count - get number of states in the part
* @param ep: The Engrave_Part to check
*
- * @return Returns 1 if there are statse, 0 otherwise.
+ * @return Returns number of states in the part, 0 otherwise.
*/
int
-engrave_part_has_states(Engrave_Part *ep)
+engrave_part_states_count(Engrave_Part *ep)
{
if (!ep) return 0;
- if (evas_list_count(ep->states) > 0) return 1;
- return 0;
+ return evas_list_count(ep->states);
}
/**
@@ -398,7 +397,7 @@
{
Evas_List *l;
- if (!engrave_part_has_states(ep)) return;
+ if (!engrave_part_states_count(ep)) return;
for (l = ep->states; l; l = l->next) {
Engrave_Part_State *eps = l->data;
if (eps) func(eps, ep, data);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_part.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- engrave_part.h 12 Nov 2004 22:31:22 -0000 1.6
+++ engrave_part.h 13 Nov 2004 21:06:57 -0000 1.7
@@ -79,7 +79,7 @@
void engrave_part_dragable_y_get(Engrave_Part *ep, int *y, int *step, int
*count);
char *engrave_part_dragable_confine_get(Engrave_Part *ep);
-int engrave_part_has_states(Engrave_Part *ep);
+int engrave_part_states_count(Engrave_Part *ep);
void engrave_part_state_foreach(Engrave_Part *ep,
void (*func)(Engrave_Part_State *, Engrave_Part *, void *),
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_part_state.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- engrave_part_state.c 13 Nov 2004 20:50:20 -0000 1.8
+++ engrave_part_state.c 13 Nov 2004 21:06:57 -0000 1.9
@@ -744,17 +744,16 @@
}
/**
- * engrave_part_state_has_tweens - Check if the state contains image tweens
+ * engrave_part_state_tweens_count - get the number of tweens in the state
* @param eps: The Engrave_Part_State to check for tweens
*
- * @return Returns 1 if tweens found, 0 otherwise
+ * @return Returns number of tweens, 0 otherwise
*/
int
-engrave_part_state_has_tweens(Engrave_Part_State *eps)
+engrave_part_state_tweens_count(Engrave_Part_State *eps)
{
if (!eps) return 0;
- if (evas_list_count(eps->image.tween) > 0) return 1;
- return 0;
+ return evas_list_count(eps->image.tween);
}
/**
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_part_state.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- engrave_part_state.h 12 Nov 2004 20:08:57 -0000 1.5
+++ engrave_part_state.h 13 Nov 2004 21:06:57 -0000 1.6
@@ -234,7 +234,7 @@
void engrave_part_state_copy(Engrave_Part_State *from,
Engrave_Part_State *to);
-int engrave_part_state_has_tweens(Engrave_Part_State *eps);
+int engrave_part_state_tweens_count(Engrave_Part_State *eps);
void engrave_part_state_tween_foreach(Engrave_Part_State *eps,
void (*func)(Engrave_Image *, void *), void *data);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_program.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- engrave_program.c 13 Nov 2004 20:50:20 -0000 1.7
+++ engrave_program.c 13 Nov 2004 21:06:57 -0000 1.8
@@ -313,31 +313,29 @@
}
/**
- * engrave_program_has_targets - See if a program has any targets
+ * engrave_program_targets_count - count the number of targets
* @param ep: The Engrave_Program to check for targets
*
- * @return Returns 1 if there are targets, 0 otherwise
+ * @return Returns number of targets, 0 otherwise
*/
int
-engrave_program_has_targets(Engrave_Program *ep)
+engrave_program_targets_count(Engrave_Program *ep)
{
if (!ep) return 0;
- if (evas_list_count(ep->targets) > 0) return 1;
- return 0;
+ return evas_list_count(ep->targets);
}
/**
- * engrave_program_has_afters - See if a program has any afters
+ * engrave_program_afters_count - get the number of afters
* @param ep: The Engrave_Program to check for afters
*
- * @return Returns 1 if there are afters, 0 otherwise
+ * @return Returns number of afters, 0 otherwise
*/
int
-engrave_program_has_afters(Engrave_Program *ep)
+engrave_program_afters_count(Engrave_Program *ep)
{
if (!ep) return 0;
- if (evas_list_count(ep->afters) > 0) return 1;
- return 0;
+ return evas_list_count(ep->afters);
}
/**
@@ -354,7 +352,7 @@
{
Evas_List *l;
- if (!engrave_program_has_targets(ep)) return;
+ if (!engrave_program_targets_count(ep)) return;
for (l = ep->targets; l; l = l->next) {
char *target = l->data;
if (target) func(target, data);
@@ -375,7 +373,7 @@
{
Evas_List *l;
- if (!engrave_program_has_afters(ep)) return;
+ if (!engrave_program_afters_count(ep)) return;
for (l = ep->afters; l; l = l->next) {
char *after = l->data;
if (after) func(after, data);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_program.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- engrave_program.h 12 Nov 2004 23:38:17 -0000 1.5
+++ engrave_program.h 13 Nov 2004 21:06:57 -0000 1.6
@@ -73,8 +73,8 @@
char *engrave_program_script_get(Engrave_Program *ep);
void engrave_program_in_get(Engrave_Program *ep, double *from, double *range);
-int engrave_program_has_afters(Engrave_Program *ep);
-int engrave_program_has_targets(Engrave_Program *ep);
+int engrave_program_afters_count(Engrave_Program *ep);
+int engrave_program_targets_count(Engrave_Program *ep);
void engrave_program_target_foreach(Engrave_Program *ep,
void (*func)(char *, void *), void *data);
-------------------------------------------------------
This SF.Net email is sponsored by: InterSystems CACHE
FREE OODBMS DOWNLOAD - A multidimensional database that combines
robust object and relational technologies, making it a perfect match
for Java, C++,COM, XML, ODBC and JDBC. www.intersystems.com/match8
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs