Code cleaning(4) 43/148743/2
authorRadek Kintop <r.kintop@samsung.com>
Fri, 8 Sep 2017 15:44:02 +0000 (17:44 +0200)
committerRadek Kintop <r.kintop@samsung.com>
Mon, 11 Sep 2017 09:55:19 +0000 (11:55 +0200)
Change-Id: I5909fa72350e243b300a3981cce40740c0ed2df5
Signed-off-by: Radek Kintop <r.kintop@samsung.com>
38 files changed:
include/setting-debug.h
setting-about/include/setting-about-main.h
setting-about/include/setting-about.h
setting-about/src/setting-about-main.c
setting-about/src/setting-about-status.c
setting-applications/include/setting-applications-default-app.h
setting-applications/include/setting-applications-defaultapp.h
setting-applications/include/setting-applications-main.h
setting-applications/include/setting-applications.h
setting-applications/src/setting-applications-defaultapp.c
setting-applications/src/setting-applications-main.c
setting-applications/src/setting-applications.c
setting-appmgr/include/setting-appmgr-main.h
setting-appmgr/include/setting-appmgr-string.h
setting-appmgr/include/setting-appmgr-utils.h
setting-appmgr/include/setting-appmgr.h
setting-appmgr/src/setting-appmgr-async-worker.c
setting-appmgr/src/setting-appmgr-pkginfo.c
setting-appmgr/src/setting-appmgr-runinfo.c
setting-appmgr/src/setting-appmgr-utils.c
setting-appmgr/src/setting-appmgr.c
setting-common/CMakeLists.txt
setting-common/include/setting-cfg.h
setting-common/include/setting-common-data-slp-setting.h
setting-common/include/setting-common-general-func.h
setting-common/include/setting-common-init.h
setting-common/include/setting-common-resource.h
setting-common/include/setting-common-string.h
setting-common/src/setting-cfg.c
setting-common/src/setting-common-data-slp-setting.c
setting-common/src/setting-common-draw-genlist.c
setting-common/src/setting-common-draw-naviframe.c
setting-common/src/setting-common-draw-popup.c
setting-common/src/setting-common-draw-searchbar.c
setting-common/src/setting-common-draw-widget.c
setting-common/src/setting-common-general-func.c
setting-common/src/setting-common-view.c
setting-profile/src/setting-profile-common.c

index dcfa62e024e444f228e763db09ce358b6dc1ea77..3d183d40e96b5b6cea426fccb901eb715defd159 100755 (executable)
 
 #ifndef _SETTING_DEBUG_H_
 #define _SETTING_DEBUG_H_
-#include <stdio.h>
+
 #include <glib.h>
 
-/*#define DEBUG_CODE */
 #define SETTING_USING_PLATFORM_DBG
 #ifdef SETTING_USING_PLATFORM_DBG
 #include <dlog.h>
@@ -40,9 +39,6 @@
 #define LOG_TAG "SETTING"
 #endif
 
-/*#define LAUNCHING_DEBUG_LOG */
-
-
 #define USE_TIMER_UPDATE_TIME_IN_TIME_VIEW
 
 #define SECURITY_SERVER                        1
 
 /* Genlist Update is in progress. */
 
-
-/*##menu options##*/
-#define SUPPORT_FONT                   1
-#define SUPPORT_WALLPAPER              0
-
-#define SUPPORT_ACCESSIBILITY          1
-
 #define SUPPORT_STORAGE                        1
-#define SUPPORT_WIFI_DIRECT            1
-#define SUPPORT_DATA_USAGE             1
 #define SUPPORT_TETHERING              0
 
 /*#endif*/
 #define SUPPORT_SIMLOCK 0
 #define SUPPORT_FDN 0
 #define SUPPORT_ENCRYPTION 0
-#define SUPPORT_SD_ENCRYPTION 0
-#define SUPPORT_SCREEN_SECURITY 1
-
-#define SUPPORT_SECURITY_FIREWALL 1
-#define SUPPORT_PRIVACY 1
 
 #define SETTING_ENABLE_TRACE
 
        } \
 } while (0)
 
-#define UNUSED __attribute__((unused))
-
 #endif /* _SETTING_DEBUG_H_ */
index b38eb927d50ed5a6f762b658139e7b13323f475d..b66d249f97f9900c9a8e58abcc8b1ee88942c87a 100644 (file)
 #ifndef __SETTING_ABOUT_MAIN_H__
 #define __SETTING_ABOUT_MAIN_H__
 
-#include <setting-about.h>
+#include "setting-about.h"
 
 #define SUPPORT_FOTA
 
 #define SETTING_ABOUT_POWER_SUPPLY_PATH "/sys/class/power_supply"
 #define SETTING_ABOUT_STAT_PATH "/proc/stat"
 
-#define SETTING_ABOUT_DEVICE_NAME_STR "IDS_ST_BODY_NAME"
-#define SETTING_ABOUT_IMEI_STR "IDS_ST_BODY_IMEI"
-#define SETTING_ABOUT_SN_STR "IDS_ST_BODY_SERIAL_NUMBER"
-#define SETTING_ABOUT_CPU_USAGE_STR "IDS_ST_BODY_CPU_USAGE"
-
 #endif                         /* __SETTING_ABOUT_MAIN_H__ */
index 69a5c05b94efc43b6924d70f9f93e9c763e0cf00..900d67d239199eb603bc07faf83450b8b5dfdafc 100644 (file)
@@ -36,8 +36,6 @@
 
 #include <telephony.h>
 #include <Elementary.h>
