From f08e475ca32a9c5eba188d47e9536a71587fd1c3 Mon Sep 17 00:00:00 2001 From: shilpa onkar singh Date: Fri, 18 Feb 2011 13:44:41 +0530 Subject: [PATCH] [Merge Conflict Resolved: elm_popup.c] [elm_popup]: const keyword added to char * parameters according to EFL standards in APIs elm_popup_buttons_add and elm_popup_with_buttons_add Change-Id: I9d1e961c076b1a3d4bc73d587940a50fe79e7a9f --- src/lib/Elementary.h.in | 6 +++--- src/lib/elm_popup.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in index 6a0766a..d495c13 100644 --- a/src/lib/Elementary.h.in +++ b/src/lib/Elementary.h.in @@ -2614,9 +2614,9 @@ extern "C" { EAPI void elm_popup_title_icon_set(Evas_Object *obj, Evas_Object *icon); EAPI Evas_Object *elm_popup_title_icon_get(Evas_Object *obj); EAPI void elm_popup_content_set(Evas_Object *obj, Evas_Object *content); - EAPI Evas_Object* elm_popup_content_get(Evas_Object *obj); - EAPI void elm_popup_buttons_add(Evas_Object *obj,int no_of_buttons, char *first_button_text, ...); - EAPI Evas_Object* elm_popup_with_buttons_add(Evas_Object *parent, char *title, char *desc_text,int no_of_buttons, char *first_button_text, ... ); + EAPI Evas_Object *elm_popup_content_get(Evas_Object *obj); + EAPI void elm_popup_buttons_add(Evas_Object *obj,int no_of_buttons, const char *first_button_text, ...); + EAPI Evas_Object *elm_popup_with_buttons_add(Evas_Object *parent, const char *title, const char *desc_text,int no_of_buttons, const char *first_button_text, ... ); EAPI void elm_popup_timeout_set(Evas_Object *obj, double timeout); EAPI void elm_popup_mode_set(Evas_Object *obj, Elm_Popup_Mode mode); EAPI void elm_popup_response(Evas_Object *obj, int response_id); diff --git a/src/lib/elm_popup.c b/src/lib/elm_popup.c index 7534656..5257ee9 100644 --- a/src/lib/elm_popup.c +++ b/src/lib/elm_popup.c @@ -434,7 +434,7 @@ elm_popup_add(Evas_Object *parent_app) * @ingroup Popup */ EAPI Evas_Object * -elm_popup_with_buttons_add(Evas_Object *parent, char *title, char *desc_text,int no_of_buttons, char *first_button_text, ...) +elm_popup_with_buttons_add(Evas_Object *parent, const char *title, const char *desc_text,int no_of_buttons, const char *first_button_text, ...) { Evas_Object *popup; popup = elm_popup_add(parent); @@ -680,7 +680,7 @@ elm_popup_content_get(Evas_Object *obj) * @ingroup Popup */ EAPI void -elm_popup_buttons_add(Evas_Object *obj,int no_of_buttons, char *first_button_text, ...) +elm_popup_buttons_add(Evas_Object *obj,int no_of_buttons, const char *first_button_text, ...) { ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); -- 2.7.4