summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHyojung Jo <hj903.jo@samsung.com>2015-04-30 15:46:38 +0900
committerHyojung Jo <hj903.jo@samsung.com>2015-04-30 17:32:34 +0900
commitffb587952c602c42fffeb5941b1f6e220cce3500 (patch)
tree9ef2535572873e71b5fee475ac84b3987acdb9ad
parent5c9003b3ef5e53b604ad67d05813adf5c2605552 (diff)
downloadsettings-ffb587952c602c42fffeb5941b1f6e220cce3500.tar.gz
settings-ffb587952c602c42fffeb5941b1f6e220cce3500.tar.bz2
settings-ffb587952c602c42fffeb5941b1f6e220cce3500.zip
Fixed the compile warning regarding type casting
Change-Id: Iab64cfae813d6a2b2932de48365af3ec6cd729ff Signed-off-by: Hyojung Jo <hj903.jo@samsung.com>
-rw-r--r--src/view_maincatalog.cpp5
-rwxr-xr-xsrc/view_need_pwd.cpp5
-rwxr-xr-xsrc/view_pwd_popup.cpp2
-rw-r--r--ug/network/src/NetworkMainView.cpp21
-rw-r--r--ug/system/clock/src/ClockSpinControlView.cpp2
-rw-r--r--ug/system/clock/src/ClockTimeSpinControlView.cpp4
-rwxr-xr-xug/wifi-direct/src/WifiDirectMainView.cpp30
7 files changed, 53 insertions, 16 deletions
diff --git a/src/view_maincatalog.cpp b/src/view_maincatalog.cpp
index 12014b0..8c76c26 100644
--- a/src/view_maincatalog.cpp
+++ b/src/view_maincatalog.cpp
@@ -656,7 +656,8 @@ bool CMainCatalogView::m_DrawSubItems(const char *name)
EINA_LIST_FOREACH(list, l, obj) {
item = (struct settingitem *) obj;
- btn = utils_add_btn(m->base, SUBITEMBTN_STYLE, settingitem_get_display_name(item), EINA_FALSE);
+ btn = utils_add_btn(m->base, (char *)SUBITEMBTN_STYLE,
+ settingitem_get_display_name(item), EINA_FALSE);
if (!btn) {
_ERR("Add btn failed");
evas_object_del(m->subitem_box);
@@ -809,7 +810,7 @@ bool CMainCatalogView::m_AddIconBtns(Eina_List *list)
}
for (int i = 0; i < m->main_item_count; i++) {
- btn = utils_add_btn(m->base, MAINICONBTN_STYLE, NULL, EINA_FALSE);
+ btn = utils_add_btn(m->base, (char *)MAINICONBTN_STYLE, NULL, EINA_FALSE);
if (!btn) {
_ERR("Add btn failed");
return false;
diff --git a/src/view_need_pwd.cpp b/src/view_need_pwd.cpp
index 2f7b587..c5f52c4 100755
--- a/src/view_need_pwd.cpp
+++ b/src/view_need_pwd.cpp
@@ -189,8 +189,9 @@ static Evas_Object *_add_view_cancel_btn(SNeedPasscodeView *data)
if (!data || !data->base)
return NULL;
- btn = utils_add_btn(data->base, PWD_BASIC_BTN,
- utils_get_translation_str(MSGID_CANCEL), EINA_TRUE);
+ btn = utils_add_btn(data->base, (char *)PWD_BASIC_BTN,
+ utils_get_translation_str((char *)MSGID_CANCEL),
+ EINA_TRUE);
if (!btn) {
_ERR("utils add button failed.");
return NULL;
diff --git a/src/view_pwd_popup.cpp b/src/view_pwd_popup.cpp
index c2653d9..f970635 100755
--- a/src/view_pwd_popup.cpp
+++ b/src/view_pwd_popup.cpp
@@ -193,7 +193,7 @@ static Evas_Object *_add_pwd_cancel_btn(SPasscodePopupView *data)
return NULL;
btn = utils_add_btn(data->base, PWD_BASIC_BTN,
- utils_get_translation_str((const char *) MSGID_CANCEL), EINA_TRUE);
+ utils_get_translation_str((char *) MSGID_CANCEL), EINA_TRUE);
if (!btn) {
_ERR("utils add button failed.");
return NULL;
diff --git a/ug/network/src/NetworkMainView.cpp b/ug/network/src/NetworkMainView.cpp
index 42b608b..e2b3133 100644
--- a/ug/network/src/NetworkMainView.cpp
+++ b/ug/network/src/NetworkMainView.cpp
@@ -10,9 +10,24 @@
#include "NetworkMainView.h"
-static char *action_button[4] = { TXT_CONNECT_BTN, TXT_REFRESH_BTN, TXT_OTHER_BTN, TXT_CLOSE_BTN };
-static char *button_swallow[4] = { PART_CONNECT_BTN, PART_REFRESH_BTN, PART_OTHER_BTN, PART_CLOSE_BTN };
-static char *popup_button[2] = { TXT_WIRELESS, TXT_WIRED };
+static const char *action_button[4] = {
+ TXT_CONNECT_BTN,
+ TXT_REFRESH_BTN,
+ TXT_OTHER_BTN,
+ TXT_CLOSE_BTN
+};
+
+static const char *button_swallow[4] = {
+ PART_CONNECT_BTN,
+ PART_REFRESH_BTN,
+ PART_OTHER_BTN,
+ PART_CLOSE_BTN
+};
+
+static const char *popup_button[2] = {
+ TXT_WIRELESS,
+ TXT_WIRED
+};
struct SNetworkMainView {
ui_gadget_h ug;
diff --git a/ug/system/clock/src/ClockSpinControlView.cpp b/ug/system/clock/src/ClockSpinControlView.cpp
index f7c1fd3..02d48e7 100644
--- a/ug/system/clock/src/ClockSpinControlView.cpp
+++ b/ug/system/clock/src/ClockSpinControlView.cpp
@@ -201,7 +201,7 @@ void CClockSpinControlView::m_UpdateDateValue(Evas_Object *spin, int spin_idx)
snprintf(buf, sizeof(buf), "%02d", m->date[spin_idx]);
} else if (spin_idx == DATE_DAY) {
- if (m->date[spin_idx] > days[m->date[DATE_MONTH] - 1])
+ if ((int)m->date[spin_idx] > days[m->date[DATE_MONTH] - 1])
m->date[spin_idx] = 1;
if (m->date[spin_idx] <= 0)
m->date[spin_idx] = days[m->date[DATE_MONTH] - 1];
diff --git a/ug/system/clock/src/ClockTimeSpinControlView.cpp b/ug/system/clock/src/ClockTimeSpinControlView.cpp
index f5ca90f..8f193c3 100644
--- a/ug/system/clock/src/ClockTimeSpinControlView.cpp
+++ b/ug/system/clock/src/ClockTimeSpinControlView.cpp
@@ -286,7 +286,7 @@ bool CClockTimeSpinControlView::m_AddTimeSpin(void)
count = eina_array_count(m->spin_array);
- for (idx = TIME_HOUR; idx < count; idx++) {
+ for (idx = TIME_HOUR; idx < (int)count; idx++) {
btn = (Evas_Object *) eina_array_data_get(m->spin_array, idx);
if (!btn) {
_ERR("there is no button. idx: %d", idx);
@@ -302,7 +302,7 @@ bool CClockTimeSpinControlView::m_AddTimeSpin(void)
ELM_FOCUS_RIGHT);
elm_object_focus_next_object_set(btn, (Evas_Object *) eina_array_data_get(m->spin_array, idx + 1),
ELM_FOCUS_NEXT);
- } else if (idx == count - 1) {
+ } else if (idx == (int)count - 1) {
elm_object_focus_next_object_set(btn, btn, ELM_FOCUS_RIGHT);
elm_object_focus_next_object_set(btn, (Evas_Object *) eina_array_data_get(m->spin_array, idx - 1), ELM_FOCUS_LEFT);
} else {
diff --git a/ug/wifi-direct/src/WifiDirectMainView.cpp b/ug/wifi-direct/src/WifiDirectMainView.cpp
index 93715d0..ca7e97f 100755
--- a/ug/wifi-direct/src/WifiDirectMainView.cpp
+++ b/ug/wifi-direct/src/WifiDirectMainView.cpp
@@ -8,11 +8,31 @@
#include "WifiDirectMainView.h"
-const char *action_button[] = { TXT_REFRESH_BTN, TXT_CLOSE_BTN, TXT_STOP_BTN };
-const char *popup_button_on[] = { TXT_ON_BTN, TXT_OFF_BTN };
-static char *popup_button_conn[] = { TXT_CONNECT, TXT_DISCONNECT };
-static char *popup_button_req[] = { TXT_YES, TXT_NO };
-static char *part_req[] = { PART_YES, PART_NO };
+const char *action_button[] = {
+ TXT_REFRESH_BTN,
+ TXT_CLOSE_BTN,
+ TXT_STOP_BTN
+};
+
+const char *popup_button_on[] = {
+ TXT_ON_BTN,
+ TXT_OFF_BTN
+};
+
+static const char *popup_button_conn[] = {
+ TXT_CONNECT,
+ TXT_DISCONNECT
+};
+
+static const char *popup_button_req[] = {
+ TXT_YES,
+ TXT_NO
+};
+
+static const char *part_req[] = {
+ PART_YES,
+ PART_NO
+};
enum action_btn_enum {
ACTION_BTN_REFRESH,