Code cleaning

- removed unused dependencies from modules (CmakeList & spec)

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

diff --git a/include/setting.h b/include/setting.h
index ea823f24f4fcc5dc1b8ed137459c792a00d37741..6a49aed48d85566827b93a765250292737f0d4a6 100644 (file)
--- a/include/setting.h
+++ b/include/setting.h
@@ -102,15 +102,11 @@
 
 #include <Eina.h>
 #include <Elementary.h>
-#include <tapi_common.h>
 #include <ITapiModem.h>
 #include <sensor.h>
-#include <notification.h>
 #include <account.h>
 #include <app_manager.h>
 #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/packaging/org.tizen.setting.spec b/packaging/org.tizen.setting.spec
index ff98432d0106e84564cb8ce4bf5de0e9c90ce7d1..ba43de906c1b3f312f97cb69818cc2ff96969c15 100755 (executable)
--- a/packaging/org.tizen.setting.spec
+++ b/packaging/org.tizen.setting.spec
@@ -19,15 +19,9 @@ BuildRequires:  pkgconfig(appcore-efl)
 BuildRequires:  pkgconfig(appsvc)
 BuildRequires:  pkgconfig(aul)
 BuildRequires:  pkgconfig(auth-fw)
-BuildRequires:  pkgconfig(badge)
-BuildRequires:  pkgconfig(bluetooth-api)
-BuildRequires:  pkgconfig(bundle)
 BuildRequires:  pkgconfig(callmgr_client)
-BuildRequires:  pkgconfig(capi-appfw-app-common)
 BuildRequires:  pkgconfig(capi-appfw-app-manager)
-BuildRequires:  pkgconfig(capi-appfw-application)
 BuildRequires:  pkgconfig(capi-appfw-package-manager)
-BuildRequires:  pkgconfig(capi-appfw-preference)
 BuildRequires:  pkgconfig(capi-base-utils-i18n)
 BuildRequires:  pkgconfig(capi-content-media-content)
 BuildRequires:  pkgconfig(capi-media-metadata-extractor)
@@ -44,39 +38,22 @@ BuildRequires:  pkgconfig(capi-system-sensor)
 BuildRequires:  pkgconfig(capi-system-system-settings)
 BuildRequires:  pkgconfig(capi-telephony)
 BuildRequires:  pkgconfig(chromium-efl)
-BuildRequires:  pkgconfig(contacts-service2)
-BuildRequires:  pkgconfig(dbus-1)
-BuildRequires:  pkgconfig(dbus-glib-1)
 BuildRequires:  pkgconfig(deviced)
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(dpm)
-BuildRequires:  pkgconfig(ecore)
-BuildRequires:  pkgconfig(ecore-evas)
-BuildRequires:  pkgconfig(ecore-file)
-BuildRequires:  pkgconfig(ecore-imf)
-BuildRequires:  pkgconfig(ecore-input)
-BuildRequires:  pkgconfig(edje)
 BuildRequires:  pkgconfig(efl-extension)
-BuildRequires:  pkgconfig(eina)
 BuildRequires:  pkgconfig(elementary)
-BuildRequires:  pkgconfig(evas)
 BuildRequires:  pkgconfig(feedback)
 BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:  pkgconfig(gthread-2.0)
 BuildRequires:  pkgconfig(iniparser)
 BuildRequires:  pkgconfig(json-glib-1.0)
 BuildRequires:  pkgconfig(libtzplatform-config)
 BuildRequires:  pkgconfig(libxml-2.0)
-BuildRequires:  pkgconfig(mm-keysound)
-BuildRequires:  pkgconfig(mm-player)
-BuildRequires:  pkgconfig(mm-sound)
-BuildRequires:  pkgconfig(notification)
 BuildRequires:  pkgconfig(openssl)
 BuildRequires:  pkgconfig(pkgmgr)
 BuildRequires:  pkgconfig(pkgmgr-info)
 BuildRequires:  pkgconfig(privilege-info)
 BuildRequires:  pkgconfig(security-privilege-manager)
-BuildRequires:  pkgconfig(shortcut)
 BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(storage)
 BuildRequires:  pkgconfig(tapi)

diff --git a/setting-flightmode/CMakeLists.txt b/setting-flightmode/CMakeLists.txt
index 1c4e288da117d77e4984bd2b611c4bcf7b5c83bf..bf3b1bdfd54db3f1811640ebfefe10d431aa2f55 100755 (executable)
--- a/setting-flightmode/CMakeLists.txt
+++ b/setting-flightmode/CMakeLists.txt
@@ -5,26 +5,15 @@ SET(SETTING_PKG_FLIGHTMODE "org.tizen.setting-flightmode")
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs_flightmode REQUIRED
-       callmgr_client
-       deviced
+    capi-appfw-application
        elementary
-       ecore
-       edje
-       evas
        dlog
-       dbus-glib-1
-       appcore-common
-       appcore-efl
        efl-extension
-       dlog
-       aul
-       json-glib-1.0
        vconf
-       dbus-1
-       pkgmgr-info
        tapi
        notification
