Project files ordering

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 43b4cf1..bcda956 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,8 +63,8 @@ ENDIF(NOT DEFINED DESKTOP_ICON)
 SET(SRCS
        src/main.c
        src/view/view_base.c
-       src/view/view_clock.c
-       src/view/view_location.c
+       src/view/system/view_clock.c
+       src/view/system/view_location.c
        src/view/view_new_network.c
        src/common/utils.c
        src/common/viewmgr.c
@@ -83,8 +83,8 @@ SET(SRCS
        src/layout/layout_info.c
        src/layout/layout_voice.c
        src/grid/grid_wireless.c
-       src/data/data_wireless.c
-       src/data/data_wired.c
+       src/data/system/data_wireless.c
+       src/data/system/data_wired.c
        src/data/system/settings_clock.c
    )
 

diff --git a/include/datamgr.h b/include/common/datamgr.h
similarity index 100%
rename from include/datamgr.h
rename to include/common/datamgr.h

diff --git a/include/gridmgr.h b/include/common/gridmgr.h
similarity index 100%
rename from include/gridmgr.h
rename to include/common/gridmgr.h

diff --git a/include/inputmgr.h b/include/common/inputmgr.h
similarity index 100%
rename from include/inputmgr.h
rename to include/common/inputmgr.h

diff --git a/include/layoutmgr.h b/include/common/layoutmgr.h
similarity index 100%
rename from include/layoutmgr.h
rename to include/common/layoutmgr.h

diff --git a/include/listmgr.h b/include/common/listmgr.h
similarity index 100%
rename from include/listmgr.h
rename to include/common/listmgr.h

diff --git a/include/menumgr.h b/include/common/menumgr.h
similarity index 100%
rename from include/menumgr.h
rename to include/common/menumgr.h

diff --git a/include/utils.h b/include/common/utils.h
similarity index 100%
rename from include/utils.h
rename to include/common/utils.h

diff --git a/include/viewmgr.h b/include/common/viewmgr.h
similarity index 100%
rename from include/viewmgr.h
rename to include/common/viewmgr.h

diff --git a/include/data/data_wired.h b/include/data/system/data_wired.h
similarity index 98%
rename from include/data/data_wired.h
rename to include/data/system/data_wired.h
index 9cae4f4..3a996f9 100644 (file)
--- a/include/data/data_wired.h
+++ b/include/data/system/data_wired.h
@@ -18,7 +18,7 @@
 #define __AIR_SETTINGS_DATA_WIRED_H__
 
 #include <net_connection.h>
-#include "datamgr.h"
+#include "common/datamgr.h"
 
 #define NETWORK_ADDRESS_MAX    16
 

diff --git a/include/data/data_wireless.h b/include/data/system/data_wireless.h
similarity index 100%
rename from include/data/data_wireless.h
rename to include/data/system/data_wireless.h

diff --git a/include/view_clock.h b/include/view/system/view_clock.h
similarity index 100%
rename from include/view_clock.h
rename to include/view/system/view_clock.h

diff --git a/include/view_location.h b/include/view/system/view_location.h
similarity index 100%
rename from include/view_location.h
rename to include/view/system/view_location.h

diff --git a/include/view_base.h b/include/view/view_base.h
similarity index 100%
rename from include/view_base.h
rename to include/view/view_base.h

diff --git a/res/settings.edc b/res/settings.edc
index 7d4275a..abcde16 100644 (file)
--- a/res/settings.edc
+++ b/res/settings.edc
@@ -19,8 +19,8 @@
 collections {
        base_scale: APP_BASE_SCALE;
        #include "view/base.edc"
-       #include "view/clock.edc"
-       #include "view/location.edc"
+       #include "view/system/clock.edc"
+       #include "view/system/location.edc"
        #include "layout/picture.edc"
        #include "layout/channel.edc"
        #include "layout/support.edc"

diff --git a/res/view/clock.edc b/res/view/system/clock.edc
similarity index 100%
rename from res/view/clock.edc
rename to res/view/system/clock.edc

diff --git a/res/view/location.edc b/res/view/system/location.edc
similarity index 100%
rename from res/view/location.edc
rename to res/view/system/location.edc

diff --git a/src/common/datamgr.c b/src/common/datamgr.c
index 2427d54..1ddc71c 100644 (file)
--- a/src/common/datamgr.c
+++ b/src/common/datamgr.c
@@ -17,7 +17,7 @@
 #include <stdbool.h>
 
 #include "app_debug.h"
-#include "datamgr.h"
+#include "common/datamgr.h"
 
 struct datamgr {
        struct data_class *dclass;

diff --git a/src/common/gridmgr.c b/src/common/gridmgr.c
index a63f96a..1e22fa5 100644 (file)
--- a/src/common/gridmgr.c
+++ b/src/common/gridmgr.c
@@ -15,7 +15,7 @@
  */
 
 #include <app.h>
-#include "gridmgr.h"
+#include "common/gridmgr.h"
 #include "app_debug.h"
 
 struct gridmgr {

diff --git a/src/common/inputmgr.c b/src/common/inputmgr.c
index 3fc67c3..065ad51 100644 (file)
--- a/src/common/inputmgr.c
+++ b/src/common/inputmgr.c
@@ -19,7 +19,7 @@
 #include <Eina.h>
 
 #include "app_debug.h"
-#include "inputmgr.h"
+#include "common/inputmgr.h"
 
 #define FBR_SIGNAL_CLICKED      "clicked"
 #define SIG_REALIZED            "realized"

diff --git a/src/common/layoutmgr.c b/src/common/layoutmgr.c
index d11bbe3..526bfec 100644 (file)
--- a/src/common/layoutmgr.c
+++ b/src/common/layoutmgr.c
@@ -19,7 +19,7 @@
 #include <Eina.h>
 
 #include "app_debug.h"
-#include "layoutmgr.h"
+#include "common/layoutmgr.h"
 
 struct _layoutmgr {
        Evas_Object *base;

diff --git a/src/common/listmgr.c b/src/common/listmgr.c
index 0433863..4f0fccb 100644 (file)
--- a/src/common/listmgr.c
+++ b/src/common/listmgr.c
@@ -16,13 +16,13 @@
 
 #include <Elementary.h>
 
-#include "gridmgr.h"
-#include "inputmgr.h"
+#include "common/gridmgr.h"
+#include "common/inputmgr.h"
 #include "app_debug.h"
-#include "utils.h"
+#include "common/utils.h"
 #include "define.h"
 
-#include "data/data_wireless.h"
+#include "data/system/data_wireless.h"
 
 struct listmgr {
        Evas_Object *parent;

diff --git a/src/common/menumgr.c b/src/common/menumgr.c
index 63908df..bd17a56 100644 (file)
--- a/src/common/menumgr.c
+++ b/src/common/menumgr.c
@@ -16,13 +16,13 @@
 
 #include <Elementary.h>
 
-#include "viewmgr.h"
-#include "inputmgr.h"
+#include "common/viewmgr.h"
+#include "common/inputmgr.h"
 #include "app_debug.h"
 #include "define.h"
-#include "view_base.h"
-#include "utils.h"
-#include "menumgr.h"
+#include "view/view_base.h"
+#include "common/utils.h"
+#include "common/menumgr.h"
 
 #define MAX_BTN 8
 #define MAX_BTN_COL 4

diff --git a/src/common/utils.c b/src/common/utils.c
index 529e359..88b5cd6 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -16,7 +16,7 @@
 
 #include <Elementary.h>
 
-#include "inputmgr.h"
+#include "common/inputmgr.h"
 #include "app_debug.h"
 #include "app_string.h"
 #include "define.h"

diff --git a/src/common/viewmgr.c b/src/common/viewmgr.c
index 0bdf770..bb2ae99 100644 (file)
--- a/src/common/viewmgr.c
+++ b/src/common/viewmgr.c
@@ -19,7 +19,7 @@
 #include <Eina.h>
 
 #include "app_debug.h"
-#include "viewmgr.h"
+#include "common/viewmgr.h"
 
 struct viewmgr {
        Evas_Object *win;

diff --git a/src/data/data_wired.c b/src/data/system/data_wired.c
similarity index 99%
rename from src/data/data_wired.c
rename to src/data/system/data_wired.c
index ddff62e..8284b8b 100644 (file)
--- a/src/data/data_wired.c
+++ b/src/data/system/data_wired.c
@@ -15,7 +15,7 @@
  */
 
 #include "app_debug.h"
-#include "data/data_wired.h"
+#include "data/system/data_wired.h"
 
 int get_wired_network_status(struct _connection_data *data)
 {

diff --git a/src/data/data_wireless.c b/src/data/system/data_wireless.c
similarity index 99%
rename from src/data/data_wireless.c
rename to src/data/system/data_wireless.c
index 3580872..4312c2e 100644 (file)
--- a/src/data/data_wireless.c
+++ b/src/data/system/data_wireless.c
@@ -17,8 +17,8 @@
 #include <Elementary.h>
 
 #include "app_debug.h"
-#include "data/data_wireless.h"
-#include "datamgr.h"
+#include "data/system/data_wireless.h"
+#include "common/datamgr.h"
 
 struct _priv {
        Eina_List *list;

diff --git a/src/grid/grid_wireless.c b/src/grid/grid_wireless.c
index 45aefad..a289cf6 100644 (file)
--- a/src/grid/grid_wireless.c
+++ b/src/grid/grid_wireless.c
@@ -16,11 +16,11 @@
 
 #include <Elementary.h>
 
-#include "gridmgr.h"
+#include "common/gridmgr.h"
 #include "app_debug.h"
 #include "define.h"
 #include "grid.h"
-#include "data/data_wireless.h"
+#include "data/system/data_wireless.h"
 
 static char *_text_get(void *data, Evas_Object *obj, const char *part)
 {

diff --git a/src/layout/layout_channel.c b/src/layout/layout_channel.c
index e6e5df0..7cc15c7 100644 (file)
--- a/src/layout/layout_channel.c
+++ b/src/layout/layout_channel.c
@@ -17,14 +17,14 @@
 #include <Elementary.h>
 #include <tv_service_proxy.h>
 
-#include "viewmgr.h"
-#include "layoutmgr.h"
-#include "inputmgr.h"
+#include "common/viewmgr.h"
+#include "common/layoutmgr.h"
+#include "common/inputmgr.h"
 #include "app_debug.h"
 #include "define.h"
 #include "layout.h"
-#include "utils.h"
-#include "view_base.h"
+#include "common/utils.h"
+#include "view/view_base.h"
 
 enum scan_state {
        STATE_INIT,

diff --git a/src/layout/layout_info.c b/src/layout/layout_info.c
index ead6acc..cb51a8c 100644 (file)
--- a/src/layout/layout_info.c
+++ b/src/layout/layout_info.c
@@ -16,7 +16,7 @@
 
 #include <Elementary.h>
 
-#include "layoutmgr.h"
+#include "common/layoutmgr.h"
 #include "define.h"
 #include "layout.h"
 

diff --git a/src/layout/layout_network.c b/src/layout/layout_network.c
index 9eaa81b..d5be6c9 100644 (file)
--- a/src/layout/layout_network.c
+++ b/src/layout/layout_network.c
@@ -16,20 +16,20 @@
 
 #include <Elementary.h>
 
-#include "viewmgr.h"
-#include "layoutmgr.h"
-#include "inputmgr.h"
+#include "common/viewmgr.h"
+#include "common/layoutmgr.h"
+#include "common/inputmgr.h"
 #include "app_debug.h"
 #include "define.h"
-#include "view_base.h"
+#include "view/view_base.h"
 #include "view_new_network.h"
 #include "layout.h"
 #include "grid.h"
-#include "data/data_wireless.h"
-#include "data/data_wired.h"
-#include "listmgr.h"
-#include "datamgr.h"
-#include "utils.h"
+#include "data/system/data_wireless.h"
+#include "data/system/data_wired.h"
+#include "common/listmgr.h"
+#include "common/datamgr.h"
+#include "common/utils.h"
 
 enum object_type {
        EO_BTN_OK = 0,

diff --git a/src/layout/layout_picture.c b/src/layout/layout_picture.c
index 213e08b..011f33c 100644 (file)
--- a/src/layout/layout_picture.c
+++ b/src/layout/layout_picture.c
@@ -17,13 +17,13 @@
 #include <Elementary.h>
 #include <device/display.h>
 
-#include "layoutmgr.h"
-#include "inputmgr.h"
+#include "common/layoutmgr.h"
+#include "common/inputmgr.h"
 #include "app_debug.h"
 #include "define.h"
 #include "layout.h"
-#include "utils.h"
-#include "menumgr.h"
+#include "common/utils.h"
+#include "common/menumgr.h"
 
 #define PADDING_X 26
 #define PADDING_Y 26

diff --git a/src/layout/layout_sound.c b/src/layout/layout_sound.c
index 05feabc..294a767 100644 (file)
--- a/src/layout/layout_sound.c
+++ b/src/layout/layout_sound.c
@@ -16,7 +16,7 @@
 
 #include <Elementary.h>
 
-#include "layoutmgr.h"
+#include "common/layoutmgr.h"
 #include "define.h"
 #include "layout.h"
 

diff --git a/src/layout/layout_support.c b/src/layout/layout_support.c
index 6418b48..8a50306 100644 (file)
--- a/src/layout/layout_support.c
+++ b/src/layout/layout_support.c
@@ -17,13 +17,13 @@
 #include <Elementary.h>
 #include <system_info.h>
 
-#include "layoutmgr.h"
-#include "inputmgr.h"
+#include "common/layoutmgr.h"
+#include "common/inputmgr.h"
 #include "app_debug.h"
 #include "define.h"
 #include "layout.h"
-#include "utils.h"
-#include "menumgr.h"
+#include "common/utils.h"
+#include "common/menumgr.h"
 
 #define PADDING_X 26
 #define PADDING_Y 26

diff --git a/src/layout/layout_system.c b/src/layout/layout_system.c
index be8abc0..17233b6 100644 (file)
--- a/src/layout/layout_system.c
+++ b/src/layout/layout_system.c
@@ -19,16 +19,17 @@
 #include <utils_i18n.h>
 #include <vconf.h>
 
-#include "layoutmgr.h"
-#include "inputmgr.h"
+#include "common/layoutmgr.h"
+#include "common/inputmgr.h"
 #include "app_debug.h"
 #include "define.h"
 #include "layout.h"
-#include "utils.h"
-#include "menumgr.h"
-#include "viewmgr.h"
-#include "view_clock.h"
-#include "view_location.h"
+#include "common/utils.h"
+#include "common/menumgr.h"
+#include "common/viewmgr.h"
+#include "view/system/view_clock.h"
+#include "view/system/view_location.h"
+#include "data/system/settings_clock.h"
 
 #define PADDING_X 26
 #define PADDING_Y 26

diff --git a/src/layout/layout_voice.c b/src/layout/layout_voice.c
index 77535a5..016061b 100644 (file)
--- a/src/layout/layout_voice.c
+++ b/src/layout/layout_voice.c
@@ -16,13 +16,13 @@
 
 #include <Elementary.h>
 
-#include "layoutmgr.h"
-#include "inputmgr.h"
+#include "common/layoutmgr.h"
+#include "common/inputmgr.h"
 #include "app_debug.h"
 #include "define.h"
 #include "layout.h"
-#include "utils.h"
-#include "menumgr.h"
+#include "common/utils.h"
+#include "common/menumgr.h"
 
 #define PADDING_X 26
 #define PADDING_Y 26

diff --git a/src/main.c b/src/main.c
index fe0cdf2..4d4f692 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -17,12 +17,12 @@
 #include <app.h>
 #include <Elementary.h>
 
-#include "viewmgr.h"
+#include "common/viewmgr.h"
 #include "app_debug.h"
 #include "define.h"
-#include "view_base.h"
-#include "view_clock.h"
-#include "view_location.h"
+#include "view/view_base.h"
+#include "view/system/view_clock.h"
+#include "view/system/view_location.h"
 
 #include <system_settings.h>
 

diff --git a/src/view/view_clock.c b/src/view/system/view_clock.c
similarity index 99%
rename from src/view/view_clock.c
rename to src/view/system/view_clock.c
index df74da2..3711785 100644 (file)
--- a/src/view/view_clock.c
+++ b/src/view/system/view_clock.c
@@ -18,12 +18,12 @@
 #include <Elementary.h>
 #include <time.h>
 
-#include "viewmgr.h"
-#include "inputmgr.h"
+#include "common/viewmgr.h"
+#include "common/inputmgr.h"
 #include "app_debug.h"
 #include "define.h"
-#include "utils.h"
-#include "view_clock.h"
+#include "common/utils.h"
+#include "view/system/view_clock.h"
 #include "data/system/settings_clock.h"
 #include "app_string.h"
 

diff --git a/src/view/view_location.c b/src/view/system/view_location.c
similarity index 98%
rename from src/view/view_location.c
rename to src/view/system/view_location.c
index 8984955..8632a10 100644 (file)
--- a/src/view/view_location.c
+++ b/src/view/system/view_location.c
@@ -19,15 +19,15 @@
 #include <system_settings.h>
 #include <utils_i18n.h>
 
-#include "viewmgr.h"
-#include "layoutmgr.h"
-#include "inputmgr.h"
+#include "common/viewmgr.h"
+#include "common/layoutmgr.h"
+#include "common/inputmgr.h"
 #include "app_debug.h"
 #include "app_string.h"
 #include "define.h"
 #include "layout.h"
-#include "utils.h"
-#include "view_base.h"
+#include "common/utils.h"
+#include "view/view_base.h"
 
 
 struct _priv {

diff --git a/src/view/view_base.c b/src/view/view_base.c
index 871dc22..ad918ab 100644 (file)
--- a/src/view/view_base.c
+++ b/src/view/view_base.c
@@ -17,15 +17,15 @@
 #include <app.h>
 #include <Elementary.h>
 
-#include "viewmgr.h"
-#include "layoutmgr.h"
-#include "inputmgr.h"
+#include "common/viewmgr.h"
+#include "common/layoutmgr.h"
+#include "common/inputmgr.h"
 #include "app_debug.h"
 #include "app_string.h"
 #include "define.h"
 #include "layout.h"
-#include "utils.h"
-#include "view_base.h"
+#include "common/utils.h"
+#include "view/view_base.h"
 
 struct _priv {
        Evas_Object *win;

diff --git a/src/view/view_new_network.c b/src/view/view_new_network.c
index 68c4025..7296e54 100644 (file)
--- a/src/view/view_new_network.c
+++ b/src/view/view_new_network.c
@@ -17,18 +17,18 @@
 #include <app.h>
 #include <Elementary.h>
 
-#include "viewmgr.h"
-#include "layoutmgr.h"
-#include "inputmgr.h"
+#include "common/viewmgr.h"
+#include "common/layoutmgr.h"
+#include "common/inputmgr.h"
 #include "app_debug.h"
 #include "app_string.h"
 #include "define.h"
 #include "layout.h"
-#include "utils.h"
-#include "view_base.h"
+#include "common/utils.h"
+#include "view/view_base.h"
 #include "view_new_network.h"
 #include "layout/network.h"
-#include "data/data_wired.h"
+#include "data/system/data_wired.h"
 
 #define SIG_ITEM_FOCUSED        "item,focused"
 #define SIG_ITEM_UNFOCUSED      "item,unfocused"