Fix build error due to changing app-common

Change-Id: I952a9915c30230722805a17ac395d87d2404d7d9
Signed-off-by: JuWan Kim <juwan.kim@samsung.com>

diff --git a/include/view_maincatalog.h b/include/view_maincatalog.h
index 95a3894..0124b7c 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -14,17 +14,15 @@
  * limitations under the License.
  */
 
-#include <app.h>
-#include <Elementary.h>
 #include <ui-gadget.h>
 #include "dbg.h"
 #include "def.h"
+#include <AppCommon.h>
 #include "settingviewmgr.h"
 #include "utils.h"
 #include "json_marco.h"
 #include "settings_provider.h"
 
-#include <BaseApp.h>
 #include <vconf.h>
 
 #define PARAM_SETTINGS_ITEM "settings-item"

diff --git a/src/settingviewmgr.cpp b/src/settingviewmgr.cpp
index 6126c85..34f2833 100644 (file)
--- a/src/settingviewmgr.cpp
+++ b/src/settingviewmgr.cpp
@@ -14,12 +14,9 @@
  * limitations under the License.
  */
 
-#include <Elementary.h>
-#include <Eina.h>
 #include "dbg.h"
 
 #include <AppCommon.h>
-#include <InputHandler.h>
 #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 (file)
--- a/src/timeout_handler.cpp
+++ b/src/timeout_handler.cpp
@@ -14,10 +14,8 @@
  * limitations under the License.
  */
 
-#include <app.h>
-#include <Elementary.h>
-#include <AppCommon.h>
 #include "dbg.h"
+#include <AppCommon.h>
 #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 (file)
--- a/src/view_maincatalog.cpp
+++ b/src/view_maincatalog.cpp
@@ -14,15 +14,13 @@
  * limitations under the License.
  */
 
-#include <app.h>
-#include <AppCommon.h>
 
 #include "dbg.h"
+#include <AppCommon.h>
 #include "def.h"
 #include "stdbool.h"
 #include "settingviewmgr.h"
 #include "utils.h"
-#include <InputHandler.h>
 #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 (executable)
--- a/src/view_need_pwd.cpp
+++ b/src/view_need_pwd.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <AppCommon.h>
 #include "dbg.h"
+#include <AppCommon.h>
 #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 (executable)
--- a/src/view_pwd_popup.cpp
+++ b/src/view_pwd_popup.cpp
@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
-#include <AppCommon.h>
 #include "dbg.h"
+#include <AppCommon.h>
 #include "def.h"
 #include "view_pwd_popup.h"
 #include "utils.h"
 #include "settings_provider.h"
 #include "settingviewmgr.h"
-#include <InputHandler.h>
 
 #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 (file)
--- 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 <AppCommon.h>
 #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 (file)
--- a/src/view_system_clock.cpp
+++ b/src/view_system_clock.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <AppCommon.h>
 #include "dbg.h"
+#include <AppCommon.h>
 #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 (file)
--- a/src/view_uigadget.cpp
+++ b/src/view_uigadget.cpp
@@ -15,9 +15,9 @@
  */
 
 #include <ui-gadget.h>
-#include <AppCommon.h>
 #include "view_uigadget.h"
 #include "dbg.h"
+#include <AppCommon.h>
 #include "def.h"
 #include "settingviewmgr.h"
 

diff --git a/ug/channel/src/ChannelMainView.cpp b/ug/channel/src/ChannelMainView.cpp
index e42f54c..aa4ce2a 100644 (file)
--- a/ug/channel/src/ChannelMainView.cpp
+++ b/ug/channel/src/ChannelMainView.cpp
@@ -1,14 +1,10 @@
-#include <Elementary.h>
-#include <app.h>
 #include <ui-gadget-module.h>
-#include "AppCommon.h"
 #include "dbg.h"
+#include <AppCommon.h>
 #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 (file)