-       libtzplatform-config)
+       libtzplatform-config
+       )
 
 FOREACH(flag ${pkgs_flightmode_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")

diff --git a/setting-font/CMakeLists.txt b/setting-font/CMakeLists.txt
index 82521314df4a35c1c5487349fa1ee3b776f7c331..818ef4fb0bedd1d4ee9062a737226c9ac651575a 100755 (executable)
--- a/setting-font/CMakeLists.txt
+++ b/setting-font/CMakeLists.txt
@@ -5,8 +5,17 @@ SET(PROJECT_SETTING_FONT "setting-font")
 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 vconf capi-base-utils-i18n)
+pkg_check_modules(pkgs_font REQUIRED
+       elementary
+       efl-extension
+       capi-appfw-application
+       capi-system-system-settings
+       dlog
+       glib-2.0
+       fontconfig
+       libtzplatform-config
+       vconf
+)
 
 FOREACH(flag ${pkgs_font_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")

diff --git a/setting-font/include/setting-font-font-size.h b/setting-font/include/setting-font-font-size.h
index 2e93ddaa2fd4bd6e9095a61047207a72f6b01afc..469fda00dbaaaf432455a6d10a065e5275d622e1 100644 (file)
--- a/setting-font/include/setting-font-font-size.h
+++ b/setting-font/include/setting-font-font-size.h
@@ -22,16 +22,6 @@
 #define __SETTING_FONT_FONT_SIZE_H__
 
 #include <setting-font.h>
-#include <system_settings.h>
-
-static const settings_font_size_table font_size_table[] = {
-       {"IDS_ST_BODY_SMALL_M_TEXTSIZE", SYSTEM_SETTINGS_FONT_SIZE_SMALL},
-       {"IDS_ST_BODY_MEDIUM", SYSTEM_SETTINGS_FONT_SIZE_NORMAL},
-       {"IDS_ST_BODY_TEXTSTYLE_LARGE", SYSTEM_SETTINGS_FONT_SIZE_LARGE},
-       {"IDS_EMAIL_OPT_HUGE_M_TEXTSIZE", SYSTEM_SETTINGS_FONT_SIZE_HUGE},
-       {"IDS_EMAIL_POP_GIANT_M_TEXTSIZE", SYSTEM_SETTINGS_FONT_SIZE_GIANT},
-       {NULL, 0}
-};
 
 void setting_font_font_size_list_mouse_up_cb(void *data, Evas_Object *obj,
                void *event_info);

diff --git a/setting-font/include/setting-font.h b/setting-font/include/setting-font.h
index 0a2da61a35fef3080c15f89de9aa045e26900280..5ff6a14587c666d86d50ff18fddbe78128c61fba 100644 (file)
--- a/setting-font/include/setting-font.h
+++ b/setting-font/include/setting-font.h
@@ -32,7 +32,7 @@
 
 #include <setting-common-draw-widget.h>
 #include <setting-common-view.h>
-#include <system_settings.h>
+//#include <system_settings.h>
 #include "setting-common-init.h"
 
 typedef struct _SettingFontData SettingFontData;

diff --git a/setting-font/src/setting-font-font-size.c b/setting-font/src/setting-font-font-size.c
index 54007a503cc109482f967e6b3db7662107dc7a0a..289684a9f115ff62c55fb1e12764cd106a8cbac0 100644 (file)
--- a/setting-font/src/setting-font-font-size.c
+++ b/setting-font/src/setting-font-font-size.c
@@ -19,12 +19,22 @@
  *
  */
 
-#include <setting-font-font-size.h>
+#include <system_settings.h>
+#include "setting-font-font-size.h"
 
 #define STR_FONT_SIZE_CHANGING \
        "IDS_ST_BODY_CHANGING_THE_FONT_SIZE_IN_ACCESSIBILITY_SETTINGS_WILL_OVE"\
        "RRIDE_THE_FONT_SIZE_IN_EACH_APPLICATION"
 
+static const settings_font_size_table font_size_table[] = {
+       {"IDS_ST_BODY_SMALL_M_TEXTSIZE", SYSTEM_SETTINGS_FONT_SIZE_SMALL},
+       {"IDS_ST_BODY_MEDIUM", SYSTEM_SETTINGS_FONT_SIZE_NORMAL},
+       {"IDS_ST_BODY_TEXTSTYLE_LARGE", SYSTEM_SETTINGS_FONT_SIZE_LARGE},
+       {"IDS_EMAIL_OPT_HUGE_M_TEXTSIZE", SYSTEM_SETTINGS_FONT_SIZE_HUGE},
+       {"IDS_EMAIL_POP_GIANT_M_TEXTSIZE", SYSTEM_SETTINGS_FONT_SIZE_GIANT},
+       {NULL, 0}
+};
+
 static Eina_Bool __naviframe_item_pop_cb(void *data, Elm_Object_Item *it);
 
 static int _view_create(void *cb);

diff --git a/setting-font/src/setting-font-main.c b/setting-font/src/setting-font-main.c
index ca0d16709a014d55df3b132420e09a8a9b220519..ed65bde8bc82f8b3b81e5771fd7ee2c53117b351 100755 (executable)
--- a/setting-font/src/setting-font-main.c
+++ b/setting-font/src/setting-font-main.c
@@ -20,8 +20,8 @@
  */
 #include "setting-font-main.h"
 #include "setting-font-font-size.h"
-#include <dd-deviced.h>
 #include <fontconfig/fontconfig.h>
+#include <system_settings.h>
 
 #include <libxml/xmlmemory.h>
 #include <libxml/parser.h>

diff --git a/setting-font/src/setting-font.c b/setting-font/src/setting-font.c
index c0492ce88afc4bb372682ae6e4ef5662a01022e3..b26cf20c647883093297b6e877babd8f4edf888d 100644 (file)
--- a/setting-font/src/setting-font.c
+++ b/setting-font/src/setting-font.c
@@ -19,7 +19,6 @@
  *
  */
 #include <setting-font.h>
-#include <system_settings.h>
 #include <setting-cfg.h>
 
 #define SETTING_FONT_PACKAGE_NAME "org.tizen.setting-font"

diff --git a/setting-language-and-input/CMakeLists.txt b/setting-language-and-input/CMakeLists.txt
index d60db6b369cab9706ed72dda28d3682377e08d44..94a000f6f61d6fb38ac883b17a96e313467b68ae 100755 (executable)
--- a/setting-language-and-input/CMakeLists.txt
+++ b/setting-language-and-input/CMakeLists.txt
@@ -6,25 +6,15 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/${SETTING_COMMON}/include)
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs_language_and_input REQUIRED
-       appcore-common
-       appcore-efl
-       appsvc
-       badge
        capi-appfw-application
+       capi-base-utils-i18n
        capi-system-system-settings
-       deviced
-       ecore
-       eina
+       dlog
        elementary
-       evas
-       iniparser
-       json-glib-1.0
        libtzplatform-config
-       libxml-2.0
        pkgmgr-info
        tapi
        vconf
-       capi-base-utils-i18n
 )
 
 FOREACH(flag ${pkgs_language_and_input_CFLAGS})

diff --git a/setting-language-and-input/include/setting-language-and-input.h b/setting-language-and-input/include/setting-language-and-input.h
index cb434ac583f631008d6410182b8423426f3f89b0..49ede284598329d5c01c85a0fe69df9d06513826 100644 (file)
--- a/setting-language-and-input/include/setting-language-and-input.h
+++ b/setting-language-and-input/include/setting-language-and-input.h
@@ -28,10 +28,9 @@
 #ifdef Status
 #undef Status
 #endif
-#include <tapi_common.h>
-#include <ITapiSim.h>
-#include <TapiUtility.h>
+
 #include <utils_i18n.h>
+#include <ITapiSim.h>
 
 #include "setting-common-draw-widget.h"
 #include "setting-common-view.h"

diff --git a/setting-license/CMakeLists.txt b/setting-license/CMakeLists.txt
index f6113561863d1d288bfb6f9ec39eb2bc2dcedee4..b24ba478d71550672407c02c36c022cf7775575f 100755 (executable)
--- a/setting-license/CMakeLists.txt
+++ b/setting-license/CMakeLists.txt
@@ -6,24 +6,9 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/${SETTING_COMMON}/include)
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs_license REQUIRED
-       appcore-common
-       appcore-efl
-       appsvc
-       badge
        capi-appfw-application
