From eda3ace5995b975deb43a7328d68ba4615421bca Mon Sep 17 00:00:00 2001 From: JuWan Kim Date: Mon, 20 Apr 2015 15:09:45 +0900 Subject: [PATCH] Fix build error due to changing app-common Change-Id: I952a9915c30230722805a17ac395d87d2404d7d9 Signed-off-by: JuWan Kim --- include/view_maincatalog.h | 1 - include/view_sublist.h | 1 - include/view_system_clock.h | 1 - src/main.cpp | 4 +--- src/settingviewmgr.cpp | 3 --- src/timeout_handler.cpp | 4 +--- src/view_maincatalog.cpp | 4 +--- src/view_need_pwd.cpp | 2 +- src/view_pwd_popup.cpp | 3 +-- src/view_sublist.cpp | 2 +- src/view_system_clock.cpp | 2 +- src/view_uigadget.cpp | 2 +- ug/channel/src/ChannelMainView.cpp | 6 +----- ug/channel/src/ChannelResultView.cpp | 6 +----- ug/channel/src/ChannelSearchView.cpp | 6 +----- ug/channel/src/ug_auto_program.cpp | 5 +---- ug/network/src/IpSettingView.cpp | 8 +------- ug/network/src/NetworkMainView.cpp | 5 +---- ug/network/src/WifiPasscodeView.cpp | 11 ++--------- ug/network/src/ug_network_settings.cpp | 4 +--- ug/proxy/src/ProxyMainView.cpp | 7 +------ ug/proxy/src/ug_proxy_settings.cpp | 4 +--- ug/src/NetConMgr.cpp | 2 +- ug/src/TVServiceMgr.cpp | 5 ++--- ug/src/WifiDirectMgr.cpp | 4 +--- ug/src/WifiMgr.cpp | 3 +-- ug/system/clock/src/ClockMainView.cpp | 6 +----- ug/system/clock/src/ClockSpinControlView.cpp | 6 +----- ug/system/clock/src/ClockSublistView.cpp | 6 +----- ug/system/clock/src/ClockTimeSpinControlView.cpp | 6 +----- ug/system/clock/src/ug_clock.cpp | 4 +--- ug/wifi-direct/src/WifiDirectMainView.cpp | 8 +------- ug/wifi-direct/src/ug_wifi_direct.cpp | 6 ++---- 33 files changed, 32 insertions(+), 115 deletions(-) diff --git a/include/view_maincatalog.h b/include/view_maincatalog.h index 95a3894..0124b7c 100644 --- a/include/view_maincatalog.h +++ b/include/view_maincatalog.h @@ -19,7 +19,6 @@ #include "settingviewmgr.h" -#include "InputHandler.h" class CMainCatalogView : diff --git a/include/view_sublist.h b/include/view_sublist.h index 32d1138..81dd8c1 100644 --- a/include/view_sublist.h +++ b/include/view_sublist.h @@ -19,7 +19,6 @@ #include "settingviewmgr.h" -#include "InputHandler.h" class CSublistView : diff --git a/include/view_system_clock.h b/include/view_system_clock.h index 65e42dc..80175aa 100644 --- a/include/view_system_clock.h +++ b/include/view_system_clock.h @@ -19,7 +19,6 @@ #include "settingviewmgr.h" -#include "InputHandler.h" class CSystemClockView : diff --git a/src/main.cpp b/src/main.cpp index c9d424a..89d00e7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -14,17 +14,15 @@ * limitations under the License. */ -#include -#include #include #include "dbg.h" #include "def.h" +#include #include "settingviewmgr.h" #include "utils.h" #include "json_marco.h" #include "settings_provider.h" -#include #include #define PARAM_SETTINGS_ITEM "settings-item" diff --git a/src/settingviewmgr.cpp b/src/settingviewmgr.cpp index 6126c85..34f2833 100644 --- a/src/settingviewmgr.cpp +++ b/src/settingviewmgr.cpp @@ -14,12 +14,9 @@ * limitations under the License. */ -#include -#include #include "dbg.h" #include -#include #include "settingviewmgr.h" #include "data_wrapper.h" #include "timeout_handler.h" diff --git a/src/timeout_handler.cpp b/src/timeout_handler.cpp index dc9a00f..78f8007 100644 --- a/src/timeout_handler.cpp +++ b/src/timeout_handler.cpp @@ -14,10 +14,8 @@ * limitations under the License. */ -#include -#include -#include #include "dbg.h" +#include #include "stdlib.h" #include "stdbool.h" #include "timeout_handler.h" diff --git a/src/view_maincatalog.cpp b/src/view_maincatalog.cpp index 0e3c49a..c4ae093 100644 --- a/src/view_maincatalog.cpp +++ b/src/view_maincatalog.cpp @@ -14,15 +14,13 @@ * limitations under the License. */ -#include -#include #include "dbg.h" +#include #include "def.h" #include "stdbool.h" #include "settingviewmgr.h" #include "utils.h" -#include #include "view_maincatalog.h" #include "data_wrapper.h" #include "settings_provider.h" diff --git a/src/view_need_pwd.cpp b/src/view_need_pwd.cpp index 26c9687..287d468 100755 --- a/src/view_need_pwd.cpp +++ b/src/view_need_pwd.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include #include "dbg.h" +#include #include "def.h" #include "utils.h" #include "settings_provider.h" diff --git a/src/view_pwd_popup.cpp b/src/view_pwd_popup.cpp index 9f49e37..e72d94c 100755 --- a/src/view_pwd_popup.cpp +++ b/src/view_pwd_popup.cpp @@ -14,14 +14,13 @@ * limitations under the License. */ -#include #include "dbg.h" +#include #include "def.h" #include "view_pwd_popup.h" #include "utils.h" #include "settings_provider.h" #include "settingviewmgr.h" -#include #define PWD_DATA_ID "change_passcode_data" #define CTXPOPUP_WIDTH 688 diff --git a/src/view_sublist.cpp b/src/view_sublist.cpp index c95546f..8d353a0 100644 --- a/src/view_sublist.cpp +++ b/src/view_sublist.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "AppCommon.h" #include "dbg.h" +#include #include "def.h" #include "stdbool.h" #include "settingviewmgr.h" diff --git a/src/view_system_clock.cpp b/src/view_system_clock.cpp index f6e22d3..c2a350a 100644 --- a/src/view_system_clock.cpp +++ b/src/view_system_clock.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include #include "dbg.h" +#include #include "def.h" #include "stdbool.h" #include "settingviewmgr.h" diff --git a/src/view_uigadget.cpp b/src/view_uigadget.cpp index 17ddda6..02a0382 100644 --- a/src/view_uigadget.cpp +++ b/src/view_uigadget.cpp @@ -15,9 +15,9 @@ */ #include -#include #include "view_uigadget.h" #include "dbg.h" +#include #include "def.h" #include "settingviewmgr.h" diff --git a/ug/channel/src/ChannelMainView.cpp b/ug/channel/src/ChannelMainView.cpp index e42f54c..aa4ce2a 100644 --- a/ug/channel/src/ChannelMainView.cpp +++ b/ug/channel/src/ChannelMainView.cpp @@ -1,14 +1,10 @@ -#include -#include #include -#include "AppCommon.h" #include "dbg.h" +#include #include "util.h" #include "defs.h" #include "TVServiceMgr.h" -#include "BaseView.h" -#include "ViewMgr.h" #include "ChannelMainView.h" #define HORIZONTAL_ALIGN 0.5 diff --git a/ug/channel/src/ChannelResultView.cpp b/ug/channel/src/ChannelResultView.cpp index 8335e63..665a0be 100644 --- a/ug/channel/src/ChannelResultView.cpp +++ b/ug/channel/src/ChannelResultView.cpp @@ -1,14 +1,10 @@ -#include -#include #include -#include "AppCommon.h" #include #include "dbg.h" +#include #include "defs.h" #include "util.h" -#include "BaseView.h" -#include "ViewMgr.h" #include "ChannelResultView.h" #define RESULT_MSG_SIZE 60 diff --git a/ug/channel/src/ChannelSearchView.cpp b/ug/channel/src/ChannelSearchView.cpp index 7e84dea..4ee478a 100644 --- a/ug/channel/src/ChannelSearchView.cpp +++ b/ug/channel/src/ChannelSearchView.cpp @@ -1,15 +1,11 @@ -#include -#include #include -#include "AppCommon.h" #include #include "dbg.h" +#include #include "defs.h" #include "util.h" #include "TVServiceMgr.h" -#include "BaseView.h" -#include "ViewMgr.h" #include "ChannelSearchView.h" #define MAX_BUF_SIZE 30 diff --git a/ug/channel/src/ug_auto_program.cpp b/ug/channel/src/ug_auto_program.cpp index 8944d91..9ab6c8a 100644 --- a/ug/channel/src/ug_auto_program.cpp +++ b/ug/channel/src/ug_auto_program.cpp @@ -18,16 +18,13 @@ #define UG_MODULE_API __attribute__ ((visibility("default"))) #endif -#include -#include #include "defs.h" #include "dbg.h" +#include #include "ug_auto_program.h" #include "util.h" #include "TVServiceMgr.h" -#include -#include "BaseView.h" #include "ChannelMainView.h" #if defined (__cplusplus) extern "C" { diff --git a/ug/network/src/IpSettingView.cpp b/ug/network/src/IpSettingView.cpp index 8ad9fa0..6f0890e 100644 --- a/ug/network/src/IpSettingView.cpp +++ b/ug/network/src/IpSettingView.cpp @@ -1,19 +1,13 @@ -#include #include #include "defs.h" #include "dbg.h" +#include #include #include "i18n.h" #include "util.h" #include "common.h" - -#include -#include - #include "WifiMgr.h" #include "NetConMgr.h" -#include "BaseView.h" -#include "ViewMgr.h" #include "IpSettingView.h" diff --git a/ug/network/src/NetworkMainView.cpp b/ug/network/src/NetworkMainView.cpp index 49edad3..985bbc7 100644 --- a/ug/network/src/NetworkMainView.cpp +++ b/ug/network/src/NetworkMainView.cpp @@ -1,6 +1,5 @@ -#include -#include "AppCommon.h" #include "dbg.h" +#include #include "util.h" #include "defs.h" #include "i18n.h" @@ -10,8 +9,6 @@ #include "WifiMgr.h" #include "NetConMgr.h" -#include "BaseView.h" -#include "ViewMgr.h" #include "NetworkMainView.h" static char *action_button[4] = { TXT_CONNECT_BTN, TXT_REFRESH_BTN, TXT_OTHER_BTN, TXT_CLOSE_BTN }; diff --git a/ug/network/src/WifiPasscodeView.cpp b/ug/network/src/WifiPasscodeView.cpp index 8a727a7..10d9a36 100644 --- a/ug/network/src/WifiPasscodeView.cpp +++ b/ug/network/src/WifiPasscodeView.cpp @@ -1,18 +1,11 @@ -#include -#include #include -#include +#include #include "defs.h" #include "dbg.h" +#include #include "i18n.h" #include "util.h" #include "common.h" -#include "util.h" - -#include -#include -#include "BaseView.h" -#include "ViewMgr.h" #include "WifiMgr.h" #include "WifiPasscodeView.h" diff --git a/ug/network/src/ug_network_settings.cpp b/ug/network/src/ug_network_settings.cpp index 7fa91c6..456b9de 100644 --- a/ug/network/src/ug_network_settings.cpp +++ b/ug/network/src/ug_network_settings.cpp @@ -18,16 +18,14 @@ #define UG_MODULE_API __attribute__ ((visibility("default"))) #endif -#include #include #include "i18n.h" #include "defs.h" #include "dbg.h" +#include -#include #include "wifi.h" -#include "BaseView.h" #include "NetworkMainView.h" #if defined (__cplusplus) diff --git a/ug/proxy/src/ProxyMainView.cpp b/ug/proxy/src/ProxyMainView.cpp index 7f7eb34..acab271 100644 --- a/ug/proxy/src/ProxyMainView.cpp +++ b/ug/proxy/src/ProxyMainView.cpp @@ -1,8 +1,8 @@ -#include #include #include #include "defs.h" #include "dbg.h" +#include #include "i18n.h" #include "util.h" @@ -10,11 +10,6 @@ #include "WifiMgr.h" #include "NetConMgr.h" -#include -#include - -#include "BaseView.h" -#include "ViewMgr.h" #include "ProxyMainView.h" #define KEY_PRIV "priv" diff --git a/ug/proxy/src/ug_proxy_settings.cpp b/ug/proxy/src/ug_proxy_settings.cpp index db8972e..275e014 100644 --- a/ug/proxy/src/ug_proxy_settings.cpp +++ b/ug/proxy/src/ug_proxy_settings.cpp @@ -18,15 +18,13 @@ #define UG_MODULE_API __attribute__ ((visibility("default"))) #endif -#include #include #include "i18n.h" #include "defs.h" #include "dbg.h" +#include -#include #include "wifi.h" -#include "BaseView.h" #include "ProxyMainView.h" #if defined (__cplusplus) diff --git a/ug/src/NetConMgr.cpp b/ug/src/NetConMgr.cpp index f4ad61c..94ea137 100644 --- a/ug/src/NetConMgr.cpp +++ b/ug/src/NetConMgr.cpp @@ -1,5 +1,5 @@ -#include #include "dbg.h" +#include #include "NetConMgr.h" #define IP_STRING_MAX_SIZE 20 diff --git a/ug/src/TVServiceMgr.cpp b/ug/src/TVServiceMgr.cpp index 714a0b5..9973e80 100644 --- a/ug/src/TVServiceMgr.cpp +++ b/ug/src/TVServiceMgr.cpp @@ -1,9 +1,8 @@ -#include +#include #include -#include #include "dbg.h" +#include //#include "tv_service_proxy.h" -#include "AppCommon.h" #include "TVServiceMgr.h" diff --git a/ug/src/WifiDirectMgr.cpp b/ug/src/WifiDirectMgr.cpp index c6f745b..af78a82 100644 --- a/ug/src/WifiDirectMgr.cpp +++ b/ug/src/WifiDirectMgr.cpp @@ -1,8 +1,6 @@ -#include -#include -#include #include "defs.h" #include "dbg.h" +#include #include "WifiMgr.h" #include "WifiDirectMgr.h" diff --git a/ug/src/WifiMgr.cpp b/ug/src/WifiMgr.cpp index b4a5b9e..dceb922 100644 --- a/ug/src/WifiMgr.cpp +++ b/ug/src/WifiMgr.cpp @@ -1,9 +1,8 @@ -#include +#include #include #include #include #include "WifiMgr.h" -#include #define IP_STRING_MAX_SIZE 20 diff --git a/ug/system/clock/src/ClockMainView.cpp b/ug/system/clock/src/ClockMainView.cpp index 53b92eb..4e24df1 100644 --- a/ug/system/clock/src/ClockMainView.cpp +++ b/ug/system/clock/src/ClockMainView.cpp @@ -1,13 +1,9 @@ -#include -#include #include -#include "AppCommon.h" #include "dbg.h" +#include #include "defs.h" #include "util.h" -#include "BaseView.h" -#include "ViewMgr.h" #include "ClockMainView.h" #define CLOCK_SUBLIST_NULL_BTNS 2 diff --git a/ug/system/clock/src/ClockSpinControlView.cpp b/ug/system/clock/src/ClockSpinControlView.cpp index c4f9f2d..885a084 100644 --- a/ug/system/clock/src/ClockSpinControlView.cpp +++ b/ug/system/clock/src/ClockSpinControlView.cpp @@ -1,13 +1,9 @@ -#include -#include #include -#include "AppCommon.h" #include "dbg.h" +#include #include "defs.h" #include "util.h" -#include "BaseView.h" -#include "ViewMgr.h" #include "ClockSpinControlView.h" #define ARROW_BTN_DATA_ID "arrow_btn_data_id" diff --git a/ug/system/clock/src/ClockSublistView.cpp b/ug/system/clock/src/ClockSublistView.cpp index 2b75f50..4216de0 100755 --- a/ug/system/clock/src/ClockSublistView.cpp +++ b/ug/system/clock/src/ClockSublistView.cpp @@ -1,13 +1,9 @@ -#include -#include #include -#include "AppCommon.h" #include "dbg.h" +#include #include "defs.h" #include "util.h" -#include "BaseView.h" -#include "ViewMgr.h" #include "ClockSublistView.h" #define SUBLIST_BTN_NUM 2 diff --git a/ug/system/clock/src/ClockTimeSpinControlView.cpp b/ug/system/clock/src/ClockTimeSpinControlView.cpp index b82cf43..6952a5a 100644 --- a/ug/system/clock/src/ClockTimeSpinControlView.cpp +++ b/ug/system/clock/src/ClockTimeSpinControlView.cpp @@ -1,13 +1,9 @@ -#include -#include #include -#include "AppCommon.h" #include "dbg.h" +#include #include "defs.h" #include "util.h" -#include "BaseView.h" -#include "ViewMgr.h" #include "ClockTimeSpinControlView.h" #define ARROW_BTN_DATA_ID "arrow_btn_data_id" diff --git a/ug/system/clock/src/ug_clock.cpp b/ug/system/clock/src/ug_clock.cpp index bb3efad..8d0809d 100755 --- a/ug/system/clock/src/ug_clock.cpp +++ b/ug/system/clock/src/ug_clock.cpp @@ -18,16 +18,14 @@ #define UG_MODULE_API __attribute__ ((visibility("default"))) #endif -#include #include #include "util.h" #include "ug_clock.h" #include "defs.h" #include "dbg.h" +#include -#include -#include "BaseView.h" #include "ClockMainView.h" #include "ClockSublistView.h" diff --git a/ug/wifi-direct/src/WifiDirectMainView.cpp b/ug/wifi-direct/src/WifiDirectMainView.cpp index 3a6b1af..0d4ad54 100755 --- a/ug/wifi-direct/src/WifiDirectMainView.cpp +++ b/ug/wifi-direct/src/WifiDirectMainView.cpp @@ -1,18 +1,12 @@ -#include -#include -#include #include #include "defs.h" #include "dbg.h" +#include #include "util.h" #include "WifiDirectMgr.h" -#include -#include -#include "BaseView.h" -#include "ViewMgr.h" #include "WifiDirectMainView.h" const char *action_button[] = { TXT_REFRESH_BTN, TXT_CLOSE_BTN, TXT_STOP_BTN }; diff --git a/ug/wifi-direct/src/ug_wifi_direct.cpp b/ug/wifi-direct/src/ug_wifi_direct.cpp index 0917376..c554fb1 100644 --- a/ug/wifi-direct/src/ug_wifi_direct.cpp +++ b/ug/wifi-direct/src/ug_wifi_direct.cpp @@ -18,15 +18,13 @@ #define UG_MODULE_API __attribute__ ((visibility("default"))) #endif -#include #include -#include "i18n.h" #include "dbg.h" +#include #include "defs.h" +#include "i18n.h" -#include #include "wifi.h" -#include "BaseView.h" #include "WifiDirectMainView.h" #if defined (__cplusplus) -- 2.7.4