--- a/ug/channel/src/ChannelResultView.cpp
+++ b/ug/channel/src/ChannelResultView.cpp
@@ -1,14 +1,10 @@
-#include <Elementary.h>
-#include <app.h>
 #include <ui-gadget-module.h>
-#include "AppCommon.h"
 #include <system_info.h>
 #include "dbg.h"
+#include <AppCommon.h>
 #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 (file)
--- a/ug/channel/src/ChannelSearchView.cpp
+++ b/ug/channel/src/ChannelSearchView.cpp
@@ -1,15 +1,11 @@
-#include <Elementary.h>
-#include <app.h>
 #include <ui-gadget-module.h>
-#include "AppCommon.h"
 #include <system_info.h>
 #include "dbg.h"
+#include <AppCommon.h>
 #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 (file)
--- 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 <Elementary.h>
-#include <app.h>
 #include "defs.h"
 #include "dbg.h"
+#include <AppCommon.h>
 #include "ug_auto_program.h"
 #include "util.h"
 
 #include "TVServiceMgr.h"
-#include <ViewMgr.h>
-#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 (file)
--- a/ug/network/src/IpSettingView.cpp
+++ b/ug/network/src/IpSettingView.cpp
@@ -1,19 +1,13 @@
-#include <Elementary.h>
 #include <ui-gadget-module.h>
 #include "defs.h"
 #include "dbg.h"
+#include <AppCommon.h>
 #include <vconf.h>
 #include "i18n.h"
 #include "util.h"
 #include "common.h"
-
-#include <AppCommon.h>
-#include <InputHandler.h>
-
 #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 (file)
--- a/ug/network/src/NetworkMainView.cpp
+++ b/ug/network/src/NetworkMainView.cpp
@@ -1,6 +1,5 @@
-#include <Elementary.h>
-#include "AppCommon.h"
 #include "dbg.h"
+#include <AppCommon.h>
 #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 (file)
--- a/ug/network/src/WifiPasscodeView.cpp
+++ b/ug/network/src/WifiPasscodeView.cpp
@@ -1,18 +1,11 @@
-#include <Elementary.h>
-#include <aul.h>
 #include <ui-gadget-module.h>
-#include <string.h>
+#include <cstring>
 #include "defs.h"
 #include "dbg.h"
+#include <AppCommon.h>
 #include "i18n.h"
 #include "util.h"
 #include "common.h"
-#include "util.h"
-
-#include <AppCommon.h>
-#include <InputHandler.h>
-#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 (file)
--- 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 <Elementary.h>
 #include <ui-gadget-module.h>
 
 #include "i18n.h"
 #include "defs.h"
 #include "dbg.h"
+#include <AppCommon.h>
 
-#include <ViewMgr.h>
 #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 (file)
--- a/ug/proxy/src/ProxyMainView.cpp
+++ b/ug/proxy/src/ProxyMainView.cpp
@@ -1,8 +1,8 @@
-#include <Elementary.h>
 #include <ui-gadget-module.h>
 #include <vconf.h>
 #include "defs.h"
 #include "dbg.h"
+#include <AppCommon.h>
 #include "i18n.h"
 #include "util.h"
 
@@ -10,11 +10,6 @@
 #include "WifiMgr.h"
 #include "NetConMgr.h"
 
-#include <AppCommon.h>
-#include <InputHandler.h>
-
-#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 (file)
--- 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 <Elementary.h>
 #include <ui-gadget-module.h>
 #include "i18n.h"
 #include "defs.h"
 #include "dbg.h"
+#include <AppCommon.h>
 
-#include <ViewMgr.h>
 #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 (file)
--- a/ug/src/NetConMgr.cpp
+++ b/ug/src/NetConMgr.cpp
@@ -1,5 +1,5 @@
-#include <AppCommon.h>
 #include "dbg.h"
+#include <AppCommon.h>
 #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 (file)
--- a/ug/src/TVServiceMgr.cpp
+++ b/ug/src/TVServiceMgr.cpp
@@ -1,9 +1,8 @@
-#include <stdlib.h>
+#include <cstdlib>
 #include <Ecore.h>
