From: Piotr Pruski Date: Mon, 29 Feb 2016 13:23:04 +0000 (+0100) Subject: Cleanup in headers files X-Git-Tag: accepted/tizen/tv/20160308.101500~15 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=691589e6bf93a13848eb842040bf0c7471fc53ac;p=profile%2Ftv%2Fapps%2Fnative%2Fair_settings.git Cleanup in headers files Change-Id: I38245b548200a815bf3c273dfefb4aa7cdfcb870 Signed-off-by: Piotr Pruski Signed-off-by: MyoungJune Park --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 4fa3f55..f5cb504 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,8 +62,32 @@ ENDIF(NOT DEFINED DESKTOP_ICON) SET(SRCS src/main.c - src/view/view_base.c - src/view/view_action_menu.c + src/common/datamgr.c + src/common/gridmgr.c + src/common/inputmgr.c + src/common/layoutmgr.c + src/common/listmgr.c + src/common/menumgr.c + src/common/utils.c + src/common/viewmgr.c + src/data/settings_picture.c + src/data/system/settings_clock.c + src/data/system/settings_language.c + src/data/system/settings_pincode.c + src/data/system/settings_wakeup_timer.c + src/data/system/data_location.c + src/data/system/data_wired.c + src/data/system/data_wireless.c + src/grid/grid_location.c + src/grid/grid_wireless.c + src/layout/layout_channel.c + src/layout/layout_info.c + src/layout/layout_network.c + src/layout/layout_picture.c + src/layout/layout_sound.c + src/layout/layout_support.c + src/layout/layout_system.c + src/layout/layout_voice.c src/view/common/view_generic_popup.c src/view/picture/view_picture_slider_generic.c src/view/picture/view_picture_mode.c @@ -74,40 +98,16 @@ SET(SRCS src/view/picture/view_picture_tint.c src/view/picture/view_picture_screen_adj.c src/view/system/view_clock.c - src/view/system/view_sleep_timer.c - src/view/system/view_wakeup_timer.c - src/view/system/view_pincode.c src/view/system/view_language.c - src/view/system/view_subtitle.c src/view/system/view_location.c + src/view/system/view_pincode.c src/view/system/view_reset.c + src/view/system/view_sleep_timer.c + src/view/system/view_subtitle.c + src/view/system/view_wakeup_timer.c + src/view/view_action_menu.c + src/view/view_base.c src/view/view_new_network.c - src/common/utils.c - src/common/viewmgr.c - src/common/layoutmgr.c - src/common/inputmgr.c - src/common/menumgr.c - src/common/listmgr.c - src/common/gridmgr.c - src/common/datamgr.c - src/layout/layout_picture.c - src/layout/layout_sound.c - src/layout/layout_channel.c - src/layout/layout_network.c - src/layout/layout_system.c - src/layout/layout_support.c - src/layout/layout_info.c - src/layout/layout_voice.c - src/grid/grid_location.c - src/grid/grid_wireless.c - src/data/settings_picture.c - src/data/system/settings_clock.c - src/data/system/settings_wakeup_timer.c - src/data/system/settings_pincode.c - src/data/system/settings_language.c - src/data/system/data_location.c - src/data/system/data_wireless.c - src/data/system/data_wired.c ) SET(TARGET_EDJ "${PROJECT_NAME}.edj") diff --git a/include/common/listmgr.h b/include/common/listmgr.h index 433002d..2d2a325 100644 --- a/include/common/listmgr.h +++ b/include/common/listmgr.h @@ -17,6 +17,8 @@ #ifndef __AIR_SETTINGS_LISTMGR_H__ #define __AIR_SETTINGS_LISTMGR_H__ +#include "common/gridmgr.h" + struct listmgr; struct listmgr *listmgr_create(Evas_Object *parent); diff --git a/include/define.h b/include/define.h index dc96655..651c1ac 100644 --- a/include/define.h +++ b/include/define.h @@ -17,13 +17,6 @@ #ifndef __AIR_SETTINGS_DEFINE_H__ #define __AIR_SETTINGS_DEFINE_H__ -#include "layout/channel.h" -#include "layout/support.h" -#include "layout/network.h" -#include "layout/picture.h" -#include "layout/system.h" -#include "layout/voice.h" - /* View ID */ #define VIEW_BASE "VIEW_BASE" diff --git a/res/settings-theme.edc b/res/settings-theme.edc index 1df6cb9..180d504 100644 --- a/res/settings-theme.edc +++ b/res/settings-theme.edc @@ -15,6 +15,12 @@ */ #include "../include/define.h" +#include "../include/layout/channel.h" +#include "../include/layout/support.h" +#include "../include/layout/network.h" +#include "../include/layout/picture.h" +#include "../include/layout/system.h" +#include "../include/layout/voice.h" collections { base_scale: APP_BASE_SCALE; diff --git a/res/settings.edc b/res/settings.edc index 9bcb303..88466e9 100644 --- a/res/settings.edc +++ b/res/settings.edc @@ -15,24 +15,30 @@ */ #include "../include/define.h" +#include "../include/layout/channel.h" +#include "../include/layout/support.h" +#include "../include/layout/network.h" +#include "../include/layout/picture.h" +#include "../include/layout/system.h" +#include "../include/layout/voice.h" collections { base_scale: APP_BASE_SCALE; - #include "view/base.edc" #include "view/action_menu.edc" + #include "view/base.edc" + #include "view/common/generic_slider_view.edc" #include "view/common/popup_2btns.edc" #include "view/common/popup_screen_adj.edc" - #include "view/common/generic_slider_view.edc" #include "view/system/clock.edc" - #include "view/system/sleep_timer.edc" - #include "view/system/wakeup_timer.edc" - #include "view/system/pin.edc" #include "view/system/location.edc" + #include "view/system/pin.edc" + #include "view/system/sleep_timer.edc" #include "view/system/reset.edc" - #include "layout/picture.edc" + #include "view/system/wakeup_timer.edc" #include "layout/channel.edc" - #include "layout/support.edc" #include "layout/network.edc" + #include "layout/picture.edc" + #include "layout/support.edc" #include "layout/system.edc" #include "layout/voice.edc" } diff --git a/src/grid/grid_location.c b/src/grid/grid_location.c index d0f46d5..ee523e3 100644 --- a/src/grid/grid_location.c +++ b/src/grid/grid_location.c @@ -16,11 +16,12 @@ #include -#include "common/gridmgr.h" #include "app_debug.h" +#include "common/gridmgr.h" +#include "data/system/data_location.h" #include "define.h" #include "grid/grid_location.h" -#include "data/system/data_location.h" +#include "layout/system.h" #define LOCATION_LIST_ITEM_X (188 + 26) #define LOCATION_LIST_ITEM_Y (15 + 26) diff --git a/src/grid/grid_wireless.c b/src/grid/grid_wireless.c index 9dc97b5..6dcf293 100644 --- a/src/grid/grid_wireless.c +++ b/src/grid/grid_wireless.c @@ -16,11 +16,12 @@ #include -#include "common/gridmgr.h" #include "app_debug.h" +#include "common/gridmgr.h" +#include "data/system/data_wireless.h" #include "define.h" #include "grid/grid_wireless.h" -#include "data/system/data_wireless.h" +#include "layout/network.h" #define WIFI_LIST_ITEM_X (488 + 26) #define WIFI_LIST_ITEM_Y (134 + 26) diff --git a/src/layout/layout_channel.c b/src/layout/layout_channel.c index a39da2f..4ea2660 100644 --- a/src/layout/layout_channel.c +++ b/src/layout/layout_channel.c @@ -17,13 +17,14 @@ #include #include -#include "common/viewmgr.h" -#include "common/layoutmgr.h" -#include "common/inputmgr.h" #include "app_debug.h" +#include "common/inputmgr.h" +#include "common/layoutmgr.h" +#include "common/utils.h" +#include "common/viewmgr.h" #include "define.h" #include "layout.h" -#include "common/utils.h" +#include "layout/channel.h" #include "view/view_base.h" #define STOP_BTN_TXT "Stop" diff --git a/src/layout/layout_network.c b/src/layout/layout_network.c index 13c605f..e2d79eb 100644 --- a/src/layout/layout_network.c +++ b/src/layout/layout_network.c @@ -16,20 +16,21 @@ #include -#include "common/viewmgr.h" -#include "common/layoutmgr.h" -#include "common/inputmgr.h" #include "app_debug.h" -#include "define.h" -#include "view/view_base.h" -#include "view_new_network.h" -#include "layout.h" -#include "grid/grid_wireless.h" -#include "data/system/data_wireless.h" -#include "data/system/data_wired.h" -#include "common/listmgr.h" #include "common/datamgr.h" +#include "common/inputmgr.h" +#include "common/layoutmgr.h" +#include "common/listmgr.h" #include "common/utils.h" +#include "common/viewmgr.h" +#include "data/system/data_wired.h" +#include "data/system/data_wireless.h" +#include "define.h" +#include "grid/grid_wireless.h" +#include "layout.h" +#include "layout/network.h" +#include "view_new_network.h" +#include "view/view_base.h" enum object_type { EO_BTN_OK = 0, diff --git a/src/layout/layout_picture.c b/src/layout/layout_picture.c index 7b496bb..e4c8a8a 100644 --- a/src/layout/layout_picture.c +++ b/src/layout/layout_picture.c @@ -16,15 +16,16 @@ #include -#include "common/layoutmgr.h" -#include "common/inputmgr.h" #include "app_debug.h" -#include "define.h" -#include "layout.h" -#include "common/utils.h" +#include "common/inputmgr.h" +#include "common/layoutmgr.h" #include "common/menumgr.h" +#include "common/utils.h" #include "common/viewmgr.h" #include "data/settings_picture.h" +#include "define.h" +#include "layout.h" +#include "layout/picture.h" #include "view/view_action_menu.h" #define PADDING_X 26 diff --git a/src/layout/layout_support.c b/src/layout/layout_support.c index f72dd3b..bb1bfd6 100644 --- a/src/layout/layout_support.c +++ b/src/layout/layout_support.c @@ -17,13 +17,14 @@ #include #include -#include "common/layoutmgr.h" -#include "common/inputmgr.h" #include "app_debug.h" +#include "common/inputmgr.h" +#include "common/layoutmgr.h" +#include "common/menumgr.h" +#include "common/utils.h" #include "define.h" #include "layout.h" -#include "common/utils.h" -#include "common/menumgr.h" +#include "layout/support.h" #define PADDING_X 26 #define PADDING_Y 26 diff --git a/src/layout/layout_system.c b/src/layout/layout_system.c index ec032b7..70ed1f5 100644 --- a/src/layout/layout_system.c +++ b/src/layout/layout_system.c @@ -18,20 +18,22 @@ #include #include -#include "common/layoutmgr.h" -#include "common/inputmgr.h" #include "app_debug.h" -#include "define.h" -#include "layout.h" -#include "common/utils.h" +#include "common/inputmgr.h" +#include "common/layoutmgr.h" #include "common/menumgr.h" +#include "common/utils.h" #include "common/viewmgr.h" +#include "data/system/settings_clock.h" +#include "data/system/settings_language.h" +#include "data/system/settings_wakeup_timer.h" +#include "define.h" +#include "layout.h" +#include "layout/system.h" #include "view/system/view_clock.h" #include "view/system/view_location.h" #include "view/system/view_reset.h" #include "view/view_action_menu.h" -#include "data/system/settings_clock.h" -#include "data/system/settings_language.h" #define PADDING_X 26 #define PADDING_Y 26 diff --git a/src/layout/layout_voice.c b/src/layout/layout_voice.c index aee849d..2645d4d 100644 --- a/src/layout/layout_voice.c +++ b/src/layout/layout_voice.c @@ -16,13 +16,14 @@ #include -#include "common/layoutmgr.h" -#include "common/inputmgr.h" #include "app_debug.h" +#include "common/inputmgr.h" +#include "common/layoutmgr.h" +#include "common/menumgr.h" +#include "common/utils.h" #include "define.h" #include "layout.h" -#include "common/utils.h" -#include "common/menumgr.h" +#include "layout/voice.h" #define PADDING_X 26 #define PADDING_Y 26 diff --git a/src/view/system/view_location.c b/src/view/system/view_location.c index 34c4197..72aa625 100644 --- a/src/view/system/view_location.c +++ b/src/view/system/view_location.c @@ -26,6 +26,7 @@ #include "app_string.h" #include "define.h" #include "layout.h" +#include "layout/system.h" #include "common/utils.h" #include "view/view_base.h" #include "common/gridmgr.h"