Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_gadcon.h e_gadcon.c
Log Message:
Add some const modifiers to quiet warnings.
Remove unused variables.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_gadcon.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- e_gadcon.h 19 May 2006 12:56:47 -0000 1.20
+++ e_gadcon.h 31 May 2006 16:07:22 -0000 1.21
@@ -44,14 +44,14 @@
{
E_Object e_obj_inherit;
- char *name;
- char *id;
+ const char *name;
+ const char *id;
E_Gadcon_Layout_Policy layout_policy;
struct {
Evas_Object *o_parent;
- char *swallow_name;
+ const char *swallow_name;
} edje;
Ecore_Evas *ecore_evas;
E_Zone *zone;
@@ -82,7 +82,7 @@
/* All members below are part of version 1 */
char *name;
struct {
- E_Gadcon_Client *(*init) (E_Gadcon *gc, char *name, char *id, char
*style);
+ E_Gadcon_Client *(*init) (E_Gadcon *gc, const char *name, const char
*id, const char *style);
void (*shutdown) (E_Gadcon_Client *gcc);
void (*orient) (E_Gadcon_Client *gcc);
char *(*label) (void);
@@ -95,14 +95,14 @@
{
E_Object e_obj_inherit;
E_Gadcon *gadcon;
- char *name;
- char *id;
+ const char *name;
+ const char *id;
Evas_Object *o_base;
Evas_Object *o_box;
Evas_Object *o_frame;
Evas_Object *o_control;
Evas_Object *o_event;
- E_Gadcon_Client_Class *client_class;
+ const E_Gadcon_Client_Class *client_class;
void *data;
struct {
int pos, size, res;
@@ -115,7 +115,7 @@
double scroll_pos;
double scroll_wanted;
E_Menu *menu;
- char *style;
+ const char *style;
unsigned char autoscroll : 1;
unsigned char resizable : 1;
@@ -126,8 +126,8 @@
EAPI int e_gadcon_init(void);
EAPI int e_gadcon_shutdown(void);
-EAPI void e_gadcon_provider_register(E_Gadcon_Client_Class *cc);
-EAPI void e_gadcon_provider_unregister(E_Gadcon_Client_Class *cc);
+EAPI void e_gadcon_provider_register(const E_Gadcon_Client_Class
*cc);
+EAPI void e_gadcon_provider_unregister(const E_Gadcon_Client_Class
*cc);
EAPI Evas_List *e_gadcon_provider_list(void);
EAPI E_Gadcon *e_gadcon_swallowed_new(const char *name, char *id,
Evas_Object *obj, char *swallow_name);
EAPI void e_gadcon_swallowed_min_size_set(E_Gadcon *gc, Evas_Coord
w, Evas_Coord h);
@@ -137,7 +137,7 @@
EAPI void e_gadcon_layout_policy_set(E_Gadcon *gc,
E_Gadcon_Layout_Policy layout_policy);
EAPI void e_gadcon_populate(E_Gadcon *gc);
EAPI void e_gadcon_unpopulate(E_Gadcon *gc);
-EAPI void e_gadcon_populate_class(E_Gadcon *gc,
E_Gadcon_Client_Class *cc);
+EAPI void e_gadcon_populate_class(E_Gadcon *gc, const
E_Gadcon_Client_Class *cc);
EAPI void e_gadcon_orient(E_Gadcon *gc, E_Gadcon_Orient orient);
EAPI void e_gadcon_edit_begin(E_Gadcon *gc);
EAPI void e_gadcon_edit_end(E_Gadcon *gc);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_gadcon.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- e_gadcon.c 19 May 2006 13:21:01 -0000 1.26
+++ e_gadcon.c 31 May 2006 16:07:22 -0000 1.27
@@ -66,7 +66,7 @@
}
EAPI void
-e_gadcon_provider_register(E_Gadcon_Client_Class *cc)
+e_gadcon_provider_register(const E_Gadcon_Client_Class *cc)
{
Evas_List *l;
E_Gadcon *gc;
@@ -81,7 +81,7 @@
}
EAPI void
-e_gadcon_provider_unregister(E_Gadcon_Client_Class *cc)
+e_gadcon_provider_unregister(const E_Gadcon_Client_Class *cc)
{
Evas_List *l, *ll, *dlist = NULL;
E_Gadcon *gc;
@@ -277,7 +277,7 @@
}
EAPI void
-e_gadcon_populate_class(E_Gadcon *gc, E_Gadcon_Client_Class *cc)
+e_gadcon_populate_class(E_Gadcon *gc, const E_Gadcon_Client_Class *cc)
{
Evas_List *l;
int ok;
@@ -1722,7 +1722,6 @@
e_gadcon_layout_asked_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
{
E_Smart_Data *sd;
- Evas_List *l;
Evas_Coord tw = 0, th = 0;
sd = evas_object_smart_data_get(obj);
@@ -1984,7 +1983,6 @@
Evas_Coord x, y, w, h, xx, yy;
Evas_List *l, *l2;
int min, mino, cur;
- int count, expand;
Evas_List *list_s = NULL, *list_m = NULL, *list_e = NULL, *list = NULL;
if (sd->frozen) return;
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
