[IOT-357 ]Revise dependency (spec,include(.h),CMakeLists)

Change-Id: I868d38857142529f8031bba92bb1f1615d4c24f7

diff --git a/client/cal_client_db_helper.c b/client/cal_client_db_helper.c
index 3a3bb70..87ae1a8 100644 (file)
--- a/client/cal_client_db_helper.c
+++ b/client/cal_client_db_helper.c
@@ -17,17 +17,15 @@
  *
  */
 
-#include <stdlib.h>     //calloc
+#include <stdlib.h> //calloc
 #include <pims-ipc.h>
-#include <glib-object.h>    //g_type_init
+#include <glib-object.h> //g_type_init
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "calendar_service.h"
-#include "calendar_db.h"
-#include "calendar_types.h"
+#include "calendar.h"
 #include "cal_internal.h"
 #include "cal_typedef.h"
 #include "cal_inotify.h"

diff --git a/client/cal_client_reminder.c b/client/cal_client_reminder.c
index f96b90a..f6f95e8 100644 (file)
--- a/client/cal_client_reminder.c
+++ b/client/cal_client_reminder.c
@@ -20,11 +20,7 @@
 #include <stdlib.h>     //calloc
 #include <pims-ipc.h>
 
-#include "calendar_service.h"
-#include "calendar_db.h"
-#include "calendar_types.h"
-#include "calendar_reminder.h"
-
+#include "calendar.h"
 #include "cal_internal.h"
 #include "cal_typedef.h"
 #include "cal_inotify.h"

diff --git a/common/cal_filter.c b/common/cal_filter.c
index f10d68c..ef34064 100644 (file)
--- a/common/cal_filter.c
+++ b/common/cal_filter.c
@@ -22,7 +22,6 @@
 #include "cal_internal.h"
 #include "cal_typedef.h"
 #include "cal_view.h"