-#include <AppCommon.h>
 #include "dbg.h"
+#include <AppCommon.h>
 //#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 (file)
--- a/ug/src/WifiDirectMgr.cpp
+++ b/ug/src/WifiDirectMgr.cpp
@@ -1,8 +1,6 @@
-#include <Elementary.h>
-#include <aul.h>
-#include <AppCommon.h>
 #include "defs.h"
 #include "dbg.h"
+#include <AppCommon.h>
 #include "WifiMgr.h"
 #include "WifiDirectMgr.h"
 

diff --git a/ug/src/WifiMgr.cpp b/ug/src/WifiMgr.cpp
index b4a5b9e..dceb922 100644 (file)
--- a/ug/src/WifiMgr.cpp
+++ b/ug/src/WifiMgr.cpp
@@ -1,9 +1,8 @@
-#include <stdlib.h>
+#include <cstdlib>
 #include <dbg.h>
 #include <wifi.h>
 #include <AppCommon.h>
 #include "WifiMgr.h"
-#include <AppCommon.h>
 
 
 #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 (file)
--- a/ug/system/clock/src/ClockMainView.cpp
+++ b/ug/system/clock/src/ClockMainView.cpp
@@ -1,13 +1,9 @@
-#include <Elementary.h>
-#include <app.h>
 #include <ui-gadget-module.h>
-#include "AppCommon.h"
 #include "dbg.h"
+#include <AppCommon.h>
 #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 (file)
--- a/ug/system/clock/src/ClockSpinControlView.cpp
+++ b/ug/system/clock/src/ClockSpinControlView.cpp
@@ -1,13 +1,9 @@
-#include <Elementary.h>
-#include <app.h>
 #include <ui-gadget-module.h>
-#include "AppCommon.h"
 #include "dbg.h"
+#include <AppCommon.h>
 #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 (executable)
--- a/ug/system/clock/src/ClockSublistView.cpp
+++ b/ug/system/clock/src/ClockSublistView.cpp
@@ -1,13 +1,9 @@
-#include <Elementary.h>
-#include <app.h>
 #include <ui-gadget-module.h>
-#include "AppCommon.h"
 #include "dbg.h"
+#include <AppCommon.h>
 #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 (file)
--- a/ug/system/clock/src/ClockTimeSpinControlView.cpp
+++ b/ug/system/clock/src/ClockTimeSpinControlView.cpp
@@ -1,13 +1,9 @@
-#include <Elementary.h>
-#include <app.h>
 #include <ui-gadget-module.h>
-#include "AppCommon.h"
 #include "dbg.h"
+#include <AppCommon.h>
 #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 (executable)
--- 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 <Elementary.h>
 #include <ui-gadget-module.h>
 
 #include "util.h"
 #include "ug_clock.h"
 #include "defs.h"
 #include "dbg.h"
+#include <AppCommon.h>
 
-#include <ViewMgr.h>
-#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 (executable)
--- a/ug/wifi-direct/src/WifiDirectMainView.cpp
+++ b/ug/wifi-direct/src/WifiDirectMainView.cpp
@@ -1,18 +1,12 @@
-#include <Elementary.h>
-#include <aul.h>
-#include <Eina.h>
 #include <ui-gadget-module.h>
 #include "defs.h"
 #include "dbg.h"
+#include <AppCommon.h>
 #include "util.h"
 
 #include "WifiDirectMgr.h"
 
-#include <AppCommon.h>
-#include <InputHandler.h>
 
-#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 (file)
--- 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 <Elementary.h>
 #include <ui-gadget-module.h>
-#include "i18n.h"
 #include "dbg.h"
+#include <AppCommon.h>
 #include "defs.h"
+#include "i18n.h"
 
-#include <ViewMgr.h>
 #include "wifi.h"
-#include "BaseView.h"
 #include "WifiDirectMainView.h"
 
 #if defined (__cplusplus)