modified header define according to file name

Change-Id: I08d8ce67d46735f8f1f977b21a063154a53742b6

diff --git a/common/cal_filter.h b/common/cal_filter.h
index 558708c..4292e1c 100644 (file)
--- a/common/cal_filter.h
+++ b/common/cal_filter.h
@@ -17,11 +17,11 @@
  *
  */
 
-#ifndef __CALENDAR_SERVICE_FILTER_H__
-#define __CALENDAR_SERVICE_FILTER_H__
+#ifndef __CAL_FILTER_H__
+#define __CAL_FILTER_H__
 
 #include "calendar_filter.h"
 
 int cal_filter_clone(calendar_filter_h filter, calendar_filter_h* out_filter);
 
-#endif /*__CALENDAR_SERVICE_FILTER_H__ */
+#endif /*__CAL_FILTER_H__ */

diff --git a/common/cal_inotify.h b/common/cal_inotify.h
index a7a9621..2f181c0 100644 (file)
--- a/common/cal_inotify.h
+++ b/common/cal_inotify.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __CALENDAR_SERVICE_INOTIFY_H__
-#define __CALENDAR_SERVICE_INOTIFY_H__
+#ifndef __CAL_INOTIFY_H__
+#define __CAL_INOTIFY_H__
 
 #include "calendar_db.h"
 #include "cal_typedef.h"