-
 #include "cal_filter.h"
 
 static int _cal_filter_create_attribute(cal_composite_filter_s *com_filter, unsigned int property_id,

diff --git a/common/cal_query.c b/common/cal_query.c
index 83f258d..2c75285 100644 (file)
--- a/common/cal_query.c
+++ b/common/cal_query.c
@@ -23,7 +23,6 @@
 #include "cal_typedef.h"
 #include "cal_view.h"
 #include "cal_filter.h"
-
 #include "cal_query.h"
 
 static bool _cal_query_property_check(const cal_property_info_s *properties,

diff --git a/common/cal_record.c b/common/cal_record.c
index e7eef08..9389221 100644 (file)
--- a/common/cal_record.c
+++ b/common/cal_record.c
@@ -18,14 +18,13 @@
  */
 
 
-#include <stdlib.h>            //calloc
-#include <stdbool.h>           //bool
+#include <stdlib.h> // calloc
+#include <stdbool.h> // bool
 #include <string.h>
 
 #include "cal_internal.h"
 #include "cal_typedef.h"
 #include "cal_view.h"
-
 #include "cal_record.h"
 
 #define __CHECK_READ_ONLY_PROPERTY() \

diff --git a/common/cal_record_alarm.c b/common/cal_record_alarm.c
index 5119186..b11b663 100644 (file)
--- a/common/cal_record_alarm.c
+++ b/common/cal_record_alarm.c
@@ -16,14 +16,14 @@
  * limitations under the License.
  *
  */
-#include <stdlib.h>            //calloc
-#include <stdbool.h>           //bool
+
+#include <stdlib.h>    // calloc
+#include <stdbool.h> // bool
 #include <string.h>
 
 #include "cal_internal.h"
 #include "cal_typedef.h"
 #include "cal_view.h"
-
 #include "cal_record.h"
 
 static int _cal_record_alarm_create( calendar_record_h* out_record );

diff --git a/common/cal_record_attendee.c b/common/cal_record_attendee.c
index 3acdc20..8e13f60 100644 (file)
--- a/common/cal_record_attendee.c
+++ b/common/cal_record_attendee.c
@@ -16,14 +16,14 @@
  * limitations under the License.
  *
  */
-#include <stdlib.h>            //calloc
-#include <stdbool.h>           //bool
+
+#include <stdlib.h>    // calloc
+#include <stdbool.h> // bool
 #include <string.h>
 
 #include "cal_internal.h"
 #include "cal_typedef.h"
 #include "cal_view.h"
-
 #include "cal_record.h"
 
 static int _cal_record_attendee_create( calendar_record_h* out_record );

diff --git a/common/cal_record_calendar.c b/common/cal_record_calendar.c
index 34138b1..5b4f328 100644 (file)
--- a/common/cal_record_calendar.c
+++ b/common/cal_record_calendar.c
@@ -16,14 +16,14 @@
  * limitations under the License.
  *
  */
-#include <stdlib.h>            //calloc
-#include <stdbool.h>           //bool
+
+#include <stdlib.h>    // calloc
+#include <stdbool.h> // bool
 #include <string.h>
 
 #include "cal_internal.h"
 #include "cal_typedef.h"
 #include "cal_view.h"
-
 #include "cal_record.h"
 
 static int _cal_record_calendar_create( calendar_record_h* out_record );

diff --git a/common/cal_record_event.c b/common/cal_record_event.c
index 214656a..ed8b2da 100644 (file)
--- a/common/cal_record_event.c
+++ b/common/cal_record_event.c
@@ -16,8 +16,9 @@
  * limitations under the License.
  *
  */
-#include <stdlib.h>            //calloc
-#include <stdbool.h>           //bool
+
+#include <stdlib.h>    // calloc
+#include <stdbool.h> // bool
 #include <string.h>
 
 #include "calendar_list.h"

diff --git a/common/cal_record_extended.c b/common/cal_record_extended.c
index 7032c88..ece1def 100644 (file)
--- a/common/cal_record_extended.c
+++ b/common/cal_record_extended.c
@@ -24,7 +24,6 @@
 #include "cal_internal.h"
 #include "cal_typedef.h"
 #include "cal_view.h"
-
 #include "cal_record.h"
 
 static int _cal_record_extended_create( calendar_record_h* out_record );

diff --git a/common/cal_record_instance_allday.c b/common/cal_record_instance_allday.c
index 97e6b6f..945e5dc 100644 (file)
--- a/common/cal_record_instance_allday.c
+++ b/common/cal_record_instance_allday.c
@@ -16,14 +16,14 @@
  * limitations under the License.
  *
  */
-#include <stdlib.h>     //calloc
-#include <stdbool.h>        //bool
+
+#include <stdlib.h>    // calloc
+#include <stdbool.h> // bool
 #include <string.h>
 
 #include "cal_internal.h"
 #include "cal_typedef.h"
 #include "cal_view.h"
-
 #include "cal_record.h"
 
 static int _cal_record_instance_allday_create( calendar_record_h* out_record );

diff --git a/common/cal_record_instance_allday_extended.c b/common/cal_record_instance_allday_extended.c
index c17f49e..1135781 100644 (file)
--- a/common/cal_record_instance_allday_extended.c
+++ b/common/cal_record_instance_allday_extended.c
@@ -16,14 +16,14 @@
  * limitations under the License.
  *
  */
-#include <stdlib.h>     //calloc
-#include <stdbool.h>        //bool
+
+#include <stdlib.h>    // calloc
+#include <stdbool.h> // bool
 #include <string.h>
 
 #include "cal_internal.h"
 #include "cal_typedef.h"
 #include "cal_view.h"
-
 #include "cal_record.h"
 
 static int _cal_record_instance_allday_extended_create( calendar_record_h* out_record );

diff --git a/common/cal_record_instance_normal.c b/common/cal_record_instance_normal.c
index 3e93e0f..1b9b821 100644 (file)
--- a/common/cal_record_instance_normal.c
+++ b/common/cal_record_instance_normal.c
@@ -16,14 +16,14 @@
  * limitations under the License.
  *
  */
-#include <stdlib.h>     //calloc
-#include <stdbool.h>        //bool
+
+#include <stdlib.h>    // calloc
+#include <stdbool.h> // bool
 #include <string.h>
 
 #include "cal_internal.h"
 #include "cal_typedef.h"
 #include "cal_view.h"
-
 #include "cal_record.h"
 
 static int _cal_record_instance_normal_create( calendar_record_h* out_record );

diff --git a/common/cal_record_instance_normal_extended.c b/common/cal_record_instance_normal_extended.c
index 7d6e11f..f19a0fc 100644 (file)
--- a/common/cal_record_instance_normal_extended.c
+++ b/common/cal_record_instance_normal_extended.c
@@ -16,14 +16,14 @@
  * limitations under the License.
  *
  */
-#include <stdlib.h>     //calloc
-#include <stdbool.h>        //bool
+
+#include <stdlib.h> // calloc
+#include <stdbool.h> // bool
 #include <string.h>
 
 #include "cal_internal.h"
 #include "cal_typedef.h"
 #include "cal_view.h"
-
 #include "cal_record.h"
 
 static int _cal_record_instance_normal_extended_create( calendar_record_h* out_record );

diff --git a/common/cal_record_search.c b/common/cal_record_search.c
index cfe90a7..cffb76b 100644 (file)
--- a/common/cal_record_search.c
+++ b/common/cal_record_search.c
@@ -17,14 +17,13 @@
  *
  */
 
-#include <stdlib.h>     //calloc
-#include <stdbool.h>        //bool
+#include <stdlib.h> // calloc
+#include <stdbool.h> // bool
 #include <string.h>
 
 #include "cal_internal.h"
 #include "cal_typedef.h"
 #include "cal_view.h"
-
 #include "cal_record.h"
 
 static int _cal_record_search_create( calendar_record_h* out_record );

diff --git a/common/cal_record_timezone.c b/common/cal_record_timezone.c
index 4025e25..bfefceb 100644 (file)
--- a/common/cal_record_timezone.c
+++ b/common/cal_record_timezone.c
@@ -16,14 +16,14 @@
  * limitations under the License.
  *
  */
-#include <stdlib.h>
-#include <stdbool.h>
+
+#include <stdlib.h> // calloc
+#include <stdbool.h> // bool
 #include <string.h>
 
 #include "cal_internal.h"
 #include "cal_typedef.h"
 #include "cal_view.h"
-
 #include "cal_record.h"
 
 static int _cal_record_timezone_create( calendar_record_h* out_record );

diff --git a/common/cal_record_todo.c b/common/cal_record_todo.c
index ed4bce7..9fa24e9 100644 (file)
--- a/common/cal_record_todo.c
+++ b/common/cal_record_todo.c
@@ -16,17 +16,16 @@
  * limitations under the License.
  *
  */
-#include <stdlib.h>            //calloc
-#include <stdbool.h>           //bool
+
+#include <stdlib.h> // calloc
+#include <stdbool.h> // bool
 #include <string.h>
 
 #include "calendar_list.h"
-
 #include "cal_internal.h"
 #include "cal_typedef.h"
 #include "cal_view.h"
 #include "cal_list.h"
-
 #include "cal_record.h"
 
 static int _cal_record_todo_create( calendar_record_h* out_record );

diff --git a/common/cal_record_updated_info.c b/common/cal_record_updated_info.c
index 3afc5bf..84f7993 100644 (file)
--- a/common/cal_record_updated_info.c
+++ b/common/cal_record_updated_info.c
@@ -17,13 +17,14 @@
  *
  */
 
-#include <stdlib.h>     //calloc
-#include <stdbool.h>        //bool
+#include <stdlib.h> // calloc
+#include <stdbool.h> // bool
 #include <string.h>
 
 #include "cal_internal.h"
 #include "cal_typedef.h"
 #include "cal_view.h"
+#include "cal_record.h"
 
 static int _cal_record_updated_info_create( calendar_record_h* out_record );
 static int _cal_record_updated_info_destroy( calendar_record_h record, bool delete_child );

diff --git a/common/cal_time.cpp b/common/cal_time.cpp
index 2788e8c..7f495ca 100644 (file)
--- a/common/cal_time.cpp
+++ b/common/cal_time.cpp
@@ -37,7 +37,6 @@
 #include "calendar.h"
 #include "cal_internal.h"
 #include "cal_typedef.h"
-
 #include "cal_time.h"
 
 #define ULOC_LOCALE_IDENTIFIER_CAPACITY (ULOC_FULLNAME_CAPACITY + 1 + ULOC_KEYWORD_AND_VALUES_CAPACITY)

diff --git a/common/cal_vcalendar.c b/common/cal_vcalendar.c
index a172dbd..b53ddb1 100644 (file)
--- a/common/cal_vcalendar.c
+++ b/common/cal_vcalendar.c
@@ -20,14 +20,12 @@
 #include <stdlib.h>
 
 #include "calendar_vcalendar.h"
-
 #include "cal_internal.h"
 #include "cal_typedef.h"
 #include "cal_record.h"
 #include "cal_view.h"
 #include "cal_time.h"
 #include "cal_list.h"
-
 #include "cal_vcalendar.h"
 #include "cal_vcalendar_make.h"
 #include "cal_vcalendar_parse.h"

diff --git a/common/cal_zone.c b/common/cal_zone.c
index e55d872..f62028b 100644 (file)
--- a/common/cal_zone.c
+++ b/common/cal_zone.c
@@ -17,8 +17,8 @@
  *
  */
 
-
 #include <vasum.h>
+
 #include "calendar_errors.h"
 #include "cal_internal.h"
 #include "cal_zone.h"

diff --git a/native/cal_access_control.h b/native/cal_access_control.h
index 7d1f575..0754525 100644 (file)
--- a/native/cal_access_control.h
+++ b/native/cal_access_control.h
@@ -34,4 +34,3 @@ bool cal_access_control_have_write_permission(int calendarbook_id);
 int cal_is_owner(int calendarbook_id);
 
 #endif // __CALENDAR_SVC_ACCESS_CONTROL_H__
-

diff --git a/native/cal_calendar.c b/native/cal_calendar.c
index 84b85be..8a9963f 100644 (file)
--- a/native/cal_calendar.c
+++ b/native/cal_calendar.c
@@ -17,15 +17,9 @@
  *
  */
 
-#include <unistd.h>
-#include <glib.h>
-#include <glib-object.h>
-#include <db-util.h>
-
-#include "cal_service.h"
 #include "cal_internal.h"
 #include "cal_typedef.h"
-#include "cal_db.h"
+#include "cal_db_util.h"
 #include "cal_view.h"
 #include "cal_mutex.h"
 

diff --git a/native/cal_calendar.h b/native/cal_calendar.h
new file mode 100644 (file)
index 0000000..9292727
--- /dev/null
+++ b/native/cal_calendar.h
@@ -0,0 +1,27 @@
+/*
+ * Calendar Service
+ *
+ * Copyright (c) 2012 - 2013 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#ifndef __CALENDAR_SVC_CALENDAR_H__
+#define __CALENDAR_SVC_CALENDAR_H__
+
+void cal_calendar_internal_disconnect(const char *zone_name);
+int cal_connect(const char *zone_name);
+int cal_disconnect(const char *zone_name);
+
+#endif // __CALENDAR_SVC_CALENDAR_H__

diff --git a/native/cal_db.c b/native/cal_db.c
index f431206..b48c353 100755 (executable)
--- a/native/cal_db.c
+++ b/native/cal_db.c
@@ -17,7 +17,7 @@
  *
  */
 
-#include <unistd.h>
+#include <unistd.h> // sleep
 #include <glib.h>
 #include <db-util.h>
 

diff --git a/native/cal_db_plugin_timezone.c b/native/cal_db_plugin_timezone.c
index 16526f6..1491384 100644 (file)
--- a/native/cal_db_plugin_timezone.c
+++ b/native/cal_db_plugin_timezone.c
@@ -19,8 +19,6 @@
 
 #include <stdlib.h>
 
-#include "calendar_db.h"  //calendar_db_get_record
-
 #include "cal_internal.h"
 #include "cal_typedef.h"
 #include "cal_view.h"

diff --git a/native/cal_db_plugin_todo.c b/native/cal_db_plugin_todo.c
index 5ef6ffb..6a6f37a 100644 (file)
--- a/native/cal_db_plugin_todo.c
+++ b/native/cal_db_plugin_todo.c
@@ -20,7 +20,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "calendar_db.h"
 #include "cal_internal.h"
 #include "cal_typedef.h"
 #include "cal_view.h"

diff --git a/native/cal_reminder.c b/native/cal_reminder.c
index 4afd577..dfa8261 100644 (file)
--- a/native/cal_reminder.c
+++ b/native/cal_reminder.c
@@ -20,7 +20,6 @@
 #include <stdlib.h>
 
 #include "calendar_reminder.h"
-
 #include "cal_internal.h"
 #include "cal_typedef.h"
 #include "cal_view.h"

diff --git a/server/cal_server.c b/server/cal_server.c
index 7221e30..849eaa0 100644 (file)
--- a/server/cal_server.c
+++ b/server/cal_server.c
@@ -20,11 +20,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <grp.h>
 #include <sys/types.h>
 #include <unistd.h>     //getuid
-#include <pims-ipc.h>
-#include <pims-ipc-svc.h>
 #include <glib-object.h>
 #include <alarm.h>
 #include <contacts.h>
@@ -34,11 +31,8 @@
 #include "cal_internal.h" // DBG
 #include "cal_ipc.h"
 #include "cal_server_ipc.h"
-#include "cal_typedef.h"
 #include "cal_inotify.h"
-
 #include "cal_db.h" // CAL_SECURITY_FILE_GROUP
-
 #include "cal_server_contacts.h"
 #include "cal_server_alarm.h"
 #include "cal_server_calendar_delete.h"

diff --git a/server/cal_server_alarm.c b/server/cal_server_alarm.c
index 132253d..56ae060 100644 (file)
--- a/server/cal_server_alarm.c
+++ b/server/cal_server_alarm.c
@@ -25,10 +25,10 @@
 #include <vconf.h>
 #include <app.h>
 
-#include "cal_internal.h"
 #include "calendar.h"
-#include "cal_time.h"
 #include "cal_typedef.h"
+#include "cal_internal.h"
+#include "cal_time.h"
 #include "cal_inotify.h"
 
 #include "cal_db_util.h"

diff --git a/server/cal_server_calendar_delete.c b/server/cal_server_calendar_delete.c
index bcef291..10dc951 100644 (file)
--- a/server/cal_server_calendar_delete.c
+++ b/server/cal_server_calendar_delete.c
@@ -17,7 +17,7 @@
  *
  */
 
-#include <stdlib.h>     //calloc
+#include <stdlib.h> //calloc
 #include <glib.h>
 #include <unistd.h> //sleep
 

diff --git a/server/cal_server_contacts.c b/server/cal_server_contacts.c
index 7e9dc5b..85455f6 100644 (file)
--- a/server/cal_server_contacts.c
+++ b/server/cal_server_contacts.c
@@ -23,8 +23,8 @@
 #include <unistd.h>    // usleep
 
 #include "calendar.h"
-#include "cal_internal.h" // DBG
 #include "cal_typedef.h"
+#include "cal_internal.h" // DBG
 #include "cal_db.h"
 #include "cal_db_util.h"
 #include "cal_time.h"

diff --git a/server/cal_server_reminder.c b/server/cal_server_reminder.c
index 31503c8..ff1ce8f 100644 (file)
--- a/server/cal_server_reminder.c
+++ b/server/cal_server_reminder.c
@@ -20,6 +20,7 @@
 
 #include <stdlib.h>
 #include <pims-ipc-svc.h>
+#include <pims-ipc-data.h>
 
 #include "calendar.h"
 #include "cal_internal.h" // DBG

diff --git a/server/cal_server_update.c b/server/cal_server_update.c
index 43aecb4..6c66c5a 100644 (file)
--- a/server/cal_server_update.c
+++ b/server/cal_server_update.c
@@ -21,8 +21,8 @@
 #include <db-util.h>
 #include <stdlib.h>
 
-#include "cal_internal.h"
 #include "cal_typedef.h"
+#include "cal_internal.h"
 #include "cal_db.h"
 
 #define __USER_VERSION 105