-#include <glib-object.h>
-#include <storage.h>
 #include <system_info.h>
 
 #include "setting-common-init.h"
 #define SETTING_ABOUT_MOBILE_AP_TURNED_OFF "IDS_ST_POP_DISABLE_TETHERING_Q"
 #define SETTING_ABOUT_WIFI_MAC_STR_LEN 17
 
-typedef struct _SettingAbout SettingAbout;
-
 /**
  * Setting About context
  */
-struct _SettingAbout {
+typedef struct {
        MainData md;
 
        bool pause_flag;
@@ -74,9 +70,8 @@ struct _SettingAbout {
        Setting_GenGroupItem_Data *item_dev_name;
        Setting_GenGroupItem_Data *item_dev_name_main;
 
-       Setting_GenGroupItem_Data *item_data_my_phone_number;
        Setting_GenGroupItem_Data *item_data_bt;
-       Setting_GenGroupItem_Data *item_data_wifi;
+
        Setting_GenGroupItem_Data *item_data_storage;
        Setting_GenGroupItem_Data *item_data_battery;
        Setting_GenGroupItem_Data *item_data_cpu;
@@ -94,7 +89,7 @@ struct _SettingAbout {
 
        Ecore_Event_Handler *event_handler;
        Ecore_Idler *name_update_idler;
-};
+} SettingAbout;
 
 extern setting_view setting_view_about_main;
 extern void setting_about_main_get_wifi_mac_address_string(char *str, int size);
index d91cce47fc6ca990fbd80232377b1ac8ba756529..e35316a9abd5e625ec077f82f007a7acf196f5b2 100755 (executable)
  *
  */
 
-#include <app_control.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
 #include <app_manager.h>
 #include <efl_extension.h>
-#include <telephony.h>
 #include <runtime_info.h>
 
 #include "setting-about-main.h"
@@ -1082,7 +1077,7 @@ static void __creat_name_view(void *data)
                        NULL,
                        ad,
                        SWALLOW_Type_LAYOUT_EDITFIELD,
-                       SETTING_ABOUT_DEVICE_NAME_STR,
+                       "IDS_ST_BODY_NAME",
                        pa_sub_desc,
                        __entry_device_name_changed_cb,
                        __entry_focused,
@@ -1212,7 +1207,7 @@ static void __mouse_up_Gendial_list_cb(void *data, Evas_Object *obj,
 
                app_launcher("org.tizen.oma-dm", NULL, NULL);
 #endif
-       } else if (!safeStrCmp(SETTING_ABOUT_DEVICE_NAME_STR,
+       } else if (!safeStrCmp("IDS_ST_BODY_NAME",
                        list_item->keyStr)) {
                __creat_name_view(data);
        } else if (!safeStrCmp(ITEM_NAME_STATUS,
@@ -1368,7 +1363,7 @@ static int __generate_genlist(void *data)
                        ad->md.genlist, &(ad->itc_2text_2),
                        __mouse_up_Gendial_list_cb, ad,
                        SWALLOW_Type_INVALID, NULL,
-                       NULL, 0, SETTING_ABOUT_DEVICE_NAME_STR, pa_sub_desc,
+                       NULL, 0, "IDS_ST_BODY_NAME", pa_sub_desc,
                        NULL);
        __BACK_POINTER_SET(ad->item_dev_name_main);
        if (!ad->item_dev_name_main)
@@ -1531,9 +1526,6 @@ static int _view_destroy(void *cb)
        if (ret != 0)
                SETTING_TRACE_ERROR("call vconf_ignore_key_changed failed");
 
-       ecore_idler_del(ad->update_idler);
-       ad->update_idler = NULL;
-
        ecore_idler_del(ad->idler_add_popup);
        ad->idler_add_popup = NULL;
 
index bddf2dfbc0db4860ae6c5ef5f065faa7e8d8ad05..ba8a5e67a1193c84b67d56a2df0402e1e2859614 100644 (file)
  * limitations under the License.
  *
  */
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/statvfs.h>
+
 #include <fcntl.h>
-#include <telephony.h>
+#include <storage.h>
 #include <bluetooth.h>
 #include <wifi-manager.h>
 
index 3b9c6ac44bca11fb5d10b95fe826ca04a8e817f8..c5d9dad13edf2ae7dc09cb87000edccd3b88ca60 100644 (file)
 #ifndef __SETTING_APPLICATIONS_DEFAULT_APP_MAIN_H__
 #define __SETTING_APPLICATIONS_DEFAULT_APP_MAIN_H__
 
-#include <setting-applications.h>
+#include "setting-applications.h"
 
 static void setting_applications_defaultapp_mouse_up_Gendial_list_cb(
                void *data, Evas_Object *obj, void *event_info);
 static Eina_Bool setting_applications_defaultapp_click_softkey_back_cb(
                void *data, Evas_Object *obj, void *event_info);
-#ifdef UNUSED_VCONFKEY
-static void setting_applications_defaultapp_launch_image_chk_btn_cb(
-               void *data, Evas_Object *obj, void *event_info);
-#endif
 
 #endif                 /* __SETTING_APPLICATIONS_DEFAULT_APP_MAIN_H__ */
index 002249abeb98ac09f8f5fad7a5d85dfda8490f46..26e812a834b3bb153db42e8478ad51c3ca8cdc5c 100644 (file)
 #ifndef __SETTING_APPLICATIONS_DEFAULTAPP_H__
 #define __SETTING_APPLICATIONS_DEFAULTAPP_H__
 
-#include <setting-applications.h>
+#include "setting-applications.h"
 #define SUPPORT_CENTER_POINT 0
 
-#define KeyStr_Brightness_Adjust "IDS_ST_BODY_ADJUST_BRIGHTNESS_LEVEL"
-#define KeyStr_Brightness_Auto_Adjust "IDS_ST_BODY_ADJUST_AUTOMATIC_BRIGHTNESS"
-#define KeyStr_Brightness_Overheating \
-       "IDS_ST_BODY_TO_AVOID_OVERHEATING_MAXIMUM_BRIGHTNESS_HAS_BEEN_REDUCED"
 #define MGRAPP_STR_LAUNCH_BY_DEFAULT "IDS_ST_BODY_LAUNCH_BY_DEFAULT"
 #define MGRAPP_STR_CLEAR_DEFAULT "IDS_ST_BODY_CLEAR_DEFAULTS"
 #define MGRAPP_STR_DEFAULT_NO_APPS "IDS_ST_BODY_THERE_ARE_NO_APPS_SET_AS_DEFAULTS"
index 594d06941d8c5942850c0c61a11e32859a2294ce..dfdd91a812edb2479f3b45d40dc679f2f3009f11 100644 (file)
 #ifndef __SETTING_APPLICATIONS_MAIN_H__
 #define __SETTING_APPLICATIONS_MAIN_H__
 
-#include <setting-applications.h>
-
-#ifdef UNUSED_VCONFKEY
-static void setting_applications_main_launch_image_chk_btn_cb(
-               void *data, Evas_Object *obj, void *event_info);
-#endif
+#include "setting-applications.h"
 
 #endif                         /* __SETTING_APPLICATIONS_MAIN_H__ */
index c179bbced23b41a99c19d3cbbbaba96dd2d6d732..3ab66f2262148b0e9ad2321b508db6e83a18d97c 100644 (file)
@@ -25,7 +25,6 @@
 #ifndef __SETTING_APPLICATION_H__
 #define __SETTING_APPLICATION_H__
 
-#include <glib.h>
 #include <Elementary.h>
 
 #include "setting-common-draw-widget.h"
 
 #define SAFE_STRDUP(src) (src) ? strdup(src) : NULL
 
-#define Keystr_Clear           "Clear"
-
-typedef struct _SettingApplications SettingApplications;
-
 /**
  * Setting Applications context
  */
-struct _SettingApplications {
+typedef struct {
        MainData md;
        setting_view *view_to_load;
 
@@ -58,12 +53,12 @@ struct _SettingApplications {
        Elm_Genlist_Item_Class itc_1icon_1button;
 
        Eina_List *pkg_list;
-};
+} SettingApplications;
 
 extern setting_view setting_view_applications_main;
 extern setting_view setting_view_applications_defaultapp;
 
-typedef struct _default_app {
+typedef struct {
        Elm_Object_Item *item;
        int defapp;
        char *pkgid;
index 71a9dfc41640cfb5e1c0420f528947573b67c0a0..54568cad753cfeb015215436dbd956c775e79b6d 100755 (executable)
@@ -20,7 +20,6 @@
  */
 
 #include "setting-applications-defaultapp.h"
-
 #include <aul_svc.h>
 #include <pkgmgr-info.h>
 
index 23edd948529fc88e048d1aa45258f1abfa9e9e50..87c6ea29d1ab2bf006012a55ebf69f71b05e9b3d 100755 (executable)
@@ -18,8 +18,8 @@
  * limitations under the License.
  *
  */
-#include <setting-applications-main.h>
-#include <setting-common-draw-widget.h>
+#include "setting-applications-main.h"
+#include "setting-common-draw-widget.h"
 
 static void _list_item_click_cb(void *data, Evas_Object *obj,
                void *event_info);
index 351690408841becfe01a42456c9143db8bddec76..f72a05fbf04850afeedf66d653e19e2a24e8a6e5 100644 (file)
 #include "setting-cfg.h"
 
 #define SETTING_APPLICATIONS_PACKAGE_NAME "org.tizen.setting-applications"
-#define SETTING_BRIGHTNESS_DEFAULT_LEVEL 60
 
-/**
- * view selection by service variable
- *
- * viewtype == 'brightness' --> setting_view_applications_brightness
- * viewtype != NULL && viewtype --> setting_view_applications_main
- */
 static setting_view *__get_applications_view_to_load(void *data)
 {
        setting_retvm_if((!data), NULL, "!data");
@@ -144,7 +137,7 @@ static Evas_Object *_gl_1button1_icon_get(void *data, Evas_Object *obj,
                Evas_Object *button = NULL;
 
                button = elm_button_add(obj);
-               elm_object_text_set(button, Keystr_Clear);
+               elm_object_text_set(button, "Clear");
                evas_object_size_hint_align_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL);
                evas_object_size_hint_min_set(button, 160, 60);
                evas_object_size_hint_max_set(button, 160, 60);
index aa1ccf8b59c44f0799215b49000f18109019ca35..66066f3598a5f0baaf7d8bc794abacacf57b5413 100644 (file)
@@ -22,7 +22,6 @@
 #include "setting-appmgr.h"
 
 void appmgr_main_init(SettingAppMgr *ad);
-void appmgr_main_fill_all_lists(SettingAppMgr *ad);
 
 Evas_Object *main_genlist_item_content_get(void *data, Evas_Object *genlist,
                const char *part);
index 140888c2105057b90b5899e118bacade578906b2..ef68f34e336bc728ef951b2deeb708ee02860f3b 100644 (file)
 #define APPMGR_MAX_STR_LEN 64
 
 /*system string */
-#define MGRAPP_STR_ERROR "IDS_ST_POP_ERROR"
 #define MGRAPP_STR_CANCEL "IDS_ST_BUTTON_CANCEL_ABB"
 #define MGRAPP_STR_SIZE "IDS_ST_BODY_SIZE"
 #define MGRAPP_STR_SORT_BY "IDS_ST_HEADER_SORT_BY"
 #define MGRAPP_STR_ALL "IDS_ST_BODY_ALL"
-#define MGRAPP_STR_BACK "IDS_ST_BUTTON_BACK"
 #define MGRAPP_STR_OK "IDS_ST_BUTTON_OK"
 #define MGRAPP_STR_STOP "IDS_ST_BUTTON_STOP"
 #define MGRAPP_STR_ENABLE_ALL "Enable all apps"
 /*package string */
 #define MGRAPP_STR_RUNNING "IDS_ST_BODY_RUNNING"
 #define MGRAPP_STR_DOWNLOADS "IDS_ST_BODY_DOWNLOADS"
-#define MGRAPP_STR_CLEAR_DEFAULT_APPS "IDS_ST_BUTTON_REMOVE_DEFAULT_APPS_ABB"
-#define MGRAPP_STR_CLEAR_DEFAULT_APPS_Q "IDS_ST_POP_REMOVE_DEFAULT_APPS_Q"
-#define MGRAPP_STR_CLEAR_DEFAULT_POPUP_TITLE "Clear default app settings"
-#define MGRAPP_STR_DEFAULT_CLEAR_TEXT "To clear default app settings, go to \
-       Settings > Apps > Default apps, then tap Clear"
 
-
-#define MGRAPP_STR_UNINSTALLING "IDS_ST_POP_UNINSTALLING_ING"
-#define MGRAPP_STR_UNINSTALL "IDS_ST_BUTTON_UNINSTALL"
 #define MGRAPP_STR_KB "IDS_ST_BODY_KB"
 #define MGRAPP_STR_MB "IDS_ST_BODY_MB"
 #define MGRAPP_STR_GB "IDS_ST_BODY_GB"
-#define MGRAPP_STR_CLEAR_DEFAULTS "IDS_ST_BODY_CLEAR_DEFAULTS"
-#define MGRAPP_STR_DEFAULT_DESC \
-       "IDS_ST_BODY_YOU_HAVE_SELECTED_TO_LAUNCH_THIS_APPLICATION_BY_DEFAULT_"\
-       "FOR_SOME_ACTIONS"
-
-#define MGRAPP_STR_RESET_APPS "IDS_ST_BUTTON_RESET_APPS_ABB"
 
 #define MGRAPP_STR_A_TO_Z "IDS_MF_OPT_NAME_HA_TO_Z"
 #define MGRAPP_STR_Z_TO_A "IDS_MF_OPT_NAME_HZ_TO_A"
 
 #define MGRAPP_STR_APPLICATION_INFO "IDS_ST_BODY_APPLICATION_INFO"
-#define MGRAPP_STR_MOVE_TO_SD "IDS_ST_BUTTON_MOVE_TO_SD_ABB"
-#define MGRAPP_STR_MOVE_TO_PHONE "IDS_ST_BUTTON_MOVE_TO_PHONE"
-#define MGRAPP_STR_SD_FULL "IDS_MSGC_POP_YOUR_SD_CARD_IS_FULL"
 #define MGRAPP_STR_MOVE_FAIL "IDS_EMAIL_POP_FAILED_TO_MOVE"
-#define MGRAPP_STR_NO_MEM "IDS_MSGC_BODY_NOT_ENOUGH_MEMORY_IN_PHONE_MEMORY_"\
-       "DELETE_SOME_ITEMS_AND_TRY_AGAIN"
 #define MGRAPP_STR_MOVING "IDS_PB_BODY_MOVING_ING"
-#define MGRAPP_STR_UNINSTALL_MSG "IDS_ST_POP_UNINSTALL_Q"
-#define MGRAPP_STR_UNINSTALL_COMPLETE "IDS_ST_POP_THE_APP_HAS_BEEN_UNINSTALLED"
-#define MGRAPP_STR_UNINSTALL_FAILED "IDS_ST_POP_FAILED_TO_UNINSTALL_THE_APP"
 #define MGRAPP_STR_APP_STOP_MSG "IDS_ST_BODY_THE_APPLICATIONS_BELOW_WERE_"\
        "STARTED_BY_PS_STOPPING_THESE_APPLICATIONS_MAY_CAUSE_PS_TO_FAIL"
-#define MAGAPP_STR_WEB_SETTING "IDS_BR_BODY_WEBSITE_SETTINGS"
-#define MGRAPP_STR_MOVE_COMPLETED "IDS_PB_POP_MOVE_COMPLETED"
-#define MGRAPP_STR_UNINSTALL_UPDATES "IDS_ST_BUTTON_UNINSTALL_UPDATES"
 
-#define MGRAPP_STR_FORCE_STOP "IDS_ST_BUTTON_FORCE_STOP"
 
 #define MGRAPP_STR_ACTIVE_APP "IDS_ST_MBODY_ACTIVE_APPLICATION"
 #define MGRAPP_STR_ACTIVE_APPS_N "IDS_TASKMGR_BODY_ACTIVE_APPLICATIONS_C_PD"
 #define MGRAPP_STR_APPS "IDS_ST_BODY_APPLICATIONS"
 #define MGRAPP_STR_VERSION_STR "IDS_ST_BODY_VERSION_PS"
 #define MGRAPP_STR_COMPUTING "IDS_ST_BODY_COMPUTING_ING"
-#define MGRAPP_STR_NO_APPS "IDS_FP_BODY_NO_APPLICATIONS"
 #define MGRAPP_STR_NO_DOWNLOAD_APPS_HELP "IDS_ST_BODY_AFTER_YOU_DOWNLOAD_AND_"\
        "INSTALL_APPLICATIONS_APPLICATIONS_WILL_BE_SHOWN_HERE"
-#define MGRAPP_STR_NO_RUNNING_APP "IDS_TASK_BODY_NO_RUNNING_APPLICATION"
-#define MGRAPP_STR_CHECKING "IDS_COM_POP_CHECKING"
+
 #define MGRAPP_STR_LOADING "IDS_ST_POP_LOADING_ING"
 
-#define MGRAPP_STR_CLEAR_CACHE "IDS_TASKMGR_BUTTON_CLEAR_CACHE"
 
 #endif /*__SETTING_APPMGR_STRING_H__ */
index a5187af00a2872c78c97ad070d1a8bebc9b16a86..57bdb7d067d3d99343d37555e0b8bb3253ae6ca3 100644 (file)
@@ -19,8 +19,6 @@
 #ifndef __SETTING_APPMGR_UTILS_H__
 #define __SETTING_APPMGR_UTILS_H__
 
-#include <pkgmgr-info.h>
-
 #include "setting-appmgr.h"
 
 enum {
index 20c454ae3ac4ccf06122e1dbe3381c35b210cd22..4cbbc35f60b0ce46f67ad38138704fb0746d1d6a 100755 (executable)
@@ -44,7 +44,7 @@ enum {
        APPMGR_TAB_MAX
 };
 
-typedef struct _SettingAppMgr_PkgInfo {
+typedef struct {
        char *id;
        char *icon;
        char *label;
@@ -65,7 +65,7 @@ typedef struct _SettingAppMgr_PkgInfo {
        Eina_List *apps_in_package; /* [char *] data type */
 } SettingAppMgr_PkgInfo;
 
-typedef struct _SettingAppMgr_AppInfo {
+typedef struct {
        char *id;
        char *pkg_id; /* Package id this app belongs to */
        package_info_h package_info; /* Package info this app belongs to */
index 5f81ac3dd692b921ff62791a7a66c8b1cce4a2f9..71fdcdcf37be47d67eb3d7c8517e167ad47baa69 100644 (file)
@@ -17,7 +17,6 @@
  *
  */
 #include <glib.h>
-#include <pthread.h>
 
 #include "setting-appmgr-async-worker.h"
 
index 8df93073880919a408e94148574874d7ae49e4ed..bd82805bce576d1c68a76e7606ed321fd3c733b6 100755 (executable)
@@ -20,6 +20,7 @@
 #include <aul_svc.h>
 #include <package_manager.h>
 #include <privilege_info.h>
+#include <pkgmgr-info.h>
 #include <privilege_information.h>
 #include <efl_extension.h>
 
@@ -848,7 +849,7 @@ static int _get_privilege_detail_cb(const char *privilege, void *user_data)
        return 0;
 }
 
-UNUSED
+__attribute__((unused))
 static void _package_move_finished(int id, const char *type,
                const char *package, package_manager_event_type_e event_type,
                package_manager_event_state_e event_state, int progress,
index 2efa5d78705aa3a3c9c03ee5d86a62812dc43ac0..a2f1a640f02832072228716ce5bf6c11ff094a5c 100755 (executable)
@@ -17,7 +17,7 @@
  *
  */
 #include <app_manager.h>
-
+#include <pkgmgr-info.h>
 #include "setting-appmgr-utils.h"
 #include "setting-appmgr-runinfo.h"
 
index 0b7d5a0e4bce24bd1165f9969f839a2fd0db35ff..1c02706d69d7c77aadcc7bf0475db4f5cef2aeab 100755 (executable)
@@ -20,7 +20,7 @@
 #include <app_manager.h>
 #include <package_manager.h>
 #include <runtime_info.h>
-
+#include <pkgmgr-info.h>
 #include "setting-appmgr-main.h"
 #include "setting-appmgr-runinfo.h"
 #include "setting-appmgr-pkginfo-utils.h"
index e7841d0302a416b3510abf4af62f4acefc76ff28..54a523efc25243d9dc5ddac7d1f0efbf4585fe90 100644 (file)
@@ -18,7 +18,7 @@
  */
 
 #include <efl_extension.h>
-#include <setting-cfg.h>
+#include "setting-cfg.h"
 #include <storage.h>
 
 #include "setting-appmgr-pkginfo.h"
index f1da308dcf439ac8feedf70469960066b5df9dc5..607cdb5543c80e974f7d4c0031e7be12259de6e3 100755 (executable)
@@ -8,13 +8,9 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs_common_data REQUIRED
-       capi-appfw-application
-       capi-media-sound-manager
-       capi-system-info
        capi-system-system-settings
        efl-extension
        elementary
-       glib-2.0
        json-glib-1.0
        libtzplatform-config
        notification
index 2c94b0947fbd8d936ea8c519ff611bd845d00a59..a511685233b639f76baf4f85eaaaef3efdd2cded 100644 (file)
 #ifndef __SETTING_CFG_H__
 #define __SETTING_CFG_H__
 
-#include <glib.h>
 #include "setting-common-resource.h"
 #include <app.h>
-#include <app_common.h>
 
 /*****/
 typedef enum _Cfg_Item_Position_Type {
index 16be0d095e876238f0c1f39e63ff88f8093f07ee..10d77d4fba8513a086fa2ffe0b0997ef962bc063 100644 (file)
@@ -24,7 +24,7 @@
 #define __SETTING_COMMON_DATA_SLP_SETTING_H__
 
 #include <vconf.h>
-#include <setting-common-general-func.h>
+#include "setting-common-general-func.h"
 
 #define LANGLIST_FILE_PATH \
        _TZ_SYS_RO_APP"/org.tizen.setting/def_config/langlist.xml"
index 131d0bf94b21035ec0f60da6970afa94ac5e9d25..da4b99e0a4ab80544ba5b331c2583f14497e0ec4 100755 (executable)
 #ifndef __SETTING_COMMON_GENERAL_FUNC_H__
 #define __SETTING_COMMON_GENERAL_FUNC_H__
 
-#ifdef _
-#undef _
-#undef N_
-#undef S_
-#endif
-
-
 #define EXPORT_PUBLIC __attribute__((visibility("default")))
 
-#ifdef _
-#undef _
-#undef N_
-#undef S_
-#endif
-
 #include "setting-common-data-type.h"
-#include <regex.h>
-
-#ifndef _EDJ
-#define _EDJ(o)                                   elm_layout_edje_get(o)
-#endif
 
 #define SETTING_FILE_NAME_PATTERN      "[\\<>:;*\"|?/]"
 
index 7c128a5486cc5295c2d91f55f78cf61b2eef42bb..f67b19663acb45c88aa340e56f2a9c82efafa75e 100644 (file)
@@ -20,7 +20,7 @@
 #include <Elementary.h>
 #include <app_control.h>
 
-typedef struct _MainData {
+typedef struct {
        Evas *evas;
        Evas_Object *window;
        Evas_Object *conform;
index a1eea80955d0f929baaf9eff50a21ba9a2ad18c7..e6c5baaa97cbaf5c8f8ee783d3a77373d501a357 100755 (executable)
@@ -37,6 +37,8 @@
        SETTING_LIST_ICON_PATH_CFG"settings_sound_and_notifications.png"
 #define IMG_Display SETTING_LIST_ICON_PATH_CFG"settings_display.png"
 #define IMG_Applications SETTING_LIST_ICON_PATH_CFG"settings_applications.png"
+#define IMG_NFC SETTING_LIST_ICON_PATH_CFG"settings_nfc_and_payment.png"
+#define IMG_Tizenconnect SETTING_LIST_ICON_PATH_CFG"settings_convergence.png"
 
 /* Personal IMG */
 #define IMG_Wallpaper  SETTING_LIST_ICON_PATH_CFG"settings_wallpapers.png"
index e390bbfee9f27f193165594e414d740e69ba9872..4be750d50efa296852a382507471a931c24c29b2 100755 (executable)
@@ -27,7 +27,7 @@
 #ifndef __SETTING_COMMON_STRING_H__
 #define __SETTING_COMMON_STRING_H__
 
-#include <setting-common-po-string.h>
+#include "setting-common-po-string.h"
 
 #define EXCEED_LIMITATION_STR "IDS_ST_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
 
@@ -55,6 +55,7 @@
 #define KeyStr_DataRoaming     "IDS_ST_BODY_DATA_ROAMING"
 #define KeyStr_UseMobileData   "IDS_ST_MBODY_MOBILE_DATA"
 #define KeyStr_DeveloperOption "IDS_ST_BODY_DEVELOPER_OPTIONS"
+#define KeyStr_NFC "IDS_ST_BODY_NFC"
 
 #ifdef USE_TIZEN_CONNECT
 #define KeyStr_Tizenconnect    "IDS_ST_HEADER_TIZEN_CONNECT"
 #define KeyStr_Backlight_10_MIN_STR    "IDS_ST_BODY_10_MINUTES"
 
 #define KeyStr_DateTime                        "IDS_ST_BODY_DATE_AND_TIME"
-#define KeyStr_VoiceInOut              "IDS_ST_BODY_VOICE"
 #define KeyStr_LanguageInput           "IDS_ST_HEADER_LANGUAGE_AND_INPUT"
 #define KeyStr_Battery         "IDS_ST_BODY_BATTERY"
 #define KeyStr_FlightMode      "IDS_ST_BODY_FLIGHT_MODE"
 #define KeyStr_MobileNetworks  "IDS_ST_BODY_MOBILE_NETWORKS"
-#define KeyStr_LanguageRegion          "IDS_ST_BODY_LANGUAGE_AND_REGION_ABB"
-#define KeyStr_License                 "IDS_ST_BODY_LICENCE"
-#define KeyStr_EventsNotifications     "IDS_CLD_HEADER_EVENT_NOTIFICATION"
-#define KeyStr_Security                        "IDS_ST_BODY_SECURITY"
-#define KeyStr_Memory                  "IDS_ST_BODY_MEMORY"
 #define KeyStr_Reset                   "IDS_ST_BUTTON_RESET"
 #define KeyStr_AboutDevice             "IDS_ST_BODY_ABOUT_DEVICE"
-#define KeyStr_MenuWidgets             "IDS_ST_BODY_MENU_AND_WIDGETS"
 #define KeyStr_Accessibility           "IDS_ST_BODY_ACCESSIBILITY"
 
 #define KeyStr_Accounts                        "IDS_ST_BODY_ACCOUNTS"
index 51982b1337f5b082637cc2c35f4135a04dcc4eea..7b64022e3058c0594899ca799c1354843d43389d 100755 (executable)
@@ -215,7 +215,7 @@ static Setting_Cfg_Node_T s_cfg_node_array[] = {
                Cfg_Item_Pos_Level0,
                Cfg_Item_unResetable,
                0,
-               Cfg_Item_Ug_Node_Toggle,
+               Cfg_Item_AppLauncher_Node,
                NULL,
                KeyStr_Connections,
                &nfc_tfunc,
index a44f94b348ea110ca56b0910a8442e867086e6db..1dbd38b7fc9bc5d26ee67ebfb0fa390be18f0d56 100755 (executable)
  * limitations under the License.
  *
  */
-#include <setting-common-data-slp-setting.h>
+#include "setting-common-data-slp-setting.h"
 #include <Elementary.h>
-#include <stdio.h>
-#include <string.h>
 #include <openssl/sha.h>
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#include <stdlib.h>
-#include <libxml/xmlmemory.h>
-#include <libxml/parser.h>
 #include <libxml/tree.h>
-#include <glib.h>
-
-#include <glib.h>
 #include <json-glib/json-glib.h>
 
 #define SETTING_DATA_DIR_PATH _TZ_SYS_RW_APP"/org.tizen.setting/data/"
 #define SETTING_CFG_JSON_FILE_PATH     SETTING_DATA_DIR_PATH"exported.json"
-#define EXPORT_FILE            SETTING_DATA_DIR_PATH"setting_export.xml"
 
 typedef enum {
        eBOOL, eINT, eSTRING,
index 91d7ab5d0178e25518b81aac2c21cc99c480e6bc..ccb997c0a42b6d2d72885efaff1359612dfe67de 100644 (file)
  * limitations under the License.
  *
  */
-#include <setting-common-draw-widget.h>
-#include <glib.h>
-#include <system_settings.h>
-#include <efl_extension.h>
-#include <setting-debug.h>
-#include <utils_i18n.h>
 
-#include <time.h>
+#include "setting-common-draw-widget.h"
+#include "setting-debug.h"
+#include <utils_i18n.h>
 
 #define DEF_BUF_SIZE 32
 
@@ -1166,8 +1162,6 @@ static Evas_Object *__add_entry_without_layout(
                }
        }
 
-       /*SETTING_TRACE("item_data->stop_change_cb:%p",
-        * item_data->stop_change_cb); */
        if (item_data->stop_change_cb) {/*invoked when stop focusing on */
                evas_object_smart_callback_add(entry, "unfocused",
                                item_data->stop_change_cb, item_data);
@@ -1215,8 +1209,6 @@ static Evas_Object *__add_entry_without_layout(
                                item_data->activated_cb, item_data);
        }
 
-       /*SETTING_TRACE("item_data->focus_cb:%p", item_data->focus_cb); */
-
        if (item_data->focus_cb) {
                evas_object_smart_callback_add(entry, "focused",
                                item_data->focus_cb, item_data);
@@ -1225,9 +1217,6 @@ static Evas_Object *__add_entry_without_layout(
                                __entry_without_layout_focused_cb, item_data);
        }
 
-       /*elm_object_signal_callback_add(ed_name, "elm,eraser,clicked", "elm",
-        * __eraser_clicked, entry); */
-
        if (item_data->start_change_cb) {
                evas_object_event_callback_add(entry, EVAS_CALLBACK_KEY_DOWN,
                                (Evas_Object_Event_Cb)(
@@ -1697,8 +1686,7 @@ Setting_GenGroupItem_Data *setting_create_Gendial_exp_parent_field(
        item_data->keyStr = (char *)g_strdup(keyStr);
        item_data->sub_desc = (char *)g_strdup(sub_desc);
        item_data->swallow_type = swallow_type;
-       /*item_data->r_swallow_path = (char *)g_strdup(
-        * SETTING_IMAGE_PATH_CFG"00_list_button_expand_closed.png"); */
+
        if (itc && itc->item_style)
                item_data->itc = (char *)g_strdup(itc->item_style);
 
@@ -1780,13 +1768,10 @@ void setting_enable_expandable_genlist(Evas_Object *genlist, void *data,
 EXPORT_PUBLIC
 void __gl_realized_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       /*SETTING_TRACE_BEGIN; */
        setting_retm_if(event_info == NULL,
                        "invalid parameter: event_info is NULL");
        Elm_Object_Item *item = (Elm_Object_Item *)event_info;
 
-       /*? Setting_GenGroupItem_Data *list_item =
-        * (Setting_GenGroupItem_Data *) */
        elm_object_item_data_get(item);
 }
 
@@ -1798,8 +1783,6 @@ void setting_update_gl_item_chk_status(Setting_GenGroupItem_Data *item_data,
        if (item_data && item_data->chk_status != status) {
                item_data->chk_status = status;
                if (item_data->item) {
-                       /*SETTING_TRACE_DEBUG("update item %d",
-                        * item_data->chk_status); */
                        elm_genlist_item_fields_update(item_data->item, "*",
                                        ELM_GENLIST_ITEM_FIELD_CONTENT);
                }
index c49657cb97897b8a3122be5e6cf791c66f54b38f..5e8a7a64ff3fdb594cd52079a35af758c2884888 100644 (file)
@@ -18,7 +18,7 @@
  * limitations under the License.
  *
  */
-#include <glib.h>
+
 #include <Elementary.h>
 #include <efl_extension.h>
 #include "setting-common-draw-widget.h"
@@ -27,7 +27,7 @@ EXPORT_PUBLIC
 void setting_navi_items_update(Evas_Object *naviframe)
 {
        SETTING_TRACE_BEGIN;
-       /*setting_retm_if(NULL == key, "key is NULL"); */
+
        setting_retm_if(NULL == naviframe, "data is NULL");
        Eina_List *list = elm_naviframe_items_get(naviframe);
        Evas_Object *eo_view = NULL;
@@ -165,8 +165,6 @@ Evas_Object *__create_naviframe(Evas_Object *layout)
        eext_object_event_callback_add(navi, EEXT_CALLBACK_MORE,
                        eext_naviframe_more_cb, NULL);
 
-       /*elm_object_item_signal_callback_event(navi */
-
        if (navi == NULL) {
                SETTING_TRACE(" *** elm_naviframe_add returns NULL *** ");
                return NULL;
index 6efb8052d3ca29d7e1f163b826cd519ef1661bcd..b4c26574f0e0ac0e5217c7c384ef38783442c4f6 100644 (file)
@@ -19,8 +19,7 @@
  *
  */
 
-#include <setting-common-draw-widget.h>
-#include <glib.h>
+#include "setting-common-draw-widget.h"
 #include <efl_extension.h>
 #include <notification.h>
 #include <notification_internal.h>
index 6c1b7fecd4a0aa5c55a88af0635664e54c8be5ce..a1de2ff40126386e68523ae678fd6ab3aaf902a2 100755 (executable)
@@ -18,8 +18,7 @@
  * limitations under the License.
  *
  */
-#include <setting-common-draw-widget.h>
-#include <glib.h>
+#include "setting-common-draw-widget.h"
 #include <efl_extension.h>
 
 /**
@@ -39,7 +38,7 @@ int setting_searchbar_redraw(void *data, Evas_Object *search_bar,
        SETTING_TRACE_BEGIN;
        setting_retvm_if(search_bar == NULL, -1,
                        "search_bar parameter is NULL");
-       /*const char *str = elm_object_text_get(search_bar); */
+
        Evas_Object *entry = elm_object_part_content_get(search_bar,
                        "elm.swallow.content");
        const char *str = elm_entry_entry_get(entry);
@@ -88,7 +87,6 @@ static void __searchbar_focused_cb(void *data, Evas_Object *obj,
        }
        elm_object_signal_emit(searchbar_layout, "elm,state,guidetext,hide",
                        "elm");
-       /*elm_object_signal_emit(searchbar_layout, "cancel,in", ""); */
        elm_object_signal_emit(obj, "elm,state,focus,on", "");
 }
 
index b091d9e3eb304b0be8c02bd755fcd485273d3846..e4348936ca6c106a570c9c2bab24446ea8ad6f8e 100644 (file)
@@ -18,8 +18,7 @@
  * limitations under the License.
  *
  */
-#include <setting-common-draw-widget.h>
-#include <glib.h>
+#include "setting-common-draw-widget.h"
 #include <efl_extension.h>
 
 /**
index e305adfbbbc5102124b864b4efe40e2f97635193..119660037ae1722a91b2ce4dbf6880bf0b5b6af9 100755 (executable)
 #include "setting-common-general-func.h"
 #include "setting-common-data-slp-setting.h"
 
-#include <glib.h>
 #include <libxml/parser.h>
 #include <system_info.h>
-
 #include <system_settings.h>
-
 #include "setting-cfg.h"
 #include <pkgmgr-info.h>
 #include <app_control_internal.h>
@@ -267,8 +264,6 @@ EXPORT_PUBLIC
 char *get_pa_display_language_str()
 {
        int ret = SETTING_RETURN_FAIL;
-       /*int err; */
-       /*int index; */
        int lang_automatic;
 
        ret = vconf_get_bool(VCONFKEY_SETAPPL_LANG_AUTOMATIC_BOOL,
index 788238f70dd89ca5799d354656036f6dd3ab0f14..3a83847d3fa9f0d27feb9af81eeb747070a4d98f 100755 (executable)
  * limitations under the License.
  *
  */
-#include <setting-common-view.h>
+#include "setting-common-view.h"
 
 #include <Elementary.h>
 
-#include <setting-common-data-error.h>
-#include <setting-debug.h>
+#include "setting-common-data-error.h"
+#include "setting-debug.h"
 
 #define MAX_VIEWNODE_NUM       15
 typedef struct _SettingViewNode {
index d6b2ac26e972078a1deb99bb7b7f5717edb7422b..59ef9518167751b9c612dcc7be4a1f4a274f265b 100755 (executable)
@@ -673,7 +673,7 @@ static Evas_Object *__sound_slider_icon_get(void *data, Evas_Object *obj,
                 *                              (Max_Value - Min_Value) */
                msg->val[0] = 0.633333;
                edje_object_message_send(
-                               _EDJ(slider), EDJE_MESSAGE_FLOAT_SET, 0, msg);
+                               elm_layout_edje_get(slider), EDJE_MESSAGE_FLOAT_SET, 0, msg);
                elm_slider_indicator_format_set(slider, "%1.0f");
                elm_slider_indicator_show_set(slider, 1);
        }