-       capi-system-system-settings
-       deviced
-       ecore
-       eina
+       dlog
        elementary
-       evas
-       iniparser
-       json-glib-1.0
-       libtzplatform-config
-       libxml-2.0
-       pkgmgr-info
-       tapi
-       vconf
 )
 
 FOREACH(flag ${pkgs_license_CFLAGS})
@@ -43,8 +28,6 @@ ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DSLP_DEBUG")
 ADD_DEFINITIONS("-shared")
 
-#SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=/usr/lib")
-
 ADD_EXECUTABLE(${PROJECT_SETTING_LICENSE}
        ./src/setting-license.c
        ./src/setting-license-view.c

diff --git a/setting-license/src/setting-license-view.c b/setting-license/src/setting-license-view.c
index d9235791cddecc4f285b134185e39bb128519dba..87955a9e9877cc8ad16b851f8923235a1309df76 100644 (file)
--- a/setting-license/src/setting-license-view.c
+++ b/setting-license/src/setting-license-view.c
@@ -19,7 +19,7 @@
  *
  */
 
-#include <setting-license.h>
+#include "setting-license.h"
 
 #define TEXT_CLEAR_LICENSE      "IDS_ST_BODY_REMOVE_LICENCE"
 #define SETTING_DIVX_MODE_REG 0
@@ -36,7 +36,8 @@ setting_view setting_license_view = {
        .create = _view_create,
        .destroy = _view_destroy,
        .update = NULL,
-       .cleanup = NULL, };
+       .cleanup = NULL
+};
 
 /* ***************************************************
  *

diff --git a/setting-license/src/setting-license.c b/setting-license/src/setting-license.c
index d4ad8ba19bebe2d18766fddba5851c7df29f5298..7b4748c2fdfc0d1d060a0b5a45c2fd46f74cb0fa 100644 (file)
--- a/setting-license/src/setting-license.c
+++ b/setting-license/src/setting-license.c
@@ -29,13 +29,7 @@
  * - region format
  */
 
