From: jin0.kim Date: Fri, 22 Apr 2016 04:37:52 +0000 (+0830) Subject: Remove appcore_common.h X-Git-Tag: submit/tizen/20160425.021916~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F18%2F66918%2F2;p=apps%2Fcore%2Fpreloaded%2Fquickpanel.git Remove appcore_common.h Change-Id: I47baae792463137aab9ae5e2b91dc63fdb3fdc9a --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 2d2da5c..6f40394 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -109,7 +109,6 @@ pkg_check_modules(pkgs REQUIRED capi-ui-efl-util tapi feedback - appcore-common notification badge vconf diff --git a/daemon/datetime/util-time.c b/daemon/datetime/util-time.c index 50b35e7..dbc49ed 100755 --- a/daemon/datetime/util-time.c +++ b/daemon/datetime/util-time.c @@ -27,7 +27,6 @@ #include #include -#include #include #include #include @@ -58,6 +57,8 @@ static int _fini(void *data); static void _lang_changed(void *data); static void _util_time_heartbeat_do(void); + + QP_Module qp_datetime_controller = { .name = "qp_datetime_controller", .init = _init, @@ -91,7 +92,7 @@ static struct info { .formatter_ampm = NULL, .generator = NULL, .date_generator = NULL, - .timeformat = APPCORE_TIME_FORMAT_24, + .timeformat = QP_TIME_FORMAT_24, .timeregion_format = NULL, .dateregion_format = NULL, .timezone_id = NULL, @@ -437,7 +438,7 @@ static UDateFormat *__util_time_time_formatter_get(void *data, int time_format, retif_nomsg(ad == NULL, NULL); retif_nomsg(s_info.generator == NULL, NULL); - if (time_format == APPCORE_TIME_FORMAT_24) { + if (time_format == QP_TIME_FORMAT_24) { snprintf(buf, sizeof(buf)-1, "%s", "HH:mm"); } else { /* set time format 12 */ @@ -504,7 +505,7 @@ static void _util_time_formatters_create(void *data) s_info.formatter_date = __util_time_date_formatter_get(ad, NULL, "MMMMEd"); } - if (s_info.timeformat == APPCORE_TIME_FORMAT_12) { + if (s_info.timeformat == QP_TIME_FORMAT_12) { if (s_info.formatter_ampm == NULL) { s_info.formatter_ampm = __util_time_ampm_formatter_get(ad, NULL); } @@ -622,9 +623,9 @@ static void _formatter_create(void *data) msgif(ret != SYSTEM_SETTINGS_ERROR_NONE, "failed to ignore key(SYSTEM_SETTINGS_KEY_LOCALE_TIMEFORMAT_24HOUR) : %d", ret); if (status == true){ - s_info.timeformat = APPCORE_TIME_FORMAT_24; + s_info.timeformat = QP_TIME_FORMAT_24; }else{ - s_info.timeformat = APPCORE_TIME_FORMAT_12; + s_info.timeformat = QP_TIME_FORMAT_12; } if (s_info.timeregion_format == NULL) { @@ -762,7 +763,7 @@ static void _util_time_get(int is_current_time, time_t tt_a, char **str_date, ch _util_time_formatted_time_get(s_info.formatter_date, tt, buf_date, sizeof(buf_date)); /* time */ - if (s_info.timeformat == APPCORE_TIME_FORMAT_24) { + if (s_info.timeformat == QP_TIME_FORMAT_24) { _util_time_formatted_time_get(s_info.formatter_time, tt, buf_time, sizeof(buf_time)-1); } else { _util_time_formatted_time_get(s_info.formatter_time, tt, buf_time, sizeof(buf_time)-1); diff --git a/daemon/datetime/util-time.h b/daemon/datetime/util-time.h index 5f43381..ec97d69 100755 --- a/daemon/datetime/util-time.h +++ b/daemon/datetime/util-time.h @@ -23,6 +23,12 @@ #define UTIL_TIME_MERIDIEM_TYPE_PRE 1 #define UTIL_TIME_MERIDIEM_TYPE_POST 2 +enum qp_time_format { + QP_TIME_FORMAT_UNKNOWN, + QP_TIME_FORMAT_12, + QP_TIME_FORMAT_24, +}; + extern void quickpanel_util_time_timer_enable_set(int is_enable); #endif /* __UTIL_TIME_H__ */ diff --git a/daemon/notifications/activenoti.c b/daemon/notifications/activenoti.c index 64ef6df..f3674c2 100755 --- a/daemon/notifications/activenoti.c +++ b/daemon/notifications/activenoti.c @@ -19,7 +19,6 @@ #include #include -#include #include #include #include diff --git a/daemon/notifications/noti.c b/daemon/notifications/noti.c index 12997e8..f595626 100755 --- a/daemon/notifications/noti.c +++ b/daemon/notifications/noti.c @@ -21,7 +21,6 @@ #include #include -#include #include #include #include diff --git a/packaging/org.tizen.quickpanel.spec b/packaging/org.tizen.quickpanel.spec index 8d502b2..411fbb7 100755 --- a/packaging/org.tizen.quickpanel.spec +++ b/packaging/org.tizen.quickpanel.spec @@ -35,7 +35,6 @@ BuildRequires: pkgconfig(capi-base-utils-i18n) BuildRequires: pkgconfig(capi-ui-efl-util) BuildRequires: pkgconfig(tapi) BuildRequires: pkgconfig(feedback) -BuildRequires: pkgconfig(appcore-common) BuildRequires: pkgconfig(notification) BuildRequires: pkgconfig(badge) BuildRequires: pkgconfig(vconf)