@@ -28,4 +28,4 @@ int cal_inotify_subscribe(cal_noti_type_e type, const char *path, void *cb, void
 int cal_inotify_unsubscribe(const char *path, void *cb, void *user_data);
 void cal_inotify_deinit(void);
 
-#endif /* __CALENDAR_SERVICE_INOTIFY_H__ */
+#endif /* __CAL_INOTIFY_H__ */

diff --git a/common/cal_internal.h b/common/cal_internal.h
index 697c04f..1f1b010 100644 (file)
--- a/common/cal_internal.h
+++ b/common/cal_internal.h
@@ -16,8 +16,8 @@
  * limitations under the License.
  *
  */
-#ifndef __CALENDAR_SERVICE_INTERNAL_H__
-#define __CALENDAR_SERVICE_INTERNAL_H__
+#ifndef __CAL_INTERNAL_H__
+#define __CAL_INTERNAL_H__
 
 #include <stdio.h>
 #include <string.h>
@@ -145,5 +145,5 @@
 #define TLS
 #endif
 
-#endif /* __CALENDAR_SERVICE_INTERNAL_H__ */
+#endif /* __CAL_INTERNAL_H__ */
 

diff --git a/common/cal_list.h b/common/cal_list.h
index 95f2c3b..09c8854 100644 (file)
--- a/common/cal_list.h
+++ b/common/cal_list.h
@@ -16,8 +16,8 @@
  * limitations under the License.
  *
  */
-#ifndef __CALENDAR_SERVICE_LIST_H__
-#define __CALENDAR_SERVICE_LIST_H__
+#ifndef __CAL_LIST_H__
+#define __CAL_LIST_H__
 
 #include "calendar_list.h"
 
@@ -25,4 +25,4 @@ int cal_list_clone(calendar_list_h list, calendar_list_h *out_list);
 int cal_list_get_nth_record_p(cal_list_s *list_s, int index, calendar_record_h *record);
 int cal_list_clear(cal_list_s *list_s);
 
-#endif /* __CALENDAR_SERVICE_LIST_H__ */
+#endif /* __CAL_LIST_H__ */

diff --git a/common/cal_mutex.h b/common/cal_mutex.h
index ee8fb6a..e7586a6 100644 (file)
--- a/common/cal_mutex.h
+++ b/common/cal_mutex.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __CALENDAR_SERVICE_MUTEX_H__
-#define __CALENDAR_SERVICE_MUTEX_H__
+#ifndef __CAL_MUTEX_H__
+#define __CAL_MUTEX_H__
 
 enum {
        CAL_MUTEX_CONNECTION,
@@ -34,4 +34,4 @@ enum {
 void cal_mutex_lock(int type);
 void cal_mutex_unlock(int type);
 
-#endif  /*__CALENDAR_SERVICE_MUTEX_H__ */
+#endif  /*__CAL_MUTEX_H__ */

diff --git a/common/cal_query.c b/common/cal_query.c
index 1020151..36b35a7 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"
 #include "cal_utils.h"
 
 static bool _cal_query_property_check(const cal_property_info_s *properties,

diff --git a/common/cal_query.h b/common/cal_query.h
deleted file mode 100644 (file)
index e2615d8..0000000
--- a/common/cal_query.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Calendar Service
- *
- * Copyright (c) 2012 - 2015 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_SERVICE_QUERY_H__
-#define __CALENDAR_SERVICE_QUERY_H__
-
-#endif  /* __CALENDAR_SERVICE_QUERY_H__ */

diff --git a/common/cal_record.h b/common/cal_record.h
index d74d5cd..9c602d7 100644 (file)
--- a/common/cal_record.h
+++ b/common/cal_record.h
@@ -16,8 +16,8 @@
  * limitations under the License.
  *
  */
-#ifndef __CALENDAR_SERVICE_RECORD_H__
-#define __CALENDAR_SERVICE_RECORD_H__
+#ifndef __CAL_RECORD_H__
+#define __CAL_RECORD_H__
 
 #include "calendar_record.h"
 
@@ -144,5 +144,5 @@ int cal_record_set_caltime(calendar_record_h record, unsigned int property_id, c
 }
 #endif
 
-#endif /* __CALENDAR_SERVICE_RECORD_H__ */
+#endif /* __CAL_RECORD_H__ */
 

diff --git a/common/cal_time.h b/common/cal_time.h
index b31bab2..2402a03 100644 (file)
--- a/common/cal_time.h
+++ b/common/cal_time.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __CALENDAR_SERVICE_TIME_H__
-#define __CALENDAR_SERVICE_TIME_H__
+#ifndef __CAL_TIME_H__
+#define __CAL_TIME_H__
 
 #include <string.h>
 #include <stdlib.h>
@@ -51,14 +51,8 @@ void cal_time_get_datetime(long long int t, int *y, int *m, int *d, int *h, int
 void cal_time_get_local_datetime(char *tzid, long long int t, int *y, int *m, int *d, int *h, int *n, int *s);
 bool cal_time_is_available_tzid(char *tzid);
 
-enum cal_extract_field {
-       CAL_MONTH,
-       CAL_DAY_OF_WEEK,
-       CAL_DATE,
-};
-
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* __CALENDAR_SERVICE_TIME_H__ */
+#endif /* __CAL_TIME_H__ */

diff --git a/common/cal_typedef.h b/common/cal_typedef.h
index f899da0..8b644ee 100644 (file)
--- a/common/cal_typedef.h
+++ b/common/cal_typedef.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __CALENDAR_SERVICE_TYPEDEF_H__
-#define __CALENDAR_SERVICE_TYPEDEF_H__
+#ifndef __CAL_TYPEDEF_H__
+#define __CAL_TYPEDEF_H__
 
 #include <glib.h>
 #include <complex.h>
@@ -508,4 +508,4 @@ typedef struct {
  * @}
  */
 
-#endif /* __CALENDAR_SERVICE_TYPEDEF_H__ */
+#endif /* __CAL_TYPEDEF_H__ */

diff --git a/common/cal_vcalendar.h b/common/cal_vcalendar.h
index 470aaeb..48ae079 100644 (file)
--- a/common/cal_vcalendar.h
+++ b/common/cal_vcalendar.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __CALENDAR_SERVICE_VCALENDAR_H__
-#define __CALENDAR_SERVICE_VCALENDAR_H__
+#ifndef __CAL_VCALENDAR_H__
+#define __CAL_VCALENDAR_H__
 
 #define _RECORD(i) _calendar_##i
 
@@ -27,4 +27,4 @@ enum {
        VCALENDAR_TYPE_VTODO,
 };
 
-#endif /* __CALENDAR_SERVICE_VCALENDAR_H__ */
+#endif /* __CAL_VCALENDAR_H__ */

diff --git a/common/cal_vcalendar_make.h b/common/cal_vcalendar_make.h
index 985dde4..22166f7 100644 (file)
--- a/common/cal_vcalendar_make.h
+++ b/common/cal_vcalendar_make.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __CALENDAR_SERVICE_VCALENDAR_MAKE_H__
-#define __CALENDAR_SERVICE_VCALENDAR_MAKE_H__
+#ifndef __CAL_VCALENDAR_MAKE_H__
+#define __CAL_VCALENDAR_MAKE_H__
 
 #include "calendar_vcalendar.h"
 
@@ -36,4 +36,4 @@ int cal_vcalendar_make_vcalendar(cal_make_s *b, calendar_list_h list);
 char* cal_vcalendar_make_get_data(cal_make_s *b);
 void cal_vcalendar_make_free(cal_make_s **b);
 
-#endif /* __CALENDAR_SERVICE_VCALENDAR_MAKE_H__ */
+#endif /* __CAL_VCALENDAR_MAKE_H__ */

diff --git a/common/cal_vcalendar_parse.h b/common/cal_vcalendar_parse.h
index f6b6e37..ef2ccd1 100644 (file)
--- a/common/cal_vcalendar_parse.h
+++ b/common/cal_vcalendar_parse.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __CALENDAR_SERVICE_VCALENDAR_PARSE_H__
-#define __CALENDAR_SERVICE_VCALENDAR_PARSE_H__
+#ifndef __CAL_VCALENDAR_PARSE_H__
+#define __CAL_VCALENDAR_PARSE_H__
 
 #include "calendar_vcalendar.h"
 
@@ -34,4 +34,4 @@ char* cal_vcalendar_parse_read_line(char *stream, char **line);
 char* cal_vcalendar_parse_read_key_value(char *stream, char **prop, char **cont);
 int cal_vcalendar_parse_vcalendar_object(char *vcalendar_object_stream, calendar_list_h list, vcalendar_foreach_s *foreach_data);
 
-#endif /* __CALENDAR_SERVICE_VCALENDAR_PARSE_H__ */
+#endif /* __CAL_VCALENDAR_PARSE_H__ */

diff --git a/common/cal_view.h b/common/cal_view.h
index 94be806..34e0b51 100644 (file)
--- a/common/cal_view.h
+++ b/common/cal_view.h
@@ -16,8 +16,8 @@
  * limitations under the License.
  *
  */
-#ifndef __CALENDAR_SERVICE_VIEW_H__
-#define __CALENDAR_SERVICE_VIEW_H__
+#ifndef __CAL_VIEW_H__
+#define __CAL_VIEW_H__
 
 #include "cal_typedef.h"
 #include "calendar_view.h"
@@ -357,5 +357,5 @@ const cal_property_info_s* cal_view_get_property_info(const char *view_uri, int
 
 const char* cal_view_get_uri(const char *view_uri);
 
-#endif /* __CALENDAR_SERVICE_VIEW_H__ */
+#endif /* __CAL_VIEW_H__ */
 

diff --git a/common/dbus/cal_dbus_helper.h b/common/dbus/cal_dbus_helper.h
index 347d6b8..a1d7129 100644 (file)
--- a/common/dbus/cal_dbus_helper.h
+++ b/common/dbus/cal_dbus_helper.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __CALENDAR_SERVICE_DBUS_UTILS_H__
-#define __CALENDAR_SERVICE_DBUS_UTILS_H__
+#ifndef __CAL_DBUS_UTILS_H__
+#define __CAL_DBUS_UTILS_H__
 
 /*
  * DBUS_INTERFACE name validation.
@@ -47,4 +47,4 @@ int cal_dbus_utils_gvariant_to_query(GVariant *arg_query, calendar_query_h *quer
 int cal_dbus_utils_gvariant_to_ids(GVariant *arg_ids, int count, int **ids);
 int cal_dbus_utils_gvariant_to_stream(GVariant *arg_stream, int *out_size, char **out_stream);
 
-#endif /*__CALENDAR_SERVICE_DBUS_UTILS_H__ */
+#endif /*__CAL_DBUS_UTILS_H__ */

diff --git a/server/cal_access_control.h b/server/cal_access_control.h
index 858dfaa..a164a20 100644 (file)
--- a/server/cal_access_control.h
+++ b/server/cal_access_control.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __CALENDAR_SERVICE_ACCESS_CONTROL_H__
-#define __CALENDAR_SERVICE_ACCESS_CONTROL_H__
+#ifndef __CAL_SERVER_ACCESS_CONTROL_H__
+#define __CAL_SERVER_ACCESS_CONTROL_H__
 
 #include "cal_typedef.h"
 
@@ -32,5 +32,4 @@ void cal_access_control_reset(void);  /* reset read_list, write_list.. */
 bool cal_access_control_have_write_permission(int book_id);
 int cal_is_owner(int book_id);
 
-
-#endif /*  __CALENDAR_SERVICE_ACCESS_CONTROL_H__ */
+#endif /*  __CAL_SERVER_ACCESS_CONTROL_H__ */

diff --git a/server/cal_server_account.h b/server/cal_server_account.h
index 3c515c1..1089532 100644 (file)
--- a/server/cal_server_account.h
+++ b/server/cal_server_account.h
@@ -17,10 +17,10 @@
  *
  */
 
-#ifndef __CALENDAR_SERVICE_ACCOUNT_H__
-#define __CALENDAR_SERVICE_ACCOUNT_H__
+#ifndef __CAL_SERVER_ACCOUNT_H__
+#define __CAL_SERVER_ACCOUNT_H__
 
 int cal_server_account_init(void);
 void cal_server_account_deinit(void);
 
-#endif /*__CALENDAR_SERVICE_ACCOUNT_H__ */
+#endif /*__CAL_SERVER_ACCOUNT_H__ */

diff --git a/server/cal_server_ondemand.h b/server/cal_server_ondemand.h
index 1a24569..a8b5109 100644 (file)
--- a/server/cal_server_ondemand.h
+++ b/server/cal_server_ondemand.h
@@ -17,12 +17,12 @@
  *
  */
 
-#ifndef __CALENDAR_SERVICE_ONDEMAND_H__
-#define __CALENDAR_SERVICE_ONDEMAND_H__
+#ifndef __CAL_SERVER_ONDEMAND_H__
+#define __CAL_SERVER_ONDEMAND_H__
 
 void cal_server_ondemand_stop(void);
 void cal_server_ondemand_start(void);
 void cal_server_ondemand_hold(void);
 void cal_server_ondemand_release(void);
 
-#endif /*__CALENDAR_SERVICE_ONDEMAND_H__ */
+#endif /*__CAL_SERVER_ONDEMAND_H__ */

diff --git a/server/cal_server_service.h b/server/cal_server_service.h
index 4be16eb..daba14c 100644 (file)
--- a/server/cal_server_service.h
+++ b/server/cal_server_service.h
@@ -17,11 +17,11 @@
  *
  */
 
-#ifndef __CALENDAR_SERVICE_CALENDAR_H__
-#define __CALENDAR_SERVICE_CALENDAR_H__
+#ifndef __CAL_SERVER_SERVICE_H__
+#define __CAL_SERVER_SERVICE_H__
 
 void cal_service_internal_disconnect(void);
 int cal_connect(void);
 int cal_disconnect(void);
 
-#endif /* __CALENDAR_SERVICE_CALENDAR_H__ */
+#endif /* __CAL_SERVER_SERVICE_H__ */

diff --git a/server/db/cal_db_plugin_book_helper.h b/server/db/cal_db_plugin_book_helper.h
index 5c5eba4..a724ac8 100644 (file)
--- a/server/db/cal_db_plugin_book_helper.h
+++ b/server/db/cal_db_plugin_book_helper.h
@@ -16,9 +16,9 @@
  * limitations under the License.
  *
  */
-#ifndef __CAL_DB_PLUGIN_CALENDAR_HELPER_H__
-#define __CAL_DB_PLUGIN_CALENDAR_HELPER_H__
+#ifndef __CAL_DB_PLUGIN_BOOK_HELPER_H__
+#define __CAL_DB_PLUGIN_BOOK_HELPER_H__
 
 int cal_db_delete_account(int account_id);
 
-#endif /* __CAL_DB_PLUGIN_CALENDAR_HELPER_H__ */
+#endif /* __CAL_DB_PLUGIN_BOOK_HELPER_H__ */