Change header name

Signed-off-by: Junghyun Yeon <jungh.yeon@samsung.com>

diff --git a/include/capability-manager.h b/include/capability-manager.h
new file mode 100644 (file)
index 0000000..314dc2e
--- /dev/null
+++ b/include/capability-manager.h
@@ -0,0 +1,258 @@
+// Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+// Use of this source code is governed by a apache 2.0 license that can be
+// found in the LICENSE file.
+
+#ifndef INCLUDE_CAPABILITY_MANAGER_H_
+#define INCLUDE_CAPABILITY_MANAGER_H_
+
+#include <tizen.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/**
+ * @brief
+ */
+typedef enum {
+  CAPMGR_ERROR_NONE = TIZEN_ERROR_NONE,
+  CAPMGR_ERROR_INVALID_PARAMETER = TIZEN_ERROR_INVALID_PARAMETER,
+  CAPMGR_ERROR_OUT_OF_MEMORY = TIZEN_ERROR_OUT_OF_MEMORY,
+  CAPMGR_ERROR_IO_ERROR = TIZEN_ERROR_IO_ERROR,
+} capmgr_error_e;
+
+typedef enum {
+  CAPMGR_APP_CONTROL_RESULT_OK,
+} capmgr_app_control_result_e;
+
+/**
+ * @brief
+ */
+typedef struct capmgr_device_s* capmgr_device_h;
+
+/**
+ * @brief
+ */
+typedef struct capmgr_app_control_s* capmgr_app_control_h;
+
+/**
+ * @brief
+ */
+typedef struct capmgr_package_info_s* capmgr_package_info_h;
+
+/**
+ * @brief
+ */
+typedef int (*capmgr_device_foreach_cb)(const capmgr_device_h device,
+    void* user_data);
+
+/**
+ * @brief
+ */
+typedef int (*capmgr_app_control_reply_cb)(const capmgr_app_control_h request,
+    const capmgr_app_control_h reply, capmgr_app_control_result_e result,
+    void* user_data);
+
+/**
+ * @brief
+ */
+typedef int (*capmgr_package_info_foreach_package_cb)(
+    const capmgr_package_info_h remote_package_info, void* user_data);
+
+/**
+ * @brief
+ */
+typedef int (*capmgr_package_info_foreach_app_cb)(
+    const char* appid, void* user_data);
+
+/**
+ * @brief
+ */
+int capmgr_device_foreach_devices(capmgr_device_foreach_cb cb,
+    void* user_data);
+
+/**
+ * @brief
+ */
+int capmgr_device_clone(const capmgr_device_h device,
+    capmgr_device_h* device_clone);
+
+/**
+ * @brief
+ */
+int capmgr_device_destroy(capmgr_device_h device);
+
+/**
+ * @brief
+ */
+int capmgr_device_get_device_id(capmgr_device_h device, char** device_id);
+
+/**
+ * @brief
+ */
+int capmgr_device_get_model_name(capmgr_device_h device, char** model_name);
+
+/**
+ * @brief
+ */
+int capmgr_device_get_device_name(capmgr_device_h device, char** device_name);
+
+/**
+ * @brief
+ */
+int capmgr_device_get_platform_ver(capmgr_device_h device, char** platform_ver);
+
+/**
+ * @brief
+ */
+int capmgr_device_get_profile(capmgr_device_h device, char** profile);
+
+/**
+ * @brief
+ */
+int capmgr_device_get_sw_ver(capmgr_device_h device, char** sw_ver);
+
+/**
+ * @brief
+ */
+int capmgr_device_get_platform_version(capmgr_device_h device,
+    char** platform_version);
+
+/**
+ * @brief
+ */
+int capmgr_app_control_create(capmgr_app_control_h* app_control);
+
+/**
+ * @brief
+ */
+int capmgr_app_control_clone(const capmgr_app_control_h app_control,
+    capmgr_app_control_h* app_control_clone);
+
+/**
+ * @brief
+ */
+int capmgr_app_control_destroy(capmgr_app_control_h app_control);
+
+/**
+ * @brief
+ */
+int capmgr_app_control_get_device(capmgr_app_control_h app_control,
+    capmgr_device_h* device);
+
+/**
+ * @brief
+ */
+int capmgr_app_control_get_operation(capmgr_app_control_h app_control,
+    char** operation);
+
+/**
+ * @brief
+ */
+int capmgr_app_control_get_uri(capmgr_app_control_h app_control,
+    char** uri);
+
+/**
+ * @brief
+ */
+int capmgr_app_control_get_mime(capmgr_app_control_h app_control,
+    char** mime);
+
+/**
+ * @brief
+ */
+int capmgr_app_control_get_appid(capmgr_app_control_h app_control,
+    char** appid);
+
+/**
+ * @brief
+ */
+int capmgr_app_control_get_extra_data(capmgr_app_control_h app_control,
+    const char* key, char** value);
+
+/**
+ * @brief
+ */
+int capmgr_app_control_set_device(capmgr_app_control_h app_control,
+    const capmgr_device_h device);
+
+/**
+ * @brief
+ */
+int capmgr_app_control_set_operation(capmgr_app_control_h app_control,
+    const char* operation);
+
+/**
+ * @brief
+ */
+int capmgr_app_control_set_uri(capmgr_app_control_h app_control,
+    const char* uri);
+
+/**
+ * @brief
+ */
+int capmgr_app_control_set_mime(capmgr_app_control_h app_control,
+    const char* mime);
+
+/**
+ * @brief
+ */
+int capmgr_app_control_set_appid(capmgr_app_control_h app_control,
+    const char* appid);
+
+/**
+ * @brief
+ */
+int capmgr_app_control_add_extra_data(capmgr_app_control_h app_control,
+    const char* key, const char* value);
+
+/**
+ * @brief
+ */
+int capmgr_app_control_remove_extra_data(capmgr_app_control_h app_control,
+    const char* key);
+
+/**
+ * @brief
+ */
+int capmgr_app_control_send(capmgr_app_control_h app_control,
+    capmgr_app_control_reply_cb cb, void* user_data);
+
+/**
+ * @brief
+ */
+int capmgr_package_info_foreach_packages(const capmgr_device_h device,
+    capmgr_package_info_foreach_package_cb cb, void* user_data);
+
+/**
+ * @brief
+ */
+int capmgr_package_info_foreach_applications(
+    const capmgr_package_info_h remote_package_info,
+    capmgr_package_info_foreach_app_cb cb, void* user_data);
+
+/**
+ * @brief
+ */
+int capmgr_package_info_get_pkgid(capmgr_package_info_h remote_package_info,
+    char** pkgid);
+
+/**
+ * @brief
+ */
+int capmgr_package_info_get_label(capmgr_package_info_h remote_package_info,
+    char** label);
+
+
+/**
+ * @brief
+ */
+int capmgr_package_info_get_version(capmgr_package_info_h remote_package_info,
+    char** version);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // INCLUDE_CAPABILITY_MANAGER_H_

