c++ test fixes

Change-Id: I565db35bbc6e7843cdbb756b985aa90cc5779274
Signed-off-by: Radek Kintop <r.kintop@samsung.com>

diff --git a/include/define.h b/include/define.h
index 631b9538b6683d30080a00add12d806b87048a08..46f0b6ef180f1b6bf01e0b04d762f20eae4daa24 100644 (file)
--- a/include/define.h
+++ b/include/define.h
@@ -62,7 +62,7 @@
 #define PART_MENU "part.menu"
 #define PART_TEXT "part.text"
 #define PART_CONTENT "part.content"
-//#define PART_CONTENT_NETWORK "part.content.network"
+
 #define PART_TITLE "part.title"
 #define PART_SUBTEXT1 "part.subtext1"
 #define PART_SUBTEXT2 "part.subtext2"
@@ -177,8 +177,6 @@
 /* String for view*/
 #define STR_SETTINGS "Settings"
 #define STR_TUTORIAL "Tutorial"
-//TODO Fix it when translation will work correctly
-//#define STR_SETTINGS "IDS_ST_OPT_SETTINGS"
 #define STR_PICTURE "Picture"
 #define STR_NETWORK "Network"
 #define STR_SYSTEM "System"

diff --git a/include/key_define.h b/include/key_define.h
index 8149bc82dca0e0e4a3da59c621af32468db3e587..71d6d808b710e13fa64babae5646f6865654b6e8 100644 (file)
--- a/include/key_define.h
+++ b/include/key_define.h
@@ -36,12 +36,12 @@
 #define KEY_ID_LEFT                                            113
 #define KEY_ID_RIGHT                                   114
 #define KEY_ID_ENTER                                   36
-//#define KEY_ID_ESC                                   "XF86Exit"
+
 #define KEY_ID_BACK                                            166
-//#define KEY_ID_MENU                                  "XF86SysMenu"
-//#define KEY_ID_ESC_WAY                               "Escape"
+
+
 #define KEY_ID_BACK_WAY                                        22
 #define KEY_ID_MENU_WAY                                        67
-//#define KEY_MENU_EMULATOR_ID                 "XF86Menu"
+
 
 #endif /* __AIR_SETTINGS_KEY_DEFINE_H__ */

