Code cleaning

- unused ug lib dependencies removed from modules
- other unused deps removed from about, applications, appmanager, display

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

diff --git a/include/setting-helper.h b/include/setting-helper.h
index 662557ca19c250697d4fa2e5404fb642525ad640..a61c80602403982a5d21703fa52b95195a739548 100644 (file)
--- a/include/setting-helper.h
+++ b/include/setting-helper.h
@@ -2,6 +2,8 @@
 #define __SETTING_HELPER_H__
 
 #include <setting.h>
+#include <ui-gadget-module.h>
+
 bool is_searchmode_app(Cfg_Item_Type type);
 extern Eina_Bool setting_main_freeze_event_timer_cb(void *cb);
 

diff --git a/include/setting.h b/include/setting.h
index f845fc903d9d4313037a5406fa201f0e20fde953..ea823f24f4fcc5dc1b8ed137459c792a00d37741 100644 (file)
--- a/include/setting.h
+++ b/include/setting.h
@@ -111,7 +111,7 @@
 #include <efl_extension.h>
 #include <dd-display.h>
 #include <call-manager.h>
-
+#include <ui-gadget-module.h>
 
 #define NO_UG_FOUND_MSG        "IDS_MSGF_POP_UNSUPPORTED"
 

diff --git a/setting-about/CMakeLists.txt b/setting-about/CMakeLists.txt
index a25efcc37c831d89e8cc87608cbadc1b4872efa4..5c7ada2b1bdaa401931d83f41cff7175ab3fd8c6 100755 (executable)
--- a/setting-about/CMakeLists.txt
+++ b/setting-about/CMakeLists.txt
@@ -7,29 +7,17 @@ SET(SETTING_PKG_ABOUT "org.tizen.setting-about")
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs_about REQUIRED
-       appcore-common
-       appcore-efl
-       capi-appfw-app-manager
        capi-appfw-application
        capi-network-bluetooth
-       capi-network-wifi
        capi-network-wifi-manager
-       capi-system-device
        capi-system-info
        capi-system-runtime-info
-       capi-system-system-settings
        capi-telephony
-       dbus-glib-1
-       deviced storage
+       storage
        dlog
-       ecore
        efl-extension
        elementary
-       evas
-       json-glib-1.0
        libtzplatform-config
-       notification
-       ui-gadget-1
        vconf
 )
 

diff --git a/setting-about/include/setting-about.h b/setting-about/include/setting-about.h
index 5694df133b5c54db42a1e93a6011b049154aa3de..69a5c05b94efc43b6924d70f9f93e9c763e0cf00 100644 (file)
--- a/setting-about/include/setting-about.h
+++ b/setting-about/include/setting-about.h
@@ -34,12 +34,9 @@
 #ifndef __SETTING_ABOUT_H__
 #define __SETTING_ABOUT_H__
 
-#include <stdio.h>
 #include <telephony.h>
 #include <Elementary.h>
 #include <glib-object.h>
-#include <notification.h>
-#include <dbus/dbus.h>
 #include <storage.h>
 #include <system_info.h>
 

diff --git a/setting-about/src/setting-about-status.c b/setting-about/src/setting-about-status.c
index a86a41df8fe2c5fae24f26d878c6bc813d25c077..5e36a9bf509bac90cfdbc6a539d238eb9d9f8703 100644 (file)
--- a/setting-about/src/setting-about-status.c
+++ b/setting-about/src/setting-about-status.c
@@ -24,7 +24,6 @@
 #include <fcntl.h>
 #include <telephony.h>
 #include <bluetooth.h>
-#include <wifi.h>
 #include <wifi-manager.h>
 
 #include "setting-about.h"