diff --git a/include/capmgr.h b/include/capmgr.h
deleted file mode 100644 (file)
index daaf3b6..0000000
--- a/include/capmgr.h
+++ /dev/null
@@ -1,258 +0,0 @@
-// Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
-// Use of this source code is governed by a apache 2.0 license that can be
-// found in the LICENSE file.
-
-#ifndef INCLUDE_CAPMGR_H_
-#define INCLUDE_CAPMGR_H_
-
-#include <tizen.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/**
- * @brief
- */
-typedef enum {
-  CAPMGR_ERROR_NONE = TIZEN_ERROR_NONE,
-  CAPMGR_ERROR_INVALID_PARAMETER = TIZEN_ERROR_INVALID_PARAMETER,
-  CAPMGR_ERROR_OUT_OF_MEMORY = TIZEN_ERROR_OUT_OF_MEMORY,
-  CAPMGR_ERROR_IO_ERROR = TIZEN_ERROR_IO_ERROR,
-} capmgr_error_e;
-
-typedef enum {
-  CAPMGR_APP_CONTROL_RESULT_OK,
-} capmgr_app_control_result_e;
-
-/**
- * @brief
- */
-typedef struct capmgr_device_s* capmgr_device_h;
-
-/**
- * @brief
- */
-typedef struct capmgr_app_control_s* capmgr_app_control_h;
-
-/**
- * @brief
- */
-typedef struct capmgr_package_info_s* capmgr_package_info_h;
-
-/**
- * @brief
- */
-typedef int (*capmgr_device_foreach_cb)(const capmgr_device_h device,
-    void* user_data);
-
-/**
- * @brief
- */
-typedef int (*capmgr_app_control_reply_cb)(const capmgr_app_control_h request,
-    const capmgr_app_control_h reply, capmgr_app_control_result_e result,
-    void* user_data);
-
-/**
- * @brief
- */
-typedef int (*capmgr_package_info_foreach_package_cb)(
-    const capmgr_package_info_h remote_package_info, void* user_data);
-
-/**
- * @brief
- */
-typedef int (*capmgr_package_info_foreach_app_cb)(
-    const char* appid, void* user_data);
-
-/**
- * @brief
- */
-int capmgr_device_foreach_devices(capmgr_device_foreach_cb cb,
-    void* user_data);
-
-/**
- * @brief
- */
-int capmgr_device_clone(const capmgr_device_h device,
-    capmgr_device_h* device_clone);
-
-/**
- * @brief
- */
-int capmgr_device_destroy(capmgr_device_h device);
-
-/**
- * @brief
- */
-int capmgr_device_get_device_id(capmgr_device_h device, char** device_id);
-
-/**
- * @brief
- */
-int capmgr_device_get_model_name(capmgr_device_h device, char** model_name);
-
-/**
- * @brief
- */
-int capmgr_device_get_device_name(capmgr_device_h device, char** device_name);
-
-/**
- * @brief
- */
-int capmgr_device_get_platform_ver(capmgr_device_h device, char** platform_ver);
-
-/**
- * @brief
- */
-int capmgr_device_get_profile(capmgr_device_h device, char** profile);
-
-/**
- * @brief
- */
-int capmgr_device_get_sw_ver(capmgr_device_h device, char** sw_ver);
-
-/**
- * @brief
- */
-int capmgr_device_get_platform_version(capmgr_device_h device,
-    char** platform_version);
-
-/**
- * @brief
- */
-int capmgr_app_control_create(capmgr_app_control_h* app_control);
-
-/**
- * @brief
- */
-int capmgr_app_control_clone(const capmgr_app_control_h app_control,
-    capmgr_app_control_h* app_control_clone);
-
-/**
- * @brief
- */
-int capmgr_app_control_destroy(capmgr_app_control_h app_control);
-
-/**
- * @brief
- */
-int capmgr_app_control_get_device(capmgr_app_control_h app_control,
-    capmgr_device_h* device);
-
-/**
- * @brief
- */
-int capmgr_app_control_get_operation(capmgr_app_control_h app_control,
-    char** operation);
-
-/**
- * @brief
- */
-int capmgr_app_control_get_uri(capmgr_app_control_h app_control,
-    char** uri);
-
-/**
- * @brief
- */
-int capmgr_app_control_get_mime(capmgr_app_control_h app_control,
-    char** mime);
-
-/**
- * @brief
- */
-int capmgr_app_control_get_appid(capmgr_app_control_h app_control,
-    char** appid);
-
-/**
- * @brief
- */
-int capmgr_app_control_get_extra_data(capmgr_app_control_h app_control,
-    const char* key, char** value);
-
-/**
- * @brief
- */
-int capmgr_app_control_set_device(capmgr_app_control_h app_control,
-    const capmgr_device_h device);
-
-/**
- * @brief
- */
-int capmgr_app_control_set_operation(capmgr_app_control_h app_control,
-    const char* operation);
-
-/**
- * @brief
- */
-int capmgr_app_control_set_uri(capmgr_app_control_h app_control,
-    const char* uri);
-
-/**
- * @brief
- */
-int capmgr_app_control_set_mime(capmgr_app_control_h app_control,
-    const char* mime);
-
-/**
- * @brief
- */
-int capmgr_app_control_set_appid(capmgr_app_control_h app_control,
-    const char* appid);
-
-/**
- * @brief
- */
-int capmgr_app_control_add_extra_data(capmgr_app_control_h app_control,
-    const char* key, const char* value);
-
-/**
- * @brief
- */
-int capmgr_app_control_remove_extra_data(capmgr_app_control_h app_control,
-    const char* key);
-
-/**
- * @brief
- */
-int capmgr_app_control_send(capmgr_app_control_h app_control,
-    capmgr_app_control_reply_cb cb, void* user_data);
-
-/**
- * @brief
- */
-int capmgr_package_info_foreach_packages(const capmgr_device_h device,
-    capmgr_package_info_foreach_package_cb cb, void* user_data);
-
-/**
- * @brief
- */
-int capmgr_package_info_foreach_applications(
-    const capmgr_package_info_h remote_package_info,
-    capmgr_package_info_foreach_app_cb cb, void* user_data);
-
-/**
- * @brief
- */
-int capmgr_package_info_get_pkgid(capmgr_package_info_h remote_package_info,
-    char** pkgid);
-
-/**
- * @brief
- */
-int capmgr_package_info_get_label(capmgr_package_info_h remote_package_info,
-    char** label);
-
-
-/**
- * @brief
- */
-int capmgr_package_info_get_version(capmgr_package_info_h remote_package_info,
-    char** version);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // INCLUDE_CAPMGR_H_