-#include <setting-license.h>
-#include <libxml/xmlmemory.h>
-#include "unicode/unum.h"
-#include <iniparser.h>
-#include <locale.h>
-#include <setting-cfg.h>
-#include <system_settings.h>
+#include "setting-license.h"
 
 #define SETTING_LICENSE_PACKAGE_NAME "org.tizen.setting-license"
 

diff --git a/setting-locktype/CMakeLists.txt b/setting-locktype/CMakeLists.txt
index d29979c55784833d104d98b27636f179509d8314..8e2b3f37f4111e1a4eb0181aaf353660581ae2aa 100755 (executable)
--- a/setting-locktype/CMakeLists.txt
+++ b/setting-locktype/CMakeLists.txt
@@ -6,19 +6,12 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/${SETTING_COMMON}/include)
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs_locktype REQUIRED
-       appcore-common
        auth-fw
        capi-appfw-application
-       deviced
        dlog
        dpm
-       ecore
        efl-extension
        elementary
-       evas
-       json-glib-1.0
-       libtzplatform-config
-       pkgmgr-info
        vconf
 )
 

diff --git a/setting-locktype/include/setting-locktype-main.h b/setting-locktype/include/setting-locktype-main.h
index 70452bd8d1d469651127a8e6852ab9a03c3b9c1f..e56c15842a8d28fc551632f0cfb8caa6ad7222bb 100644 (file)
--- a/setting-locktype/include/setting-locktype-main.h
+++ b/setting-locktype/include/setting-locktype-main.h
@@ -21,7 +21,7 @@
 #ifndef __SETTING_LOCKTYPE_MAIN_H__
 #define __SETTING_LOCKTYPE_MAIN_H__
 
-#include <setting-locktype.h>
+#include "setting-locktype.h"
 
 typedef struct _openlock_appdata openlock_appdata;
 
@@ -34,10 +34,4 @@ struct _openlock_appdata {
        int index;
 };
 
-#if 0
-static void
-setting_locktype_main_click_radio_cb(
-               void *data, Evas_Object *obj, void *event_info);
-#endif
-
 #endif

diff --git a/setting-locktype/include/setting-locktype.h b/setting-locktype/include/setting-locktype.h
index 91513fcdf3cbcfebc9200ee915477d03017b6ddb..b3e2024b197093170f6bc107cad5dcb63d70f43b 100755 (executable)
--- a/setting-locktype/include/setting-locktype.h
+++ b/setting-locktype/include/setting-locktype.h
@@ -21,14 +21,8 @@
 #ifndef __SETTING_LOCKTYPE_H__
 #define __SETTING_LOCKTYPE_H__
 
-#include <app_manager.h>
-#include <dirent.h>
 #include <dlog.h>
 #include <Elementary.h>
-#include <Ecore_IMF.h>
-#include <glib.h>
-#include <glib-object.h>
-#include <stdio.h>
 
 #include "setting-common-draw-widget.h"
 #include "setting-common-init.h"

diff --git a/setting-locktype/src/setting-locktype-main.c b/setting-locktype/src/setting-locktype-main.c
index 6dce8a018302a07339f6bcd5d9b862563cd3df7c..8250347f29f4b5fc87f2c38ee160f987c708e45b 100755 (executable)
--- a/setting-locktype/src/setting-locktype-main.c
+++ b/setting-locktype/src/setting-locktype-main.c
@@ -18,13 +18,12 @@
  * limitations under the License.
  *
  */
-#include <setting-common-data-type.h>
-#include <setting-common-data-slp-setting.h>
-#include <setting-common-draw-widget.h>
-#include <setting-common-view.h>
+#include "setting-common-data-type.h"
+#include "setting-common-data-slp-setting.h"
+#include "setting-common-draw-widget.h"
+#include "setting-common-view.h"
 
-#include <setting-locktype-main.h>
-#include <pkgmgr-info.h>
+#include "setting-locktype-main.h"
 #include <efl_extension.h>
 #if SUPPORT_ENCRYPTION
 #include <ode.h>
@@ -32,7 +31,6 @@
 
 #include <dpm/restriction.h>
 #include <dpm/password.h>
-
 #include <auth-passwd.h>
 
 #define TBD 0

diff --git a/setting-locktype/src/setting-locktype.c b/setting-locktype/src/setting-locktype.c
index 734806ee390af47f874f29b38f484d0531f467fe..29b045d8a72e7d6a3320e4ad47e5b7394a0ee93c 100644 (file)
--- a/setting-locktype/src/setting-locktype.c
+++ b/setting-locktype/src/setting-locktype.c
@@ -26,7 +26,6 @@
 
 #include "setting-locktype.h"
 #include <efl_extension.h>
-#include <auth-passwd.h>
 
 #define SETTING_LOCKTYPE_PACKAGE_NAME "org.tizen.setting-locktype"
 