diff --git a/setting-accessibility/CMakeLists.txt b/setting-accessibility/CMakeLists.txt
index f88c4506ba41cb2d5ecc1b1ee70d4cf25bc6a71b..fdb1ee0540f13e43d11ad78d2fd9b8897b8b7d9e 100755 (executable)
--- a/setting-accessibility/CMakeLists.txt
+++ b/setting-accessibility/CMakeLists.txt
@@ -9,7 +9,6 @@ FILE(GLOB ACC_SRCS ./src/*.c)
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs_acc REQUIRED
        elementary
-       ui-gadget-1
        capi-appfw-application
        evas
        dlog

diff --git a/setting-applications/CMakeLists.txt b/setting-applications/CMakeLists.txt
index 7109f2cc3691165510046b25759ad5a46895c661..35c8139beb1cf2a127ab71c9d06529d786bfc7bd 100755 (executable)
--- a/setting-applications/CMakeLists.txt
+++ b/setting-applications/CMakeLists.txt
@@ -6,23 +6,13 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/${SETTING_COMMON}/include)
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs_apps REQUIRED
-       appcore-common
-       appcore-efl
        aul
        capi-appfw-application
-       capi-appfw-package-manager
-       capi-system-device
-       deviced
        dlog
-       ecore
-       edje
        efl-extension
        elementary
-       evas
-       json-glib-1.0
        libtzplatform-config
        pkgmgr-info
-       ui-gadget-1
        vconf
 )
 

diff --git a/setting-appmgr/CMakeLists.txt b/setting-appmgr/CMakeLists.txt
index 8d957cf52c2c662b2005e75bcb4f8e71a38887b0..4a00be03f2d70abe21b7edbc3695031798a3fc3a 100755 (executable)
--- a/setting-appmgr/CMakeLists.txt
+++ b/setting-appmgr/CMakeLists.txt
@@ -8,18 +8,11 @@ FILE(GLOB APPMGR_SRCS src/*.c)
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs_appmgr REQUIRED
-               appcore-common
-               appcore-efl
                elementary
-               ui-gadget-1
                capi-appfw-application
-               deviced storage
-               evas
+               storage
                dlog
-               edje
                glib-2.0
-               appcore-efl
-               eina
                pkgmgr
                appsvc
                capi-appfw-app-manager
@@ -27,13 +20,9 @@ pkg_check_modules(pkgs_appmgr REQUIRED
                vconf
                pkgmgr-info
                efl-extension
-               app2sd
-               json-glib-1.0
-               privilege-info
-               security-privilege-manager
                capi-appfw-package-manager
                libtzplatform-config
-               tapi)
+               )
 
 FOREACH(flag ${pkgs_appmgr_CFLAGS})
     SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")

diff --git a/setting-common/include/setting-cfg.h b/setting-common/include/setting-cfg.h
index 73d798a667a873cbeed5e2663684aee145fddc6f..4fe13a700fd1132c9558712e770b31bf37af2123 100644 (file)
--- a/setting-common/include/setting-cfg.h
+++ b/setting-common/include/setting-cfg.h
@@ -28,7 +28,6 @@
 #define __SETTING_CFG_H__
 
 #include <glib.h>
-#include <json-glib/json-glib.h>
 #include <setting-common-resource.h>
 #include <app.h>
 #include <app_common.h>

diff --git a/setting-common/include/setting-common-general-func.h b/setting-common/include/setting-common-general-func.h
index e6d40724becc203c1fda685798d882d2336a0de6..89afbe0a01399a4115edbb3242de808f1632be81 100644 (file)
--- a/setting-common/include/setting-common-general-func.h
+++ b/setting-common/include/setting-common-general-func.h
@@ -27,7 +27,6 @@
 #undef S_
 #endif
 
-#include <appcore-efl.h>
 
 #define EXPORT_PUBLIC __attribute__((visibility("default")))
 
@@ -39,7 +38,6 @@
 
 #include <setting-common-data-type.h>
 #include <aul.h>
-#include <ui-gadget-module.h>
 #include <regex.h>
 
 #ifndef _EDJ

diff --git a/setting-common/src/setting-cfg.c b/setting-common/src/setting-cfg.c
index 29fe050052cd15ba1a7e4bd665b531f1b2e4878a..6fac6eb4fb585700c63a865ba6a399dce50dec96 100755 (executable)
--- a/setting-common/src/setting-cfg.c
+++ b/setting-common/src/setting-cfg.c
@@ -23,11 +23,13 @@
 #include <setting-debug.h>
 #include <stdio.h>
 #include <Elementary.h>
+#include <json-glib/json-glib.h>
 #include <setting-common-general-func.h>
 #include <setting-common-data-type.h>
 #include <setting-common-data-slp-setting.h>
 #include <unistd.h>
 #include <vconf.h>
+#include <ui-gadget-module.h>
 
 JsonParser *parser;
 JsonNode *root; /* category_list */

diff --git a/setting-common/src/setting-common-general-func.c b/setting-common/src/setting-common-general-func.c
index 6fa44293f9940d0a0c670101d70795541630103a..397fd268204e3654913f120bdd569d428cf45ad9 100644 (file)
--- a/setting-common/src/setting-common-general-func.c
+++ b/setting-common/src/setting-common-general-func.c
@@ -36,8 +36,6 @@
 #include <sys/stat.h>
 #include <sys/mount.h>
 
-/*#include <data_usage.h> */
-/*#include <resourced.h> */
 #include <limits.h>
 #include <setting-cfg.h>
 #include <pkgmgr-info.h>
@@ -46,6 +44,7 @@
 #include <bundle_internal.h>
 #include <app_control_internal.h>
 #include <pkgmgr-info.h>
+#include <ui-gadget-module.h>
 
 EXPORT_PUBLIC
 char *get_application_default_icon(const char *appid)

diff --git a/setting-connectivity/CMakeLists.txt b/setting-connectivity/CMakeLists.txt
index bdf4edf66d49916f60080651fb14b59070eabf4a..391b58a9ec11e5c5e5c255295143914bdcfe7deb 100755 (executable)
--- a/setting-connectivity/CMakeLists.txt
+++ b/setting-connectivity/CMakeLists.txt
@@ -6,17 +6,13 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/${SETTING_COMMON}/include)
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs_connectivity REQUIRED
-       appcore-common
-       appcore-efl
        capi-appfw-app-manager