diff --git a/packaging/capi-appfw-capmgr.spec b/packaging/capi-appfw-capmgr.spec
index 4f1a186f9090188c73f6c4ea9baef6083e0df50c..b33eae08eb3af592053b96c4d32f551feee628b1 100644 (file)
--- a/packaging/capi-appfw-capmgr.spec
+++ b/packaging/capi-appfw-capmgr.spec
@@ -53,6 +53,6 @@ MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 %{_bindir}/capmgr-test
 
 %files devel
-%{_includedir}/capmgr.h
+%{_includedir}/capability-manager.h
 %{_libdir}/pkgconfig/%{name}.pc
 %{_libdir}/lib%{name}.so

diff --git a/src/client.cc b/src/client.cc
index 9254bc5d3229db30aa23e3bbbba7d22ed76ad030..4d94287983ce4068b04ce6cb539bf25826f360c8 100644 (file)
--- a/src/client.cc
+++ b/src/client.cc
@@ -13,7 +13,7 @@
 #include <string>
 #include <vector>
 
-#include "include/capmgr.h"
+#include "include/capability-manager.h"
 #include "src/dbus.h"
 #include "src/sql_connection.h"
 #include "src/sql_statement.h"

diff --git a/src/dbus.h b/src/dbus.h
index 123a5bbb23051455fc85c5fd0139e1406cf01635..5520488e77ef5f656cf78df09308d8ecf5824f5b 100644 (file)
--- a/src/dbus.h
+++ b/src/dbus.h
@@ -7,7 +7,7 @@
 
 #include <glib.h>
 
-#include "include/capmgr.h"
+#include "include/capability-manager.h"
 
 namespace capmgr {
 

diff --git a/tools/capmgr_test.cc b/tools/capmgr_test.cc
index 14cd131c2fe025b93408c7c1762cb251dbb4c52b..76dcb790073eaa85282d79e45dea1a5f64b8146c 100644 (file)
--- a/tools/capmgr_test.cc
+++ b/tools/capmgr_test.cc
@@ -9,7 +9,7 @@
 
 #include <iostream>
 
-#include "include/capmgr.h"
+#include "include/capability-manager.h"
 
 namespace bpo = boost::program_options;