From 0e9246ce51f96706209b13dc04ab31d6b7ae6505 Mon Sep 17 00:00:00 2001 From: Lukasz Stanislawski Date: Wed, 3 Feb 2016 14:53:50 +0100 Subject: [PATCH] used boolean defines from stdbool.h It occurs that glib-object.h was used only for TRUE/FALSE defines. Exchange it with one from stdboo.h Change-Id: I6d3b0eafd8d25e2d476e6676efdbff0aef5806ab Signed-off-by: Lukasz Stanislawski --- inc/indicator.h | 2 +- src/box.c | 16 ++++++++-------- src/list.c | 2 +- src/main.c | 2 +- src/message.c | 4 ++-- src/modules/connection/wifi.c | 8 ++++---- src/util.c | 6 +++--- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/inc/indicator.h b/inc/indicator.h index c8822bd..be8f9be 100644 --- a/inc/indicator.h +++ b/inc/indicator.h @@ -25,7 +25,7 @@ //#include #include #include -#include +#include #define VCONFKEY_APPTRAY_STATE "file/private/org.tizen.app-tray/is_top" diff --git a/src/box.c b/src/box.c index b08a49b..530c3fd 100644 --- a/src/box.c +++ b/src/box.c @@ -1000,33 +1000,33 @@ extern Eina_Bool box_exist_icon(icon_s *obj) int box_handle_animated_gif(icon_s *icon) { - int bPlay = TRUE; + int bPlay = true; int val = 0; Evas_Object *icon_eo = evas_object_data_get(icon->img_obj.obj, DATA_KEY_IMG_ICON); retif(icon == NULL, FAIL, "Invalid parameter!"); if (elm_image_animated_available_get(icon_eo) == EINA_FALSE) { - return FALSE; + return false; } if (vconf_get_int(VCONFKEY_PM_STATE, &val) < 0) { - return FALSE; + return false; } switch (val) { case VCONFKEY_PM_STATE_LCDOFF : //LCD OFF - bPlay = FALSE; + bPlay = false; break; case VCONFKEY_PM_STATE_NORMAL : //LCD ON - bPlay = TRUE; + bPlay = true; break; default: - bPlay = TRUE; + bPlay = true; break; } - if (bPlay == TRUE) { + if (bPlay == true) { if (elm_image_animated_get(icon_eo)==EINA_FALSE) { elm_image_animated_set(icon_eo,EINA_TRUE); } @@ -1040,7 +1040,7 @@ int box_handle_animated_gif(icon_s *icon) } } - return TRUE; + return true; } diff --git a/src/list.c b/src/list.c index 8783d47..1dd6a38 100644 --- a/src/list.c +++ b/src/list.c @@ -73,7 +73,7 @@ extern int list_free_all(void) _list_free(noti_icon_list); _list_free(alarm_icon_list); - return TRUE; + return true; } diff --git a/src/main.c b/src/main.c index c34d470..e1cdd3b 100644 --- a/src/main.c +++ b/src/main.c @@ -942,7 +942,7 @@ static void _indicator_mouse_move_cb(void *data, Evas * e, Evas_Object * obj, vo if (home_button_pressed) { if (!box_check_home_icon_area(win,ev->cur.canvas.x,ev->cur.canvas.y)) { - home_button_pressed = FALSE; + home_button_pressed = false; } } diff --git a/src/message.c b/src/message.c index d505daf..37b5fc6 100644 --- a/src/message.c +++ b/src/message.c @@ -191,7 +191,7 @@ static Eina_Bool _msg_timeout_cb(void *data) static Eina_Bool _retry_timeout_cb(void *data) { - retif(data == NULL,TRUE , "Invalid parameter!"); + retif(data == NULL, EINA_TRUE , "Invalid parameter!"); if(message_buf!=NULL) { @@ -204,7 +204,7 @@ static Eina_Bool _retry_timeout_cb(void *data) ecore_timer_del(retry_timer); retry_timer = NULL; } - return TRUE; + return EINA_TRUE; } diff --git a/src/modules/connection/wifi.c b/src/modules/connection/wifi.c index a3df46f..9600fbc 100644 --- a/src/modules/connection/wifi.c +++ b/src/modules/connection/wifi.c @@ -164,7 +164,7 @@ static void show_wifi_transfer_icon(void* data) static void _wifi_changed_cb(keynode_t *node, void *data) { - bool wifi_state = FALSE; + bool wifi_state = false; int status, strength; int ret; @@ -216,7 +216,7 @@ static void _wifi_changed_cb(keynode_t *node, void *data) static void _wifi_device_state_changed_cb(wifi_device_state_e state, void *user_data) { - bool wifi_state = FALSE; + bool wifi_state = false; int ret, strength; ret_if(!user_data); @@ -283,10 +283,10 @@ static bool _wifi_init(void) ret = wifi_initialize(); if (ret != WIFI_ERROR_NONE) { _E("wifi_initialize is fail : %d", ret); - return FALSE; + return false; } - return TRUE; + return true; } static void _wifi_fini(void) diff --git a/src/util.c b/src/util.c index 1d1e978..a4da333 100644 --- a/src/util.c +++ b/src/util.c @@ -369,7 +369,7 @@ char* util_get_timezone_str(void) ERR("NO TIMEZONEINFO"); return _get_timezone_from_vconf(); } - return (char*)g_strdup(buf+20); // Asia/Seoul + return (char*)strdup(buf+20); // Asia/Seoul } @@ -524,8 +524,8 @@ void util_char_replace(char *text, char s, char t) static bool _is_empty_str(const char *str) { if (NULL == str || '\0' == str[0]) - return TRUE; - return FALSE; + return true; + return false; } -- 2.7.4