diff --git a/setting-network/CMakeLists.txt b/setting-network/CMakeLists.txt
index d0aead395179344246ad444224505ba42e550b75..9fe8fef4d56abb089d3e4330f25d94116233a926 100755 (executable)
--- a/setting-network/CMakeLists.txt
+++ b/setting-network/CMakeLists.txt
@@ -6,23 +6,13 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/${SETTING_COMMON}/include)
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs_network REQUIRED
-       appcore-common
-       appcore-efl
        callmgr_client
        capi-appfw-application
        capi-network-connection
        capi-system-system-settings
        dlog
-       ecore
-       ecore-imf
-       edje
        efl-extension
-       eina
        elementary
-       evas
-       json-glib-1.0
-       libtzplatform-config
-       notification
        tapi
        vconf
 )

diff --git a/setting-network/src/setting-network-connection-create.c b/setting-network/src/setting-network-connection-create.c
index c3a92b0953ffc41a2b60ef02f86c1daa1d30d31c..599fedea05a073d6ca0d69bb00897bb884341d52 100644 (file)
--- a/setting-network/src/setting-network-connection-create.c
+++ b/setting-network/src/setting-network-connection-create.c
@@ -19,7 +19,7 @@
  *
  */
 #include <setting-network-connection-create.h>
-#include <notification.h>
+//#include <notification.h>
 #include <setting-network.h>
 
 #define MAX_PDP_AUTH_USERNAME_LEN_MAX 32
@@ -48,7 +48,8 @@ setting_view setting_network_connection_create_view = {
                .create = _view_create,
                .destroy = _view_destroy,
                .update = NULL,
-               .cleanup = NULL, };
+               .cleanup = NULL
+};
 
 /* ***************************************************
  *

diff --git a/setting-password/CMakeLists.txt b/setting-password/CMakeLists.txt
index bd6b0cf14a6aa0afed586350d4b57ea7817d4815..f042ed02a473ffbaf593b92bf2fad48e8040e4eb 100755 (executable)
--- a/setting-password/CMakeLists.txt
+++ b/setting-password/CMakeLists.txt
@@ -8,20 +8,10 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/${SETTING_COMMON}/include)
 INCLUDE(FindPkgConfig)
 
 pkg_check_modules(pkgs_password REQUIRED
-       appcore-common
-       appcore-efl
        auth-fw
        capi-appfw-application
-       deviced
        dlog
-       ecore
-       ecore-imf
-       edje
        elementary
-       evas
-       json-glib-1.0
-       libtzplatform-config
-       notification
        tapi
        vconf
 )

diff --git a/setting-password/include/setting-password-sim.h b/setting-password/include/setting-password-sim.h
index d59e9502c46165610ccc1f23e5f5dfc03678df7e..f0c83661d40a1a3ade1619eddca2dfdcc6ebbcd6 100644 (file)
--- a/setting-password/include/setting-password-sim.h
+++ b/setting-password/include/setting-password-sim.h
@@ -21,7 +21,7 @@
 #ifndef _SETTING_PASSWORD_SIM_H_
 #define _SETTING_PASSWORD_SIM_H_
 
-#include <setting-password.h>
+#include "setting-password.h"
 
 int setting_password_sim_create_ui(void *data);
 

diff --git a/setting-password/include/setting-password.h b/setting-password/include/setting-password.h
index e944f3ecb67433b4b1327245795a5d7130731610..83d627bda1941c4f95c9ad5a4c3fce902f14246b 100644 (file)
--- a/setting-password/include/setting-password.h
+++ b/setting-password/include/setting-password.h
@@ -36,9 +36,6 @@
 #include "setting-common-init.h"
 #include "setting-password-strings.h"
 
-/*#include <ckmc/ckmc-control.h> */
-/*#include <ckmc/ckmc-type.h> */
-
 #define SETTING_PW_NORMAL_PASSWORD_MIN_LENGTH 4
 #define SETTING_PW_NORMAL_PASSWORD_MAX_LENGTH 16
 #define SETTING_PW_SIM_MIN_LENGTH 4

diff --git a/setting-password/src/setting-password-normal.c b/setting-password/src/setting-password-normal.c
index 9f3306b7cb7450e04229c7177720edd73694a3d9..51a1bd1ea00b45b22361844336cd463a4b8b90c1 100644 (file)
--- a/setting-password/src/setting-password-normal.c
+++ b/setting-password/src/setting-password-normal.c
@@ -22,15 +22,15 @@
 #include "setting-password.h"
 #include "setting-common-data-slp-setting.h"
 #include "setting-debug.h"
-#include <dd-haptic.h>
+
 #if SUPPORT_ENCRYPTION
 #include <ode.h>
 #endif
 #include <Ecore_IMF.h>
 #include <Ecore_IMF_Evas.h>
 #include <Ecore.h>
-#include <time.h>
-#include <notification.h>
+//#include <time.h>
+
 
 void __add_help_of_password_fails(int ret, SettingPassword *ad);
 