diff --git a/src/common/utils.c b/src/common/utils.c
index 86410b16dfd7c2ff6030e896ea1598cb1e2fce74..950c6cc94b4ce67176b0efc23777589721d06da0 100755 (executable)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -287,7 +287,7 @@ Evas_Object *utils_add_gengrid(Evas_Object *parent, Eina_Bool horizontal,
        evas_object_size_hint_align_set(grid, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
        elm_gengrid_multi_select_set(grid, EINA_FALSE);
-       //elm_gengrid_horizontal_set(grid, horizontal);
+
        elm_gengrid_align_set(grid, 0.5, 0.0);
        elm_gengrid_select_mode_set(grid, ELM_OBJECT_SELECT_MODE_ALWAYS);
        elm_config_item_select_on_focus_disabled_set(EINA_TRUE);
@@ -518,10 +518,6 @@ Evas_Object *utils_add_datetime(Evas_Object *parent, const char *part,
                return NULL;
        }
 
-
-       /*@TODO: Temporary */
-//     elm_object_scale_set(dtime, 1.0 / APP_BASE_SCALE);
-
        if (time_to_set)
                elm_datetime_value_set(dtime, (Elm_Datetime_Time *)time_to_set);
 

diff --git a/src/data/system/settings_clock.c b/src/data/system/settings_clock.c
index 5e77b636fc9178db30bfdf5086b2e854d6b17d10..52757aae04628a5f07aff08473067bf44f5f2f24 100755 (executable)
--- a/src/data/system/settings_clock.c
+++ b/src/data/system/settings_clock.c
@@ -285,15 +285,32 @@ static void add_next_minute_cb(void *data)
 
 void settings_clock_set_state_update_callbacks(void *data)
 {
-       int ret = 0;
+       int ret1 = SYSTEM_SETTINGS_ERROR_NONE;
+       int ret2 = SYSTEM_SETTINGS_ERROR_NONE;
+       int ret3 = SYSTEM_SETTINGS_ERROR_NONE;
+
        if (data) {
-               if ((ret = system_settings_set_changed_cb(SYSTEM_SETTINGS_KEY_LOCALE_TIMEFORMAT_24HOUR,
-                                       _system_time_setting_changed_cb, data)) != SYSTEM_SETTINGS_ERROR_NONE
-                       || (ret = system_settings_set_changed_cb(SYSTEM_SETTINGS_KEY_TIME_CHANGED,
-                                       _system_time_setting_changed_cb, data)) != SYSTEM_SETTINGS_ERROR_NONE
-                       || (ret = system_settings_set_changed_cb(SYSTEM_SETTINGS_KEY_LOCALE_TIMEZONE,
-                                       _system_time_setting_changed_cb, data)) != SYSTEM_SETTINGS_ERROR_NONE)
-                       _ERR("Cannot set callbacks for system settings change. Code = %d", ret);
+
+               ret1 = system_settings_set_changed_cb(
+                                       SYSTEM_SETTINGS_KEY_LOCALE_TIMEFORMAT_24HOUR,
+                                       _system_time_setting_changed_cb, data);
+               ret2 = system_settings_set_changed_cb(SYSTEM_SETTINGS_KEY_TIME_CHANGED,
+                                       _system_time_setting_changed_cb, data);
+               ret3 = system_settings_set_changed_cb(
+                                       SYSTEM_SETTINGS_KEY_LOCALE_TIMEZONE,
+                                       _system_time_setting_changed_cb, data);
+               if (
+                       (ret1 != SYSTEM_SETTINGS_ERROR_NONE)
+                       ||
+                       (ret2 != SYSTEM_SETTINGS_ERROR_NONE)
+                       ||
+                       (ret3 != SYSTEM_SETTINGS_ERROR_NONE)
+                       )
+                       _ERR("Cannot set callbacks for system settings change. %s %s %s",
+                                                                                                               get_error_message(ret1),
+                                                                                                               get_error_message(ret2),
+                                                                                                               get_error_message(ret3)
+                                                                                                               );
 
                /* TODO: look at add_next_minute_cb() comments
                if (alarmmgr_init("org.tizen.settings") == ALARMMGR_RESULT_SUCCESS

diff --git a/src/view/system/view_clock.c b/src/view/system/view_clock.c
index 4e1a7171ed9ea83cab8d4bc0b1b18c64c0b6ce0f..77e2d22d552a52dec449fd1334cf9db3dcc4f308 100755 (executable)
--- a/src/view/system/view_clock.c
+++ b/src/view/system/view_clock.c
@@ -28,7 +28,6 @@
 #include "data/system/settings_clock.h"
 #include "app_string.h"
 
-//#define DATE_TIME_FORMAT "<font=Tizen:style=Light font_size=64 align=center color=#FFF>"
 #define DEFAULT_KEYPAD_POS             636
 #define PADDING_VKEYBOARD              30
 
@@ -83,8 +82,7 @@ static void _done_mouse_cb(int id, void *data, Evas_Object *obj);
 static void _cancel_mouse_cb(int id, void *data, Evas_Object *obj);
 /* In automatic time settings some controls should be disabled:*/
 static void _disable_manual_settings(bool disable, const clock_view_priv_data *priv);
-/* Helper to make time out of widgets values: */
-//static void _get_time_from_controls(struct tm *result, const clock_view_priv_data *priv);
+
 /* When auto/manual setup dropdown is active, focus should be only on it*/
 
 static void _datetime_btn_clicked_cb(int id, void *data, Evas_Object *obj);
@@ -299,10 +297,7 @@ static Evas_Object *_create(Evas_Object *win, void *data)
                _ERR("Adding conformant failed.");
                return NULL;
        }
-/*
-       evas_object_size_hint_weight_set(conformant, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-       elm_win_resize_object_add(win, conformant);
-*/
+
        priv = (clock_view_priv_data *)calloc(1, sizeof(clock_view_priv_data));
        if (!priv) {
                _ERR("Calloc failed.");
@@ -337,10 +332,7 @@ static Evas_Object *_create(Evas_Object *win, void *data)
        priv->win = win;
        priv->base = base;
        priv->conformant = conformant;
-/*
-       elm_object_content_set(conformant, priv->base);
-       evas_object_show(conformant);
-*/
+
        evas_object_smart_callback_add(priv->conformant, "virtualkeypad,state,on", _keypad_up_cb, priv);
        evas_object_smart_callback_add(priv->conformant, "virtualkeypad,state,off", _keypad_down_cb, priv);