Ohh.. nice... no more forced unconst casting to be able to change the userdata
:-)
Please apply.
Am Mittwoch, 22. September 2010, 10:00:57 schrieb Martin Jansa:
> ---
> src/view/contact-list-common.c | 8 ++++----
> src/view/contact-view.c | 8 ++++----
> src/view/message-list-view.c | 16 ++++++++--------
> src/view/message-new-view.c | 12 ++++++------
> src/view/phone-log-view.c | 16 ++++++++--------
> src/view/sim-manager-view.c | 6 +++---
> 6 files changed, 33 insertions(+), 33 deletions(-)
>
> diff --git a/src/view/contact-list-common.c
> b/src/view/contact-list-common.c index e5ac60a..0845c22 100644
> --- a/src/view/contact-list-common.c
> +++ b/src/view/contact-list-common.c
> @@ -33,7 +33,7 @@ static Elm_Genlist_Item_Class itc;
>
> /* --- genlist callbacks --- */
> static char *
> -gl_label_get(const void *data, Evas_Object * obj, const char *part)
> +gl_label_get(void *data, Evas_Object * obj, const char *part)
> {
> (void) obj;
> GHashTable *parameters = (GHashTable *) data;
> @@ -64,7 +64,7 @@ gl_label_get(const void *data, Evas_Object * obj, const
> char *part)
>
>
> static Evas_Object *
> -gl_icon_get(const void *data, Evas_Object * obj, const char *part)
> +gl_icon_get(void *data, Evas_Object * obj, const char *part)
> {
> GHashTable *parameters = (GHashTable *) data;
> if (!strcmp(part, "elm.swallow.icon")) {
> @@ -87,7 +87,7 @@ gl_icon_get(const void *data, Evas_Object * obj, const
> char *part)
>
>
> static Eina_Bool
> -gl_state_get(const void *data, Evas_Object * obj, const char *part)
> +gl_state_get(void *data, Evas_Object * obj, const char *part)
> {
> (void) obj;
> (void) data;
> @@ -97,7 +97,7 @@ gl_state_get(const void *data, Evas_Object * obj, const
> char *part)
>
>
> static void
> -gl_del(const void *data, Evas_Object * obj)
> +gl_del(void *data, Evas_Object * obj)
> {
> (void) obj;
> (void) data;
> diff --git a/src/view/contact-view.c b/src/view/contact-view.c
> index 8f4c613..ec43def 100644
> --- a/src/view/contact-view.c
> +++ b/src/view/contact-view.c
> @@ -65,8 +65,8 @@ static void _load_photo(struct ContactViewData *view);
> static void _load_fields(struct ContactViewData *view);
> static void _add_field(struct ContactViewData *view, const char *key,
> const char *value, int isnew);
>
> -static Evas_Object *gl_field_icon_get(const void *_data, Evas_Object *
> obj, const char *part); -static void gl_field_del(const void *_data,
> Evas_Object * obj);
> +static Evas_Object *gl_field_icon_get(void *_data, Evas_Object * obj,
> const char *part); +static void gl_field_del(void *_data, Evas_Object *
> obj);
>
> static void _delete_cb(struct View *view, Evas_Object * win, void
> *event_info); static void _destroy_cb(struct View *_view);
> @@ -865,7 +865,7 @@ _field_edit_clicked(void *data, Evas_Object *obj, void
> *event_info)
>
>
> static Evas_Object *
> -gl_field_icon_get(const void *_data, Evas_Object * obj, const char *part)
> +gl_field_icon_get(void *_data, Evas_Object * obj, const char *part)
> {
> g_debug("gl_field_icon_get (part=%s)", part);
> struct ContactFieldData *fd = (struct ContactFieldData *) _data;
> @@ -907,7 +907,7 @@ gl_field_icon_get(const void *_data, Evas_Object * obj,
> const char *part) }
>
> static void
> -gl_field_del(const void *_data, Evas_Object * obj)
> +gl_field_del(void *_data, Evas_Object * obj)
> {
> (void) obj;
> g_debug("gl_field_del");
> diff --git a/src/view/message-list-view.c b/src/view/message-list-view.c
> index 252bbe0..7231d4b 100644
> --- a/src/view/message-list-view.c
> +++ b/src/view/message-list-view.c
> @@ -64,10 +64,10 @@ static void _answer_clicked(void *_data, Evas_Object *
> obj, void *event_info); static void _forward_clicked(void *_data,
> Evas_Object *obj, void *event_info); static void _delete_clicked(void
> *_data, Evas_Object * obj, void *event_info); static void _hover_bt_1(void
> *_data, Evas_Object * obj, void *event_info); -static char
> *gl_label_get(const void *data, Evas_Object * obj, const char *part);
> -static Evas_Object * gl_icon_get(const void *data, Evas_Object * obj,
> const char *part); -static Eina_Bool gl_state_get(const void *data,
> Evas_Object *obj, const char *part); -static void gl_del(const void *data,
> Evas_Object * obj);
> +static char *gl_label_get(void *data, Evas_Object * obj, const char
> *part); +static Evas_Object * gl_icon_get(void *data, Evas_Object * obj,
> const char *part); +static Eina_Bool gl_state_get(void *data, Evas_Object
> *obj, const char *part); +static void gl_del(void *data, Evas_Object *
> obj);
>
>
> int
> @@ -551,7 +551,7 @@ _process_message(gpointer _message, gpointer _data)
> }
>
> static char *
> -gl_label_get(const void *data, Evas_Object * obj, const char *part)
> +gl_label_get(void *data, Evas_Object * obj, const char *part)
> {
> (void) obj;
> GHashTable *message = (GHashTable *)data;
> @@ -586,7 +586,7 @@ gl_label_get(const void *data, Evas_Object * obj, const
> char *part) }
>
> static Evas_Object *
> -gl_icon_get(const void *data, Evas_Object * obj, const char *part)
> +gl_icon_get(void *data, Evas_Object * obj, const char *part)
> {
> (void) obj;
> GValue *tmp;
> @@ -626,7 +626,7 @@ gl_icon_get(const void *data, Evas_Object * obj, const
> char *part) }
>
> static Eina_Bool
> -gl_state_get(const void *data, Evas_Object *obj, const char *part)
> +gl_state_get(void *data, Evas_Object *obj, const char *part)
> {
> (void) part;
> (void) obj;
> @@ -650,7 +650,7 @@ gl_state_get(const void *data, Evas_Object *obj, const
> char *part) }
>
> static void
> -gl_del(const void *data, Evas_Object * obj)
> +gl_del(void *data, Evas_Object * obj)
> {
> (void)obj;
> g_hash_table_destroy((GHashTable *)data);
> diff --git a/src/view/message-new-view.c b/src/view/message-new-view.c
> index 02e6a9b..63ec571 100644
> --- a/src/view/message-new-view.c
> +++ b/src/view/message-new-view.c
> @@ -76,9 +76,9 @@ static void _number_update_number(struct
> MessageNewViewData* view); static void _process_recipient(gpointer
> _properties, gpointer _data); static void _contact_lookup(GError *error,
> GHashTable *contact, gpointer data); static void
> _message_send_callback(GError *error, int reference, const char
> *timestamp, gpointer data); -static char *gl_label_get(const void *data,
> Evas_Object * obj, const char *part); -static Evas_Object
> *gl_icon_get(const void *data, Evas_Object * obj, const char *part);
> -static void gl_del(const void *data, Evas_Object *obj);
> +static char *gl_label_get(void *data, Evas_Object * obj, const char
> *part); +static Evas_Object *gl_icon_get(void *data, Evas_Object * obj,
> const char *part); +static void gl_del(void *data, Evas_Object *obj);
>
> static void _delete_cb(struct View *view, Evas_Object * win, void
> *event_info); static void _destroy_cb(struct View *view);
> @@ -180,7 +180,7 @@ message_new_view_show(struct MessageNewViewData *view)
>
>
> static char *
> -gl_label_get(const void *data, Evas_Object * obj, const char *part)
> +gl_label_get(void *data, Evas_Object * obj, const char *part)
> {
> (void) obj;
> char *label = NULL;
> @@ -199,7 +199,7 @@ gl_label_get(const void *data, Evas_Object * obj, const
> char *part) }
>
> static Evas_Object *
> -gl_icon_get(const void *data, Evas_Object * obj, const char *part)
> +gl_icon_get(void *data, Evas_Object * obj, const char *part)
> {
> struct _recipient_pack *pack = (struct _recipient_pack *)data;
> if (!strcmp(part, "elm.swallow.icon")) {
> @@ -227,7 +227,7 @@ gl_icon_get(const void *data, Evas_Object * obj, const
> char *part) }
>
> static void
> -gl_del(const void *data, Evas_Object *obj)
> +gl_del(void *data, Evas_Object *obj)
> {
> (void) obj;
> struct _recipient_pack *pack = (struct _recipient_pack *)data;
> diff --git a/src/view/phone-log-view.c b/src/view/phone-log-view.c
> index 1f83d60..b0695ff 100644
> --- a/src/view/phone-log-view.c
> +++ b/src/view/phone-log-view.c
> @@ -56,10 +56,10 @@ static void _call_changed_handler(void * data, const
> char *path, enum PhoneuiInf static void _contact_changed_handler(void
> *data, const char *path, enum PhoneuiInfoChangeType);
>
>
> -static char *gl_label_get(const void *data, Evas_Object * obj, const char
> *part); -static Evas_Object *gl_icon_get(const void *data, Evas_Object *
> obj, const char *part); -static Eina_Bool gl_state_get(const void *data,
> Evas_Object * obj, const char *part); -static void gl_del(const void
> *data, Evas_Object * obj);
> +static char *gl_label_get(void *data, Evas_Object * obj, const char
> *part); +static Evas_Object *gl_icon_get(void *data, Evas_Object * obj,
> const char *part); +static Eina_Bool gl_state_get(void *data, Evas_Object
> * obj, const char *part); +static void gl_del(void *data, Evas_Object *
> obj);
>
> void phone_log_view_show()
> {
> @@ -357,7 +357,7 @@ _get_callback(GError* error, GHashTable** entry, int
> count, gpointer data)
>
> /* --- genlist callbacks --- */
> static char *
> -gl_label_get(const void *data, Evas_Object * obj, const char *part)
> +gl_label_get(void *data, Evas_Object * obj, const char *part)
> {
> (void) obj;
> GHashTable *entry = (GHashTable *) data;
> @@ -411,7 +411,7 @@ gl_label_get(const void *data, Evas_Object * obj, const
> char *part) }
>
> static Evas_Object *
> -gl_icon_get(const void *data, Evas_Object * obj, const char *part)
> +gl_icon_get(void *data, Evas_Object * obj, const char *part)
> {
> (void) data;
> if (!strcmp(part,"elm.swallow.end")) {
> @@ -423,7 +423,7 @@ gl_icon_get(const void *data, Evas_Object * obj, const
> char *part) }
>
> static Eina_Bool
> -gl_state_get(const void *data, Evas_Object * obj, const char *part)
> +gl_state_get(void *data, Evas_Object * obj, const char *part)
> {
> (void) obj;
> (void) part;
> @@ -435,7 +435,7 @@ gl_state_get(const void *data, Evas_Object * obj, const
> char *part) }
>
> static void
> -gl_del(const void *data, Evas_Object * obj)
> +gl_del(void *data, Evas_Object * obj)
> {
> (void) obj;
> if (data)
> diff --git a/src/view/sim-manager-view.c b/src/view/sim-manager-view.c
> index 34829a1..6252268 100644
> --- a/src/view/sim-manager-view.c
> +++ b/src/view/sim-manager-view.c
> @@ -220,7 +220,7 @@ contact_select_view(void (*cb)(const char *, void *),
> void *data)
>
> /* --- genlist callbacks --- */
> static char *
> -gl_label_get(const void *data, Evas_Object * obj, const char *part)
> +gl_label_get(void *data, Evas_Object * obj, const char *part)
> {
> (void) obj;
> const struct SimContactData *cdata = data;
> @@ -239,7 +239,7 @@ gl_label_get(const void *data, Evas_Object * obj, const
> char *part) }
>
> static Eina_Bool
> -gl_state_get(const void *data, Evas_Object * obj, const char *part)
> +gl_state_get(void *data, Evas_Object * obj, const char *part)
> {
> (void) obj;
> (void) data;
> @@ -248,7 +248,7 @@ gl_state_get(const void *data, Evas_Object * obj, const
> char *part) }
>
> static void
> -gl_del(const void *data, Evas_Object * obj)
> +gl_del(void *data, Evas_Object * obj)
> {
> (void) obj;
> (void) data;
--
Klaus 'mrmoku' Kurzmann
_______________________________________________
Shr-devel mailing list
[email protected]
http://lists.shr-project.org/mailman/listinfo/shr-devel