diff --git a/setting-password/src/setting-password-sim.c b/setting-password/src/setting-password-sim.c
index 17babf10d53aad2230410357c52e6617cdbca085..54c2a599d175a039682fe43f6b8c3f818b6c136b 100644 (file)
--- a/setting-password/src/setting-password-sim.c
+++ b/setting-password/src/setting-password-sim.c
@@ -19,16 +19,14 @@
  *
  */
 
-#include <setting-password.h>
-#include <setting-password-sim.h>
-#include <setting-common-data-slp-setting.h>
-#include <setting-debug.h>
-#include <dd-haptic.h>
+#include "setting-password.h"
+#include "setting-password-sim.h"
+#include "setting-common-data-slp-setting.h"
+#include "setting-debug.h"
 #include <Ecore_IMF.h>
 #include <Ecore_IMF_Evas.h>
 #include <Ecore.h>
-#include <time.h>
-#include <notification.h>
+//#include <time.h>
 
 static int _view_create(void *cb);
 static int _view_destroy(void *cb);

diff --git a/setting-password/src/setting-password-simple.c b/setting-password/src/setting-password-simple.c
index b87da7c4022c9ca2c7d22d1c751f0cc28ce58705..fe8fd3e8ef142ac1015d3a56e32f6394dede15f8 100644 (file)
--- a/setting-password/src/setting-password-simple.c
+++ b/setting-password/src/setting-password-simple.c
@@ -19,15 +19,15 @@
 *
 */
 
-#include <setting-password.h>
-#include <setting-common-data-slp-setting.h>
-#include <setting-debug.h>
-#include <dd-haptic.h>
+#include "setting-password.h"
+#include "setting-common-data-slp-setting.h"
+#include "setting-debug.h"
+
 #include <Ecore_IMF.h>
 #include <Ecore_IMF_Evas.h>
 #include <Ecore.h>
-#include <time.h>
-#include <notification.h>
+//#include <time.h>
+
 
 #define SETTING_SP_TITLE_INDEX_START 0
 #define SETTING_SP_TITLE_INDEX_MAX 3

diff --git a/setting-privacy/CMakeLists.txt b/setting-privacy/CMakeLists.txt
index c55850b48f6efce5070340141f29573790710f47..ef17a2eb39e1d97bd9cee931fd0be4ee5dbe072b 100755 (executable)
--- a/setting-privacy/CMakeLists.txt
+++ b/setting-privacy/CMakeLists.txt
@@ -6,20 +6,10 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/${SETTING_COMMON}/include)
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs_privacy REQUIRED
-               appcore-common
-               appcore-efl
                capi-appfw-application
-               #capi-location-manager
-               capi-system-device
-               deviced
                dlog
-               ecore
-               edje
                efl-extension
                elementary
-               evas
-               json-glib-1.0
-               libtzplatform-config
                vconf
 )
 

diff --git a/setting-privacy/include/setting-privacy-main.h b/setting-privacy/include/setting-privacy-main.h
index 5db93c1f4c4d59a748b99614ac6d0670ef92d936..09624ff9b0502d7348f6d7ffe4e8da195146c30d 100644 (file)
--- a/setting-privacy/include/setting-privacy-main.h
+++ b/setting-privacy/include/setting-privacy-main.h
@@ -21,6 +21,6 @@
 #ifndef __SETTING_PRIVACY_MAIN_H__
 #define __SETTING_PRIVACY_MAIN_H__
 
-#include <setting-privacy.h>
+#include "setting-privacy.h"
 
 #endif                         /* __SETTING_PRIVACY_MAIN_H__ */

