Enlightenment CVS committal
Author : sebastid
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/canvas
Modified Files:
evas_font_dir.c evas_object_image.c evas_object_smart.c
evas_object_text.c evas_object_textblock.c
Log Message:
Add const.
Remove unused variables.
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/canvas/evas_font_dir.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- evas_font_dir.c 30 Apr 2006 11:39:44 -0000 1.22
+++ evas_font_dir.c 31 May 2006 18:33:45 -0000 1.23
@@ -16,11 +16,11 @@
struct _Fndat
{
- char *name;
- char *source;
- int size;
- void *font;
- int ref;
+ const char *name;
+ const char *source;
+ int size;
+ void *font;
+ int ref;
};
/* private methods for font dir cache */
@@ -44,7 +44,7 @@
font_dirs = NULL;
}
-char *
+const char *
evas_font_dir_cache_find(char *dir, char *font)
{
Evas_Font_Dir *fd;
@@ -227,7 +227,7 @@
for (l = evas->font_path; l; l = l->next)
{
- char *f_file;
+ const char *f_file;
f_file = evas_font_dir_cache_find(l->data, (char
*)nm);
if (f_file)
@@ -289,7 +289,7 @@
for (l = evas->font_path; l; l = l->next)
{
- char *f_file;
+ const char *f_file;
f_file = evas_font_dir_cache_find(l->data, (char
*)nm);
if (f_file)
@@ -390,7 +390,7 @@
{
for (i = 0; i < set->nfont; i++)
{
- char * font;
+ char *font;
font = FcNameUnparse(set->fonts[i]);
available = evas_list_append(available,
evas_stringshare_add(font));
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/canvas/evas_object_image.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- evas_object_image.c 2 May 2006 07:28:46 -0000 1.39
+++ evas_object_image.c 31 May 2006 18:33:45 -0000 1.40
@@ -23,8 +23,8 @@
unsigned char fill;
} border;
- char *file;
- char *key;
+ const char *file;
+ const char *key;
char smooth_scale : 1;
char has_alpha :1;
@@ -186,7 +186,7 @@
* @ingroup Evas_Object_Image_File_Group
*/
EAPI void
-evas_object_image_file_get(Evas_Object *obj, char **file, char **key)
+evas_object_image_file_get(Evas_Object *obj, const char **file, const char
**key)
{
Evas_Object_Image *o;
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/canvas/evas_object_smart.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- evas_object_smart.c 6 Jan 2006 23:05:17 -0000 1.21
+++ evas_object_smart.c 31 May 2006 18:33:45 -0000 1.22
@@ -12,7 +12,7 @@
struct _Evas_Smart_Callback
{
- char *event;
+ const char *event;
char delete_me : 1;
void (*func) (void *data, Evas_Object *obj, void *event_info);
void *func_data;
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/canvas/evas_object_text.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -3 -r1.58 -r1.59
--- evas_object_text.c 25 May 2006 02:40:09 -0000 1.58
+++ evas_object_text.c 31 May 2006 18:33:45 -0000 1.59
@@ -16,9 +16,9 @@
DATA32 magic;
struct {
- char *text;
- char *font;
- char *source;
+ const char *text;
+ const char *font;
+ const char *source;
Evas_Font_Size size;
struct {
unsigned char r, g, b, a;
@@ -252,7 +252,7 @@
*
*/
EAPI void
-evas_object_text_font_get(Evas_Object *obj, char **font, Evas_Font_Size *size)
+evas_object_text_font_get(Evas_Object *obj, const char **font, Evas_Font_Size
*size)
{
Evas_Object_Text *o;
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/canvas/evas_object_textblock.c,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -3 -r1.128 -r1.129
--- evas_object_textblock.c 11 May 2006 23:46:54 -0000 1.128
+++ evas_object_textblock.c 31 May 2006 18:33:45 -0000 1.129
@@ -61,7 +61,7 @@
struct _Evas_Object_Textblock_Format_Item
{ Evas_Object_List _list_data;
- char *item;
+ const char *item;
Evas_Object_Textblock_Node *source_node;
int x, w;
};
@@ -72,9 +72,9 @@
double halign;
double valign;
struct {
- char *name;
- char *source;
- char *fallbacks;
+ const char *name;
+ const char *source;
+ const char *fallbacks;
int size;
void *font;
} font;
@@ -244,7 +244,7 @@
}
static char *
-_strbuf_append(char *s, char *s2, int *len, int *alloc)
+_strbuf_append(char *s, const char *s2, int *len, int *alloc)
{
int l2;
int tlen;
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