+       glib-2.0
        capi-appfw-application
        capi-system-runtime-info
        dlog
        elementary
-       evas
-       json-glib-1.0
        libtzplatform-config
-       ui-gadget-1
        vconf
 )
 

diff --git a/setting-display/CMakeLists.txt b/setting-display/CMakeLists.txt
index e176e3896b3fcb48ee3dc22db26c9eb637e1f054..349e1d2faed71958ce8d4eb429b0184e7b12d473 100755 (executable)
--- a/setting-display/CMakeLists.txt
+++ b/setting-display/CMakeLists.txt
@@ -4,10 +4,19 @@ SET(PROJECT_SETTING_DISPLAY "setting-display")
 SET(SETTING_PKG_DISPLAY "org.tizen.setting-display")
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(pkgs_display REQUIRED elementary ecore edje evas
-                               appcore-common appcore-efl ui-gadget-1 capi-appfw-application dlog
-                               capi-system-device efl-extension capi-system-system-settings
-                               deviced json-glib-1.0 libtzplatform-config dpm vconf dbus-glib-1 tapi)
+pkg_check_modules(pkgs_display REQUIRED elementary
+                               capi-appfw-application
+                               deviced
+                               glib-2.0
+                               dlog
+                               capi-system-device
+                               efl-extension
+                               capi-system-system-settings
+                               libtzplatform-config
+                               dpm
+                               vconf
+                               dbus-glib-1
+                               )
 
 FOREACH(flag ${pkgs_display_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")

diff --git a/setting-display/include/setting-display.h b/setting-display/include/setting-display.h
index 1525f046856cc24a46c02ab42aaeb4981e799a79..49fd32b7bfbc3c095e729779a1c7f407a818a00e 100644 (file)
--- a/setting-display/include/setting-display.h
+++ b/setting-display/include/setting-display.h
@@ -39,9 +39,7 @@
 
 #include <device.h>
 #include <dd-display.h>
-#include <dd-deviced.h>
 #include <dbus/dbus.h>
-/*#include <devman.h> */
 
 #define Keystr_Dynamic         "IDS_ST_BODY_DYNAMIC_T_DISPLAY_EFFECT"
 #define Keystr_Standard                "IDS_ST_BODY_STANDARD_T_DISPLAY_EFFECT"

diff --git a/setting-fileview/CMakeLists.txt b/setting-fileview/CMakeLists.txt
index 2cf51c65d3ddb611fe6393eb1b41af21ccbbb462..6747b10c303cae93ee9f688c6f3f1407658d1eac 100755 (executable)
--- a/setting-fileview/CMakeLists.txt
+++ b/setting-fileview/CMakeLists.txt
@@ -18,7 +18,6 @@ pkg_check_modules(pkgs_fileview REQUIRED
        evas
        json-glib-1.0
        libtzplatform-config
-       ui-gadget-1
 )
 
 FOREACH(flag ${pkgs_fileview_CFLAGS})

diff --git a/setting-flightmode/CMakeLists.txt b/setting-flightmode/CMakeLists.txt
index e9bfcdaf791bd66e3aacccd800e4c9dc20056caf..1c4e288da117d77e4984bd2b611c4bcf7b5c83bf 100755 (executable)
--- a/setting-flightmode/CMakeLists.txt
+++ b/setting-flightmode/CMakeLists.txt
@@ -16,7 +16,6 @@ pkg_check_modules(pkgs_flightmode REQUIRED
        appcore-common
        appcore-efl
        efl-extension
-       ui-gadget-1
        dlog
        aul
        json-glib-1.0

diff --git a/setting-font/CMakeLists.txt b/setting-font/CMakeLists.txt
index bc73893c24c6091274a965cc04f7c095bdaf87b0..82521314df4a35c1c5487349fa1ee3b776f7c331 100755 (executable)
--- a/setting-font/CMakeLists.txt
+++ b/setting-font/CMakeLists.txt
@@ -6,7 +6,7 @@ SET(SETTING_PKG_FONT "org.tizen.setting-font")
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs_font REQUIRED ecore ecore-file evas elementary efl-extension appcore-common appcore-efl dlog capi-appfw-application
-deviced fontconfig libxml-2.0 capi-system-system-settings json-glib-1.0 libtzplatform-config ui-gadget-1 vconf capi-base-utils-i18n)
+deviced fontconfig libxml-2.0 capi-system-system-settings json-glib-1.0 libtzplatform-config vconf capi-base-utils-i18n)
 
 FOREACH(flag ${pkgs_font_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")

diff --git a/setting-language-and-input/CMakeLists.txt b/setting-language-and-input/CMakeLists.txt
index 3bb84d936de9b706093836af7b011d472b45d626..d60db6b369cab9706ed72dda28d3682377e08d44 100755 (executable)
--- a/setting-language-and-input/CMakeLists.txt
+++ b/setting-language-and-input/CMakeLists.txt
@@ -23,7 +23,6 @@ pkg_check_modules(pkgs_language_and_input REQUIRED
        libxml-2.0
        pkgmgr-info
        tapi
-       ui-gadget-1
        vconf
        capi-base-utils-i18n
 )

diff --git a/setting-license/CMakeLists.txt b/setting-license/CMakeLists.txt
index ec8d8eb5044ff1bcb4481d36dffb3bcd8e2ddbe3..f6113561863d1d288bfb6f9ec39eb2bc2dcedee4 100755 (executable)
--- a/setting-license/CMakeLists.txt
+++ b/setting-license/CMakeLists.txt
@@ -23,7 +23,6 @@ pkg_check_modules(pkgs_license REQUIRED
        libxml-2.0
        pkgmgr-info
        tapi
-       ui-gadget-1
        vconf
 )
 

diff --git a/setting-locktype/CMakeLists.txt b/setting-locktype/CMakeLists.txt
index 8bd506fdcd04ba154e4c56c4d44b22f3c5799cb4..d29979c55784833d104d98b27636f179509d8314 100755 (executable)
--- a/setting-locktype/CMakeLists.txt
+++ b/setting-locktype/CMakeLists.txt
@@ -19,7 +19,6 @@ pkg_check_modules(pkgs_locktype REQUIRED
        json-glib-1.0
        libtzplatform-config
        pkgmgr-info
-       ui-gadget-1
        vconf
 )
 

diff --git a/setting-network/CMakeLists.txt b/setting-network/CMakeLists.txt
index 56e6e79f9211aa073b0ad1bdfc77fe08384d01c5..d0aead395179344246ad444224505ba42e550b75 100755 (executable)
--- a/setting-network/CMakeLists.txt
+++ b/setting-network/CMakeLists.txt
@@ -24,7 +24,6 @@ pkg_check_modules(pkgs_network REQUIRED
        libtzplatform-config
        notification
        tapi
-       ui-gadget-1
        vconf
 )
 

diff --git a/setting-password/CMakeLists.txt b/setting-password/CMakeLists.txt
index d998dc901c8bc57fee6cdf1cf04800c15722a9e6..bd6b0cf14a6aa0afed586350d4b57ea7817d4815 100755 (executable)
--- a/setting-password/CMakeLists.txt
+++ b/setting-password/CMakeLists.txt
@@ -23,7 +23,6 @@ pkg_check_modules(pkgs_password REQUIRED
        libtzplatform-config
        notification
        tapi
-       ui-gadget-1
        vconf
 )
 

diff --git a/setting-privacy/CMakeLists.txt b/setting-privacy/CMakeLists.txt
index b084b24dade5f1be3f4b7e5a02140ec04dfd41c1..c55850b48f6efce5070340141f29573790710f47 100755 (executable)
--- a/setting-privacy/CMakeLists.txt
+++ b/setting-privacy/CMakeLists.txt
@@ -20,7 +20,6 @@ pkg_check_modules(pkgs_privacy REQUIRED
                evas
                json-glib-1.0
                libtzplatform-config
-               ui-gadget-1
                vconf
 )
 

diff --git a/setting-profile/CMakeLists.txt b/setting-profile/CMakeLists.txt
index a947b95ca642bb1d6305bc4b2aa68b70a8416472..62f03d78e64b6a1bffbc422e2a26035b37c35265 100755 (executable)
--- a/setting-profile/CMakeLists.txt
+++ b/setting-profile/CMakeLists.txt
@@ -30,7 +30,6 @@ pkg_check_modules(pkgs_profile REQUIRED
        libtzplatform-config
        mm-keysound
        notification
-       ui-gadget-1
        vconf
 )
 

diff --git a/setting-profile/src/setting-profile-sound-main.c b/setting-profile/src/setting-profile-sound-main.c
index cdd1ddd2896e24cfd57d8c1b89febe6407f28b50..b9df8315b6086d1be85bf3226a97f74a78c333e3 100755 (executable)
--- a/setting-profile/src/setting-profile-sound-main.c
+++ b/setting-profile/src/setting-profile-sound-main.c
@@ -19,6 +19,7 @@
  *
  */
 
+#include <appcore-efl.h>
 #include <notification_setting.h>
 #include <notification_setting_internal.h>
 #include "setting-profile.h"

diff --git a/setting-ringtone/CMakeLists.txt b/setting-ringtone/CMakeLists.txt
index 2da6ea32ba60aa42c50515b4f9c3fd0801710f3d..cbdf96af094cfef28bf035c6fbcf6df964f8f3bf 100755 (executable)
--- a/setting-ringtone/CMakeLists.txt
+++ b/setting-ringtone/CMakeLists.txt
@@ -8,7 +8,7 @@ SET(SETTING_PKG_RINGTONE "org.tizen.setting-ringtone")
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs_ringtone REQUIRED
-elementary appcore-common appcore-efl ui-gadget-1 capi-appfw-application capi-system-system-settings evas capi-media-metadata-extractor dlog efl-extension json-glib-1.0
+elementary appcore-common appcore-efl capi-appfw-application capi-system-system-settings evas capi-media-metadata-extractor dlog efl-extension json-glib-1.0
 ecore edje glib-2.0 callmgr_client capi-media-sound-manager libtzplatform-config capi-media-player)
 
 FOREACH(flag ${pkgs_ringtone_CFLAGS})

diff --git a/setting-smartmanager/smartmanager-battery/CMakeLists.txt b/setting-smartmanager/smartmanager-battery/CMakeLists.txt
index b79bd5a09d780037e7dcdf36dc2809e1f98b6445..e0e8a1668cd90bd4b3a9ce188a42afa0cb858ed1 100644 (file)
--- a/setting-smartmanager/smartmanager-battery/CMakeLists.txt
+++ b/setting-smartmanager/smartmanager-battery/CMakeLists.txt
@@ -14,7 +14,6 @@ pkg_check_modules(pkgs_smartmanager_battery REQUIRED
        capi-system-device
        deviced
        dpm
-       ui-gadget-1
        elementary
        efl-extension
        pkgmgr

diff --git a/setting-smartmanager/smartmanager-data/CMakeLists.txt b/setting-smartmanager/smartmanager-data/CMakeLists.txt
index ec4aded737b8cf13fc8101ee4db181a1621b8be8..f5eacc1cc61e4f86dce1c86846f4c21fbfab13bb 100644 (file)
--- a/setting-smartmanager/smartmanager-data/CMakeLists.txt
+++ b/setting-smartmanager/smartmanager-data/CMakeLists.txt
@@ -6,7 +6,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/${SETTING_COMMON}/include)
 SET(PROJECT_SMARTMANAGER_DATA "smartmanager-data")
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(pkgs_smartmanager_data REQUIRED evas elementary efl-extension appcore-common appcore-efl ecore tapi vconf sqlite3 ui-gadget-1
+pkg_check_modules(pkgs_smartmanager_data REQUIRED evas elementary efl-extension appcore-common appcore-efl ecore tapi vconf sqlite3
 capi-appfw-application deviced json-glib-1.0 alarm-service capi-system-system-settings libtzplatform-config)
 
 FOREACH(flag ${pkgs_smartmanager_data_CFLAGS})

diff --git a/setting-storage/CMakeLists.txt b/setting-storage/CMakeLists.txt
index bd53843e61477df4c7067676ceb7a5fd295863c5..417a9e2e9a504025773769a39a6ac399b42eaaf4 100755 (executable)
--- a/setting-storage/CMakeLists.txt
+++ b/setting-storage/CMakeLists.txt
@@ -19,7 +19,6 @@ pkg_check_modules(pkgs_storage REQUIRED
        pkgmgr
        pkgmgr-info
        tapi
-       ui-gadget-1
        vconf
 )
 

diff --git a/setting-time/CMakeLists.txt b/setting-time/CMakeLists.txt
index a543283dc032b0d1778158e1a9057c2d63a0f9f2..142e60b2f26ce0b7806a2a69030aaec33b24f3ed 100755 (executable)
--- a/setting-time/CMakeLists.txt
+++ b/setting-time/CMakeLists.txt
@@ -5,7 +5,7 @@ SET(PROJECT_SETTING_TIME "setting-time")
 SET(SETTING_PKG_TIME "org.tizen.setting-time")
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(pkgs_time REQUIRED evas elementary efl-extension appcore-common appcore-efl ecore tapi ui-gadget-1 vconf sqlite3
+pkg_check_modules(pkgs_time REQUIRED evas elementary efl-extension appcore-common appcore-efl ecore tapi vconf sqlite3
 capi-appfw-application deviced json-glib-1.0 alarm-service capi-system-system-settings libtzplatform-config capi-base-utils-i18n)
 
 FOREACH(flag ${pkgs_time_CFLAGS})