diff --git a/setting-privacy/src/setting-privacy-main.c b/setting-privacy/src/setting-privacy-main.c
index c6694e5f4c1d6aa6ffb98389e9e452d438668d99..efc41a45ad053a0e4e18ca4d2b63297d009d6733 100755 (executable)
--- a/setting-privacy/src/setting-privacy-main.c
+++ b/setting-privacy/src/setting-privacy-main.c
@@ -32,7 +32,8 @@ setting_view setting_view_privacy_main = {
        .create = _view_create,
        .destroy = _view_destroy,
        .update = _view_update,
-       .cleanup = _view_cleanup, };
+       .cleanup = _view_cleanup
+};
 
 /************************************************
  * @brief Do process when clicking '<-' button

diff --git a/setting-profile/CMakeLists.txt b/setting-profile/CMakeLists.txt
index 62f03d78e64b6a1bffbc422e2a26035b37c35265..4b1bad3d2e1489ef65b7c7dfc63ea5f8e0912ff4 100755 (executable)
--- a/setting-profile/CMakeLists.txt
+++ b/setting-profile/CMakeLists.txt
@@ -6,29 +6,16 @@ SET(SETTING_PKG_PROFILE "org.tizen.setting-profile")
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs_profile REQUIRED
-       appcore-common
-       appcore-efl
        callmgr_client
-       capi-appfw-app-manager
        capi-appfw-application
        capi-media-metadata-extractor
        capi-media-player
        capi-media-sound-manager
-       capi-system-device
        capi-system-system-settings
-       deviced
        dlog
-       ecore
-       ecore-file
        efl-extension
-       eina
        elementary
-       evas
        feedback
-       iniparser
-       json-glib-1.0
-       libtzplatform-config
-       mm-keysound
        notification
        vconf
 )

diff --git a/setting-ringtone/CMakeLists.txt b/setting-ringtone/CMakeLists.txt
index cbdf96af094cfef28bf035c6fbcf6df964f8f3bf..61a21cd3c82c93069f8e5891e15d6d7a6e02b2bf 100755 (executable)
--- a/setting-ringtone/CMakeLists.txt
+++ b/setting-ringtone/CMakeLists.txt
@@ -8,8 +8,15 @@ SET(SETTING_PKG_RINGTONE "org.tizen.setting-ringtone")
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs_ringtone REQUIRED
-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)
+       elementary
+       capi-appfw-application
+       capi-system-system-settings
+       capi-media-metadata-extractor
+       dlog
+       efl-extension
+       callmgr_client
+       capi-media-player
+)
 
 FOREACH(flag ${pkgs_ringtone_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")

diff --git a/setting-smartmanager/smartmanager-battery/CMakeLists.txt b/setting-smartmanager/smartmanager-battery/CMakeLists.txt
index e0e8a1668cd90bd4b3a9ce188a42afa0cb858ed1..576016bbe421606f00e35cc64b78dbf537593fc5 100644 (file)
--- a/setting-smartmanager/smartmanager-battery/CMakeLists.txt
+++ b/setting-smartmanager/smartmanager-battery/CMakeLists.txt
@@ -7,17 +7,15 @@ SET(PROJECT_SMARTMANAGER_BATTERY "smartmanager-battery")
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs_smartmanager_battery REQUIRED
-       appcore-efl
        capi-appfw-application
        capi-appfw-app-manager
        capi-appfw-package-manager
        capi-system-device
-       deviced
-       dpm
        elementary
        efl-extension
        pkgmgr
-       context)
+       context
+)
 
 FOREACH(flag ${pkgs_smartmanager_battery_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")

diff --git a/setting-smartmanager/smartmanager-data/CMakeLists.txt b/setting-smartmanager/smartmanager-data/CMakeLists.txt
index f5eacc1cc61e4f86dce1c86846f4c21fbfab13bb..d040176775ade290ff6ff1674669b6aa0b6ddf3c 100644 (file)
--- a/setting-smartmanager/smartmanager-data/CMakeLists.txt
+++ b/setting-smartmanager/smartmanager-data/CMakeLists.txt
@@ -6,8 +6,13 @@ 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
-capi-appfw-application deviced json-glib-1.0 alarm-service capi-system-system-settings libtzplatform-config)
+pkg_check_modules(pkgs_smartmanager_data REQUIRED
+       elementary
+       efl-extension
+       dlog
+       capi-appfw-application
+       capi-system-system-settings
+)
 
 FOREACH(flag ${pkgs_smartmanager_data_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")

diff --git a/setting-storage/CMakeLists.txt b/setting-storage/CMakeLists.txt
index 417a9e2e9a504025773769a39a6ac399b42eaaf4..8717f874235a7a568d1fd327d5bd0aa4ff5fa2af 100755 (executable)
--- a/setting-storage/CMakeLists.txt
+++ b/setting-storage/CMakeLists.txt
@@ -11,14 +11,13 @@ pkg_check_modules(pkgs_storage REQUIRED
        capi-appfw-application
        capi-appfw-package-manager
        capi-content-media-content
-       deviced storage
+       deviced
+       glib-2.0
+       storage
        dpm
        efl-extension
        elementary
-       json-glib-1.0
        pkgmgr
-       pkgmgr-info
-       tapi
        vconf
 )
 

diff --git a/setting-time/CMakeLists.txt b/setting-time/CMakeLists.txt
index 142e60b2f26ce0b7806a2a69030aaec33b24f3ed..b2c2beccc5c4aef49aa777d9dcdd2d9423b2054b 100755 (executable)
--- a/setting-time/CMakeLists.txt
+++ b/setting-time/CMakeLists.txt
@@ -5,8 +5,17 @@ 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 vconf sqlite3
-capi-appfw-application deviced json-glib-1.0 alarm-service capi-system-system-settings libtzplatform-config capi-base-utils-i18n)
+pkg_check_modules(pkgs_time REQUIRED
+       elementary
+       efl-extension
+       sqlite3
+       capi-appfw-application
+       deviced
+       alarm-service
+       capi-system-system-settings
+       capi-base-utils-i18n
+       vconf
+)
 
 FOREACH(flag ${pkgs_time_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")

diff --git a/setting-time/include/setting-time.h b/setting-time/include/setting-time.h
index edc2bd46ad8a394d17ef2a783bfb0bef15a2d527..5579ad9d0f254f3833be6ba035f2b5be7dcbc3f0 100644 (file)
--- a/setting-time/include/setting-time.h
+++ b/setting-time/include/setting-time.h
@@ -32,12 +32,11 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <Elementary.h>
-#include <alarm.h>
 
 #include <glib-object.h>
 
-#include <setting-common-draw-widget.h>
-#include <setting-common-view.h>
+#include "setting-common-draw-widget.h"
+#include "setting-common-view.h"
 #include "setting-common-init.h"
 
 #define ERR_BIGGER_THAN_2037 "Cannot Set the year bigger than 2037"

diff --git a/setting-time/src/setting-time-engine.c b/setting-time/src/setting-time-engine.c
index 071d1b97867580201e9686c8e853209b1a862fc3..57cb5ba91547defe8686cdb473aec8e588ddd919 100755 (executable)
--- a/setting-time/src/setting-time-engine.c
+++ b/setting-time/src/setting-time-engine.c
@@ -18,7 +18,7 @@
  * limitations under the License.
  *
  */
-#include <setting-time-engine.h>
+#include "setting-time-engine.h"
 
 /* To set system time takes some time. It makes some time before firing
  * vconf event */

diff --git a/setting-time/src/setting-time-main.c b/setting-time/src/setting-time-main.c
index ec91dbcaeccc77cfce9817ac07682a7dd1bcedbb..76bf95a54eef783803b8d3ad921462e7f8b51d78 100755 (executable)
--- a/setting-time/src/setting-time-main.c
+++ b/setting-time/src/setting-time-main.c
@@ -19,6 +19,7 @@
  *
  */
 
+#include <alarm.h>
 #include <setting-time-main.h>
 #include <dd-deviced-managed.h>
 #include <dd-deviced.h>
@@ -30,7 +31,6 @@
 #include <time.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sqlite3.h>
 
 #include <vconf.h>
 #include <vconf-keys.h>
@@ -39,6 +39,7 @@
 
 #include <bundle_internal.h>
 #include <system_settings.h>
+#include <sqlite3.h>
 
 #define ONE_MINUTE 60
 #define PROGRESS_POPUP_SHOW 0

diff --git a/setting-time/src/setting-time.c b/setting-time/src/setting-time.c
index 20735935f16212d9f3969e7ac8515ddaf86580d6..8df0d3a91fcbce13ebca4ceef0bf68b4f8986b38 100644 (file)
--- a/setting-time/src/setting-time.c
+++ b/setting-time/src/setting-time.c
@@ -19,8 +19,8 @@
  *
  */
 
-#include <setting-time.h>
-#include <setting-cfg.h>
+#include "setting-time.h"
+#include "setting-cfg.h"
 
 #define SETTING_TIME_PACKAGE_NAME "org.tizen.setting-time"
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6c504ac86476964f44f553c553105d13465752d3..4fda9b0d4e442340fcfe0c8ea634d65565081c69 100755 (executable)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,34 +1,15 @@
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs_main REQUIRED
-                                         glib-2.0 gthread-2.0 elementary
-                                         appcore-common appcore-efl
+                                         elementary
                                          tapi
-                                         dlog json-glib-1.0
+                                         dlog
                                          ui-gadget-1
-                                         capi-appfw-application aul
-                                         capi-appfw-preference
-                                         ecore-imf eina capi-system-sensor
-                                         ecore ecore-file ecore-input
-                                         deviced
-                                         appsvc libxml-2.0
+                                         capi-appfw-application
                                          capi-system-system-settings
-                                         capi-network-wifi
-                                         capi-network-bluetooth
-                                         dbus-glib-1
-                                         capi-media-player
-                                         capi-media-sound-manager
                                          feedback
-                                         capi-system-device
-                                         alarm-service
-                                         notification
-                                         capi-appfw-app-manager
-                                         pkgmgr-info
-                                         sqlite3
-                                         accounts-svc
-                                         capi-media-image-util
                                          efl-extension
-                                         callmgr_client
                                          libtzplatform-config
+                                         vconf
                                  )
 
 FOREACH(flag ${pkgs_main_CFLAGS})

diff --git a/src/setting-handler.c b/src/setting-handler.c
index 7370c35b7b4167a5987799fdee067ce5b61512e6..6d704a4b8e2357cc24d0e69c4d2e905ae0611a91 100644 (file)
--- a/src/setting-handler.c
+++ b/src/setting-handler.c
@@ -1,9 +1,6 @@
 #include <setting-handler.h>
 #include <setting-helper.h>
 
-#include <wifi.h>
-#include <bluetooth.h>
-#include <bluetooth_internal.h>
 #include <dbus/dbus.h>
 #include <app_control_internal.h>
 

diff --git a/src/setting.c b/src/setting.c
index a4a01c92752279db0d574417d53097b621faac4c..f4a4b55499e7f06e8ca1c66801805197e12dff6a 100644 (file)
--- a/src/setting.c
+++ b/src/setting.c
@@ -26,13 +26,11 @@
 #include "setting-common-init.h"
 
 #include <app.h>
-#include <sound_manager.h>
 #include <appcore-common.h>
 #include <sensor.h>
 #include <aul.h>
 #include <app_preference.h>
 #include <elm_object.h>
-#include <appsvc.h>
 #include <signal.h>
 #include <system_settings.h>
 #include <bundle_internal.h>