Fix wrong include declaration 00/227700/4
authorhyunho <hhstark.kang@samsung.com>
Mon, 16 Mar 2020 03:15:22 +0000 (12:15 +0900)
committerhyunho <hhstark.kang@samsung.com>
Mon, 16 Mar 2020 04:04:27 +0000 (13:04 +0900)
Change-Id: I9198a11146581fe2e8e4e3ad74e71dcdb9ddc1bf
Signed-off-by: hyunho <hhstark.kang@samsung.com>
35 files changed:
watchface-common/db-manager.hh
watchface-common/include/watchface-common-internal.h
watchface-common/shared-handle.hh
watchface-common/watchface-common-internal.hh
watchface-common/watchface-exception.hh
watchface-common/watchface-util.hh
watchface-complication-provider/complication-provider-event-interface.hh
watchface-complication-provider/complication-provider-implementation.hh
watchface-complication-provider/complication-provider.hh
watchface-complication/complication-connector-implementation.h [deleted file]
watchface-complication/complication-connector-implementation.hh [new file with mode: 0644]
watchface-complication/complication-connector.cc
watchface-complication/complication-connector.hh
watchface-complication/complication-event-interface.hh
watchface-complication/complication-implementation.hh
watchface-complication/complication-internal.hh
watchface-complication/complication.hh
watchface-complication/design-element-implementation.hh
watchface-complication/design-element.hh
watchface-complication/editable-interface.hh
watchface-complication/editables-container-event-interface.hh
watchface-complication/editables-container-implementation.hh
watchface-complication/editables-container.hh
watchface-complication/editables-manager-implementation.hh
watchface-complication/editables-manager.hh
watchface-complication/gdbus-interface.hh
watchface-complication/gdbus.hh
watchface-complication/package-manager-interface.hh
watchface-complication/package-manager.hh
watchface-complication/received-editable-implementation.hh
watchface-complication/received-editable.hh
watchface-editor/editables-editor-event-interface.hh
watchface-editor/editables-editor-implementation.hh
watchface-editor/editables-editor.hh
watchface-editor/include/watchface-editor.h

index 4c502637a1804e4812200d1581fa2b77654da423..c1f3685106c61110168ed97cb729eaa7669c1281 100644 (file)
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef WATCHFACE_COMPLICATION_DB_MANAGER_H_
-#define WATCHFACE_COMPLICATION_DB_MANAGER_H_
+#ifndef WATCHFACE_COMPLICATION_DB_MANAGER_HH_
+#define WATCHFACE_COMPLICATION_DB_MANAGER_HH_
 
 #include <gio/gio.h>
 #include <sqlite3.h>
@@ -85,4 +85,4 @@ class EXPORT_API DBManager {
 
 }  // namespace watchface_complication
 
-#endif  // WATCHFACE_COMPLICATION_DB_MANAGER_H_
+#endif  // WATCHFACE_COMPLICATION_DB_MANAGER_HH_
index caf563dbcfd5255533e37d24e837069f700d8cd0..04e80ab8f79b3669b317575371fd57cb2ba3ab84 100644 (file)
@@ -23,6 +23,12 @@ extern "C" {
 
 #define        WATCHFACE_COMPLICATION_TYPE_SMALL_IMAGE  0x80 /**< Small Image */
 
+typedef enum _editor_error_e {
+       WATCHFACE_EDITOR_ERROR_NONE = 0x01, /**< Error none */
+       WATCHFACE_EDITOR_ERROR_PERMISSION_DENY = 0x02, /**< Watchface do not have privileges for provider application. */
+       WATCHFACE_EDITOR_ERROR_EVENT_NOT_SUPPORT = 0x04 /**< Watchface complication do not support provider's events. */
+} watchface_editor_error_e;
+
 #ifdef __cplusplus
 }
 #endif
index c8402ee67920c31092d2cabbf41bb9d598924e00..3ff3191f87243931dbca671981ba5f4422cdded1 100644 (file)
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef WATCHFACE_COMMON_SHARED_HANDLE_H_
-#define WATCHFACE_COMMON_SHARED_HANDLE_H_
+#ifndef WATCHFACE_COMMON_SHARED_HANDLE_HH_
+#define WATCHFACE_COMMON_SHARED_HANDLE_HH_
 
 namespace watchface_complication {
 
@@ -56,4 +56,4 @@ class SharedHandle {
 
 }  // namespace watchface_complication
 
-#endif  // WATCHFACE_COMMON_SHARED_HANDLE_H_
\ No newline at end of file
+#endif  // WATCHFACE_COMMON_SHARED_HANDLE_HH_
\ No newline at end of file
index ba47a5f5090364167ae35b0c2bc0836275f0ac85..ec0c6c38a42d0284fcd5016647d0267999986c63 100644 (file)
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef WATCHFACE_COMMON_WATCHFACE_COMMON_INTERNAL_H_
-#define WATCHFACE_COMMON_WATCHFACE_COMMON_INTERNAL_H_
+#ifndef WATCHFACE_COMMON_WATCHFACE_COMMON_INTERNAL_HH_
+#define WATCHFACE_COMMON_WATCHFACE_COMMON_INTERNAL_HH_
 
 #include <tizen.h>
 
 extern "C" {
 #endif
 
-typedef enum _editor_error_e {
-       WATCHFACE_EDITOR_ERROR_NONE = 0x01, /**< Error none */
-       WATCHFACE_EDITOR_ERROR_PERMISSION_DENY = 0x02, /**< Watchface do not have privileges for provider application. */
-       WATCHFACE_EDITOR_ERROR_EVENT_NOT_SUPPORT = 0x04 /**< Watchface complication do not support provider's events. */
-} watchface_editor_error_e;
-
 struct complication_time_info_s {
   char *timezone;
   char *timezone_id;
@@ -75,4 +69,4 @@ struct complication_time_info_s {
 }
 #endif
 
-#endif  // WATCHFACE_COMMON_WATCHFACE_COMMON_INTERNAL_H_
+#endif  // WATCHFACE_COMMON_WATCHFACE_COMMON_INTERNAL_HH_
index 4504fbdb7930644f7bd40d7af2ea71c1e7781599..0665cbe18d374cd439eabba40af0f65f4de4969d 100644 (file)
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef WATCHFACE_COMMON_WATCHFACE_EXCEPTION_H_
-#define WATCHFACE_COMMON_WATCHFACE_EXCEPTION_H_
+#ifndef WATCHFACE_COMMON_WATCHFACE_EXCEPTION_HH_
+#define WATCHFACE_COMMON_WATCHFACE_EXCEPTION_HH_
 
 #include <string>
 #include <exception>
@@ -77,4 +77,4 @@ class Exception : public std::exception {
 /* LCOV_EXCL_STOP */
 }  // namespace watchface_complication
 
-#endif  // WATCHFACE_COMMON_WATCHFACE_EXCEPTION_H_
+#endif  // WATCHFACE_COMMON_WATCHFACE_EXCEPTION_HH_
index b6707334bb6a5b55d961854f0a4c40ca10e77dbc..ebd2f20478c01defce6edb6f35dbcae8f73e57f5 100644 (file)
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef WATCHFACE_COMMON_WATCHFACE_UTIL_H_
-#define WATCHFACE_COMMON_WATCHFACE_UTIL_H_
+#ifndef WATCHFACE_COMMON_WATCHFACE_UTIL_HH_
+#define WATCHFACE_COMMON_WATCHFACE_UTIL_HH_
 
 #include <gio/gio.h>
 #include <bundle.h>
@@ -115,4 +115,4 @@ namespace util {
 }  // namespace util
 }  // namespace watchface_complication
 
-#endif  // WATCHFACE_COMMON_WATCHFACE_UTIL_H_
+#endif  // WATCHFACE_COMMON_WATCHFACE_UTIL_HH_
index 38bac5e57646890da5e9ab6425c15a8d943ea61a..58195ae12a1b0b3631177e2bef90ac1968a4db2e 100644 (file)
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef WATCHFACE_COMPLICATION_PROVIDER_COMPLICATION_PROVIDER_EVENT_INTERFACE_H_
-#define WATCHFACE_COMPLICATION_PROVIDER_COMPLICATION_PROVIDER_EVENT_INTERFACE_H_
+#ifndef WATCHFACE_COMPLICATION_PROVIDER_COMPLICATION_PROVIDER_EVENT_INTERFACE_HH_
+#define WATCHFACE_COMPLICATION_PROVIDER_COMPLICATION_PROVIDER_EVENT_INTERFACE_HH_
 
 #include <bundle_cpp.h>
 
@@ -37,4 +37,4 @@ class EXPORT_API IComplicationProviderEvent {
 
 }  // namespace watchface_complication
 
-#endif  // WATCHFACE_COMPLICATION_PROVIDER_COMPLICATION_PROVIDER_EVENT_INTERFACE_H_
+#endif  // WATCHFACE_COMPLICATION_PROVIDER_COMPLICATION_PROVIDER_EVENT_INTERFACE_HH_
index 1d1e8a0429a11435a24690f9f9351414a61655c6..a5e8bab001c5858ecfb3fdab2d19d444318ca8bb 100644 (file)
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef WATCHFACE_COMPLICATION_PROVIDER_COMPLICATION_PROVIDER_IMPLEMENTATION_H_
-#define WATCHFACE_COMPLICATION_PROVIDER_COMPLICATION_PROVIDER_IMPLEMENTATION_H_
+#ifndef WATCHFACE_COMPLICATION_PROVIDER_COMPLICATION_PROVIDER_IMPLEMENTATION_HH_
+#define WATCHFACE_COMPLICATION_PROVIDER_COMPLICATION_PROVIDER_IMPLEMENTATION_HH_
 
 #include <gio/gio.h>
 
@@ -90,5 +90,5 @@ class ComplicationProvider::Impl : IGDBus::IGDBusEvent {
 
 }  // namespace watchface_complication
 
-#endif  // WATCHFACE_COMPLICATION_PROVIDER_COMPLICATION_PROVIDER_IMPLEMENTATION_H_
+#endif  // WATCHFACE_COMPLICATION_PROVIDER_COMPLICATION_PROVIDER_IMPLEMENTATION_HH_
 
index 479994e8ed531bfb81e9e947ff90dcd9b9e5fb01..876615b1432777677087927e1e6584a82b8c8ed0 100644 (file)
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef WATCHFACE_COMPLICATION_PROVIDER_COMPLICATION_PROVIDER_H_
-#define WATCHFACE_COMPLICATION_PROVIDER_COMPLICATION_PROVIDER_H_
+#ifndef WATCHFACE_COMPLICATION_PROVIDER_COMPLICATION_PROVIDER_HH_
+#define WATCHFACE_COMPLICATION_PROVIDER_COMPLICATION_PROVIDER_HH_
 
 #include <gio/gio.h>
 #include <string>
@@ -51,4 +51,4 @@ class EXPORT_API ComplicationProvider : public IComplicationEvent {
 
 }  // namespace watchface_complication
 
-#endif  // WATCHFACE_COMPLICATION_PROVIDER_COMPLICATION_PROVIDER_H_
+#endif  // WATCHFACE_COMPLICATION_PROVIDER_COMPLICATION_PROVIDER_HH_
diff --git a/watchface-complication/complication-connector-implementation.h b/watchface-complication/complication-connector-implementation.h
deleted file mode 100644 (file)
index 7e7acaf..0000000
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
- *
- * 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 WATCHFACE_COMPLICATION_COMPLICATION_CONNECTOR_IMPLEMENTATION_H_
-#define WATCHFACE_COMPLICATION_COMPLICATION_CONNECTOR_IMPLEMENTATION_H_
-
-#include <gio/gio.h>
-#include <dlog.h>
-
-#include <memory>
-#include <string>
-#include <list>
-
-#include "watchface-complication/complication.hh"
-#include "watchface-complication/complication-connector.hh"
-
-#ifdef LOG_TAG
-#undef LOG_TAG
-#endif
-
-#define LOG_TAG "WATCHFACE_COMPLICATION"
-#define LOG_TAG "WATCHFACE_COMPLICATION"
-
-namespace watchface_complication {
-
-class ComplicationConnector::Impl {
- public:
-  virtual ~Impl() {
-    if (conn_)
-      g_object_unref(conn_);
-    if (pkgmgr_client_)
-      pkgmgr_client_free(pkgmgr_client_);
-  }
-
- private:
-  friend class ComplicationConnector;
-  Impl();
-  static int PackageAppinfoCallback(const pkgmgrinfo_appinfo_h handle,
-      void* user_data) {
-    char* appid = nullptr;
-    int ret = pkgmgrinfo_appinfo_get_appid(handle, &appid);
-    if (ret < 0) {
-      LOGE("Failed to get appid");
-      return 0;
-    }
-    LOGI("add (%s) for delete/disable list", appid);
-    package_app_list_.push_back(appid);
-    return 0;
-  }
-
-  static int HandlingPackageCb(const char* pkgname, const char* val) {
-    pkgmgrinfo_appinfo_filter_h handle;
-    int ret = pkgmgrinfo_appinfo_filter_create(&handle);
-    if (ret != PMINFO_R_OK) {
-      LOGE("filter create failed [%d]", ret);
-      return WATCHFACE_COMPLICATION_ERROR_IO_ERROR;
-    }
-    ret = pkgmgrinfo_appinfo_filter_add_string(handle,
-        PMINFO_APPINFO_PROP_APP_PACKAGE, pkgname);
-    if (ret != PMINFO_R_OK) {
-      LOGE("filter add pkgname failed [%d]", ret);
-      pkgmgrinfo_appinfo_filter_destroy(handle);
-      return WATCHFACE_COMPLICATION_ERROR_IO_ERROR;
-    }
-    ret = pkgmgrinfo_appinfo_filter_foreach_appinfo(handle,
-        PackageAppinfoCallback, nullptr);
-    if (ret != PMINFO_R_OK) {
-      LOGE("foreach failed [%d]", ret);
-      pkgmgrinfo_appinfo_filter_destroy(handle);
-      return WATCHFACE_COMPLICATION_ERROR_IO_ERROR;
-    }
-    pkgmgrinfo_appinfo_filter_destroy(handle);
-    return 0;
-  }
-
-  static int PkgmgrPackageStatusCb(uid_t target_uid, int req_id,
-      const char* pkg_type, const char* pkgid, const char* key,
-      const char* val, const void* pmsg, void* data) {
-    LOGI("%s, (%s : %s)", pkgid, key, val);
-    if (strcmp(key, "start") == 0) {
-      if (strcmp(val, "disable_app") == 0 || strcmp(val, "uninstall") == 0) {
-        current_pkg_event_ = std::string(val);
-        HandlingPackageCb(pkgid, current_pkg_event_.c_str());
-      } else {
-        current_pkg_event_ = "";
-      }
-    } else if (strcmp(key, "end") == 0) {
-      if (strcmp(val, "ok") == 0  &&
-          (strcmp(current_pkg_event_.c_str(), "disable_app") == 0 ||
-          strcmp(current_pkg_event_.c_str(), "uninstall") == 0)) {
-        LOGW("handling package event (%s)", current_pkg_event_.c_str());
-        for (std::string& appid : package_app_list_) {
-          for (IPackageManager::IPackageEvent* pe : package_listener_list_) {
-            if (strcmp(current_pkg_event_.c_str(), "disable_app") == 0) {
-              LOGI("disabled cb (%s)", appid.c_str());
-              pe->OnAppDisabled(appid);
-            } else if (strcmp(current_pkg_event_.c_str(), "uninstall") == 0) {
-              LOGI("uninstalled cb (%s)", appid.c_str());
-              pe->OnAppUninstalled(appid);
-            }
-          }
-        }
-      }
-      package_app_list_.clear();
-    }
-
-    return 0;
-  }
-
- private:
-  GDBusConnection* conn_ = nullptr;
-  pkgmgr_client* pkgmgr_client_ = nullptr;
-  std::string appid_;
-
- private:
-  static std::list<IPackageManager::IPackageEvent*> package_listener_list_;
-  static std::list<std::string> package_app_list_;
-  static std::string current_pkg_event_;
-};
-
-}  // namespace watchface_complication
-
-#endif  // WATCHFACE_COMPLICATION_COMPLICATION_CONNECTOR_IMPLEMENTATION_H_
diff --git a/watchface-complication/complication-connector-implementation.hh b/watchface-complication/complication-connector-implementation.hh
new file mode 100644 (file)
index 0000000..becec2d
--- /dev/null
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ *
+ * 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 WATCHFACE_COMPLICATION_COMPLICATION_CONNECTOR_IMPLEMENTATION_HH_
+#define WATCHFACE_COMPLICATION_COMPLICATION_CONNECTOR_IMPLEMENTATION_HH_
+
+#include <gio/gio.h>
+#include <dlog.h>
+
+#include <memory>
+#include <string>
+#include <list>
+
+#include "watchface-complication/complication.hh"
+#include "watchface-complication/complication-connector.hh"
+
+#ifdef LOG_TAG
+#undef LOG_TAG
+#endif
+
+#define LOG_TAG "WATCHFACE_COMPLICATION"
+#define LOG_TAG "WATCHFACE_COMPLICATION"
+
+namespace watchface_complication {
+
+class ComplicationConnector::Impl {
+ public:
+  virtual ~Impl() {
+    if (conn_)
+      g_object_unref(conn_);
+    if (pkgmgr_client_)
+      pkgmgr_client_free(pkgmgr_client_);
+  }
+
+ private:
+  friend class ComplicationConnector;
+  Impl();
+  static int PackageAppinfoCallback(const pkgmgrinfo_appinfo_h handle,
+      void* user_data) {
+    char* appid = nullptr;
+    int ret = pkgmgrinfo_appinfo_get_appid(handle, &appid);
+    if (ret < 0) {
+      LOGE("Failed to get appid");
+      return 0;
+    }
+    LOGI("add (%s) for delete/disable list", appid);
+    package_app_list_.push_back(appid);
+    return 0;
+  }
+
+  static int HandlingPackageCb(const char* pkgname, const char* val) {
+    pkgmgrinfo_appinfo_filter_h handle;
+    int ret = pkgmgrinfo_appinfo_filter_create(&handle);
+    if (ret != PMINFO_R_OK) {
+      LOGE("filter create failed [%d]", ret);
+      return WATCHFACE_COMPLICATION_ERROR_IO_ERROR;
+    }
+    ret = pkgmgrinfo_appinfo_filter_add_string(handle,
+        PMINFO_APPINFO_PROP_APP_PACKAGE, pkgname);
+    if (ret != PMINFO_R_OK) {
+      LOGE("filter add pkgname failed [%d]", ret);
+      pkgmgrinfo_appinfo_filter_destroy(handle);
+      return WATCHFACE_COMPLICATION_ERROR_IO_ERROR;
+    }
+    ret = pkgmgrinfo_appinfo_filter_foreach_appinfo(handle,
+        PackageAppinfoCallback, nullptr);
+    if (ret != PMINFO_R_OK) {
+      LOGE("foreach failed [%d]", ret);
+      pkgmgrinfo_appinfo_filter_destroy(handle);
+      return WATCHFACE_COMPLICATION_ERROR_IO_ERROR;
+    }
+    pkgmgrinfo_appinfo_filter_destroy(handle);
+    return 0;
+  }
+
+  static int PkgmgrPackageStatusCb(uid_t target_uid, int req_id,
+      const char* pkg_type, const char* pkgid, const char* key,
+      const char* val, const void* pmsg, void* data) {
+    LOGI("%s, (%s : %s)", pkgid, key, val);
+    if (strcmp(key, "start") == 0) {
+      if (strcmp(val, "disable_app") == 0 || strcmp(val, "uninstall") == 0) {
+        current_pkg_event_ = std::string(val);
+        HandlingPackageCb(pkgid, current_pkg_event_.c_str());
+      } else {
+        current_pkg_event_ = "";
+      }
+    } else if (strcmp(key, "end") == 0) {
+      if (strcmp(val, "ok") == 0  &&
+          (strcmp(current_pkg_event_.c_str(), "disable_app") == 0 ||
+          strcmp(current_pkg_event_.c_str(), "uninstall") == 0)) {
+        LOGW("handling package event (%s)", current_pkg_event_.c_str());
+        for (std::string& appid : package_app_list_) {
+          for (IPackageManager::IPackageEvent* pe : package_listener_list_) {
+            if (strcmp(current_pkg_event_.c_str(), "disable_app") == 0) {
+              LOGI("disabled cb (%s)", appid.c_str());
+              pe->OnAppDisabled(appid);
+            } else if (strcmp(current_pkg_event_.c_str(), "uninstall") == 0) {
+              LOGI("uninstalled cb (%s)", appid.c_str());
+              pe->OnAppUninstalled(appid);
+            }
+          }
+        }
+      }
+      package_app_list_.clear();
+    }
+
+    return 0;
+  }
+
+ private:
+  GDBusConnection* conn_ = nullptr;
+  pkgmgr_client* pkgmgr_client_ = nullptr;
+  std::string appid_;
+
+ private:
+  static std::list<IPackageManager::IPackageEvent*> package_listener_list_;
+  static std::list<std::string> package_app_list_;
+  static std::string current_pkg_event_;
+};
+
+}  // namespace watchface_complication
+
+#endif  // WATCHFACE_COMPLICATION_COMPLICATION_CONNECTOR_IMPLEMENTATION_HH_
index cfcdfd9d7f55b6615032b0ee4191ffc5b188eaf8..f9984aa9845034bf95c1d20df9011777d87639cd 100644 (file)
@@ -24,7 +24,7 @@
 #include <list>
 
 #include "watchface-complication/complication-connector.hh"
-#include "watchface-complication/complication-connector-implementation.h"
+#include "watchface-complication/complication-connector-implementation.hh"
 #include "watchface-common/watchface-exception.hh"
 #include "watchface-complication/package-manager.hh"
 #include "watchface-complication/gdbus.hh"
index f87319f878aa8ce5e43901f6aaba29675f70faca..64e59538b04c58efa715a10f639fac4f597cf3e2 100644 (file)
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef WATCHFACE_COMPLICATION_COMPLICATION_CONNECTOR_H_
-#define WATCHFACE_COMPLICATION_COMPLICATION_CONNECTOR_H_
+#ifndef WATCHFACE_COMPLICATION_COMPLICATION_CONNECTOR_HH_
+#define WATCHFACE_COMPLICATION_COMPLICATION_CONNECTOR_HH_
 
 #include <gio/gio.h>
 #include <string>
@@ -49,4 +49,4 @@ class EXPORT_API ComplicationConnector {
 
 }  // namespace watchface_complication
 
-#endif  // WATCHFACE_COMPLICATION_COMPLICATION_CONNECTOR_H_
+#endif  // WATCHFACE_COMPLICATION_COMPLICATION_CONNECTOR_HH_
index 0e7bd13b2a9820d590b040a8144e3c42751748d1..de9693531f6a9876869e9b31e39f7b50b0e2e7ff 100644 (file)
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef WATCHFACE_COMPLICATION_COMPLICATION_EVENT_INTERFACE_H_
-#define WATCHFACE_COMPLICATION_COMPLICATION_EVENT_INTERFACE_H_
+#ifndef WATCHFACE_COMPLICATION_COMPLICATION_EVENT_INTERFACE_HH_
+#define WATCHFACE_COMPLICATION_COMPLICATION_EVENT_INTERFACE_HH_
 
 #include <bundle_cpp.h>
 
@@ -38,4 +38,4 @@ class EXPORT_API IComplicationEvent {
 
 }  // namespace watchface_complication
 
-#endif  // WATCHFACE_COMPLICATION_COMPLICATION_EVENT_INTERFACE_H_
+#endif  // WATCHFACE_COMPLICATION_COMPLICATION_EVENT_INTERFACE_HH_
index a41e880a2ba4616e8b95aa7e9fc617e2347ac75a..0d860928b018272f5b214429df84cb179bd37234 100644 (file)
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef WATCHFACE_COMPLICATION_COMPLICATION_IMPLEMENTATION_H_
-#define WATCHFACE_COMPLICATION_COMPLICATION_IMPLEMENTATION_H_
+#ifndef WATCHFACE_COMPLICATION_COMPLICATION_IMPLEMENTATION_HH_
+#define WATCHFACE_COMPLICATION_COMPLICATION_IMPLEMENTATION_HH_
 
 #include <gio/gio.h>
 #include <dlog.h>
@@ -132,4 +132,4 @@ class Complication::Impl : IGDBus::IGDBusEvent, IPackageManager::IPackageEvent {
 
 }  // namespace watchface_complication
 
-#endif  // WATCHFACE_COMPLICATION_COMPLICATION_IMPLEMENTATION_H_
+#endif  // WATCHFACE_COMPLICATION_COMPLICATION_IMPLEMENTATION_HH_
index 2688847c2248841d438dc72c5211dc1817cc6e12..0cbe9bced39c45fcd57753a4e0e95612684827e4 100644 (file)
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __TIZEN_APPFW_COMPLICATION_INTERNAL_H__
-#define __TIZEN_APPFW_COMPLICATION_INTERNAL_H__
+#ifndef WATCHFACE_COMPLICATION_COMPLICATION_INTERNAL_HH_
+#define WATCHFACE_COMPLICATION_COMPLICATION_INTERNAL_HH_
 
 #include <watchface-common.h>
 #include "watchface-common/include/watchface-common-internal.h"
@@ -41,4 +41,4 @@ typedef enum {
 
 }  // namespace watchface_complication
 
-#endif  /* __TIZEN_APPFW_COMPLICATION_INTERNAL_H__ */
+#endif  /* WATCHFACE_COMPLICATION_COMPLICATION_INTERNAL_HH_ */
index 3c7684a36db641ba9594efd3e4e67151f82363f6..10a03c28468a849544aa0ddee549a22c26c4aa3f 100755 (executable)
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef WATCHFACE_COMPLICATION_COMPLICATION_H_
-#define WATCHFACE_COMPLICATION_COMPLICATION_H_
+#ifndef WATCHFACE_COMPLICATION_COMPLICATION_HH_
+#define WATCHFACE_COMPLICATION_COMPLICATION_HH_
 
 #include <gio/gio.h>
 #include <bundle_cpp.h>
@@ -129,4 +129,4 @@ class EXPORT_API Complication : public IEditable
 
 }  // namespace watchface_complication
 
-#endif  // WATCHFACE_COMPLICATION_COMPLICATION_H_
+#endif  // WATCHFACE_COMPLICATION_COMPLICATION_HH_
index df490cf9b85ff30ec290a1508894f91ec91d4578..c5ae434e5156ee6554088e1a6d96de0e0d5a032a 100644 (file)
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef WATCHFACE_COMPLICATION_DESIGN_ELEMENT_IMPLEMENTATION_H_
-#define WATCHFACE_COMPLICATION_DESIGN_ELEMENT_IMPLEMENTATION_H_
+#ifndef WATCHFACE_COMPLICATION_DESIGN_ELEMENT_IMPLEMENTATION_HH_
+#define WATCHFACE_COMPLICATION_DESIGN_ELEMENT_IMPLEMENTATION_HH_
 
 #include <gio/gio.h>
 #include <bundle_cpp.h>
@@ -59,7 +59,7 @@ class DesignElement::Impl {
 
 }  // namespace watchface_complication
 
-#endif  // WATCHFACE_COMPLICATION_DESIGN_ELEMENT_IMPLEMENTATION_H_
+#endif  // WATCHFACE_COMPLICATION_DESIGN_ELEMENT_IMPLEMENTATION_HH_
 
 
 
index 2c2c7bb5c6f931faac7444f73360d335e326b337..f4696606e881b1aa014307c012f0ae487577dc0f 100644 (file)
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef WATCHFACE_COMPLICATION_DESIGN_ELEMENT_H_
-#define WATCHFACE_COMPLICATION_DESIGN_ELEMENT_H_
+#ifndef WATCHFACE_COMPLICATION_DESIGN_ELEMENT_HH_
+#define WATCHFACE_COMPLICATION_DESIGN_ELEMENT_HH_
 
 #include <gio/gio.h>
 #include <bundle_cpp.h>
@@ -69,4 +69,4 @@ class EXPORT_API DesignElement : public IEditable {
 
 }  // namespace watchface_complication
 
-#endif  // WATCHFACE_COMPLICATION_DESIGN_ELEMENT_H_
+#endif  // WATCHFACE_COMPLICATION_DESIGN_ELEMENT_HH_
index 1162567addf6c5ae780b779ad06c60376c47fe82..5931a2f3b8c3a112384b208e36c138a46e256123 100644 (file)
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef WATCHFACE_COMPLICATION_EDITABLE_INTERFACE_H_
-#define WATCHFACE_COMPLICATION_EDITABLE_INTERFACE_H_
+#ifndef WATCHFACE_COMPLICATION_EDITABLE_INTERFACE_HH_
+#define WATCHFACE_COMPLICATION_EDITABLE_INTERFACE_HH_
 #include <bundle_cpp.h>
 
 #include <string>
@@ -338,4 +338,4 @@ class IEditable {
 
 }  // namespace watchface_complication
 
-#endif  // WATCHFACE_COMPLICATION_EDITABLE_INTERFACE_H_
+#endif  // WATCHFACE_COMPLICATION_EDITABLE_INTERFACE_HH_
index e9b7f2716b8f2c143fef53d9625a753bb85b5c55..c3e390eb4ce21221c99bc67e3db3501760c551c6 100644 (file)
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef WATCHFACE_COMPLICATION_EDITABLES_CONTAINER_EVENT_INTERFACE_H_
-#define WATCHFACE_COMPLICATION_EDITABLES_CONTAINER_EVENT_INTERFACE_H_
+#ifndef WATCHFACE_COMPLICATION_EDITABLES_CONTAINER_EVENT_INTERFACE_HH_
+#define WATCHFACE_COMPLICATION_EDITABLES_CONTAINER_EVENT_INTERFACE_HH_
 #include <bundle_cpp.h>
 
 #include <string>
@@ -37,4 +37,4 @@ class EXPORT_API IEditablesContainerEvent {
 
 }  // namespace watchface_complication
 
-#endif  // WATCHFACE_COMPLICATION_EDITABLES_CONTAINER_EVENT_INTERFACE_H_
+#endif  // WATCHFACE_COMPLICATION_EDITABLES_CONTAINER_EVENT_INTERFACE_HH_
index 4d3d5551d17b2c27d5ca4b1219bb25318ae3e309..c2b58b94b82f5a89e9271482a4065cea7d75077b 100644 (file)
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef WATCHFACE_COMPLICATION_EDITABLES_CONTAINER_IMPLEMENTATION_H_
-#define WATCHFACE_COMPLICATION_EDITABLES_CONTAINER_IMPLEMENTATION_H_
+#ifndef WATCHFACE_COMPLICATION_EDITABLES_CONTAINER_IMPLEMENTATION_HH_
+#define WATCHFACE_COMPLICATION_EDITABLES_CONTAINER_IMPLEMENTATION_HH_
 
 #include <gio/gio.h>
 
@@ -63,7 +63,7 @@ class EditablesContainer::Impl : IGDBus::IGDBusEvent {
 
 }  // namespace watchface_complication
 
-#endif  // WATCHFACE_COMPLICATION_EDITABLES_CONTAINER_IMPLEMENTATION_H_
+#endif  // WATCHFACE_COMPLICATION_EDITABLES_CONTAINER_IMPLEMENTATION_HH_
 
 
 
index 9a38649fb900483384a8be86763117f0c0d0cb2a..85274a6bb618a9f216384be59c3235740feec02d 100644 (file)
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef WATCHFACE_COMPLICATION_EDITABLES_CONTAINER_H_
-#define WATCHFACE_COMPLICATION_EDITABLES_CONTAINER_H_
+#ifndef WATCHFACE_COMPLICATION_EDITABLES_CONTAINER_HH_
+#define WATCHFACE_COMPLICATION_EDITABLES_CONTAINER_HH_
 
 #include <gio/gio.h>
 
@@ -50,4 +50,4 @@ class EXPORT_API EditablesContainer : IEditablesEditorEvent {
 
 }  // namespace watchface_complication
 
-#endif  // WATCHFACE_COMPLICATION_EDITABLES_CONTAINER_H_
+#endif  // WATCHFACE_COMPLICATION_EDITABLES_CONTAINER_HH_
index 3e3b29cfc5a0bca80b2d51e773fd1bc92750a5ed..40e45fab1c777d41cebda5869a1c84cc08ff4510 100644 (file)
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef WATCHFACE_COMPLICATION_EDITABLES_MANAGER_IMPLEMENTATION_H_
-#define WATCHFACE_COMPLICATION_EDITABLES_MANAGER_IMPLEMENTATION_H_
+#ifndef WATCHFACE_COMPLICATION_EDITABLES_MANAGER_IMPLEMENTATION_HH_
+#define WATCHFACE_COMPLICATION_EDITABLES_MANAGER_IMPLEMENTATION_HH_
 
 #include <gio/gio.h>
 #include <app_common.h>
@@ -62,4 +62,4 @@ class EditablesManager::Impl {
 
 }  // namespace watchface_complication
 
-#endif  // WATCHFACE_COMPLICATION_EDITABLES_MANAGER_IMPLEMENTATION_H_
+#endif  // WATCHFACE_COMPLICATION_EDITABLES_MANAGER_IMPLEMENTATION_HH_
index 4b0f3e1de5f1f22cf6b4fe83b06bb24e27833790..19f661c06d1673719970cc95083d5beadd92adf6 100644 (file)
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef WATCHFACE_COMPLICATION_EDITABLES_MANAGER_H_
-#define WATCHFACE_COMPLICATION_EDITABLES_MANAGER_H_
+#ifndef WATCHFACE_COMPLICATION_EDITABLES_MANAGER_HH_
+#define WATCHFACE_COMPLICATION_EDITABLES_MANAGER_HH_
 
 #include <gio/gio.h>
 #include <watchface-common.h>
@@ -49,4 +49,4 @@ class EXPORT_API EditablesManager {
 
 }  // namespace watchface_complication
 
-#endif  // WATCHFACE_COMPLICATION_EDITABLES_MANAGER_H_
+#endif  // WATCHFACE_COMPLICATION_EDITABLES_MANAGER_HH_
index 66c3033afd0dd7fe5db57de813a8380e9e25ba07..b627d9b9e0cfdafba7700c10f02f6a13b1eaa3fa 100644 (file)
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef WATCHFACE_COMPLICATION_GDBUS_INTERFACE_H_
-#define WATCHFACE_COMPLICATION_GDBUS_INTERFACE_H_
+#ifndef WATCHFACE_COMPLICATION_GDBUS_INTERFACE_HH_
+#define WATCHFACE_COMPLICATION_GDBUS_INTERFACE_HH_
 
 #include <string>
 
@@ -51,4 +51,4 @@ class IGDBus {
 
 }  // namespace watchface_complication
 
-#endif  // WATCHFACE_COMPLICATION_GDBUS_INTERFACE_H_
+#endif  // WATCHFACE_COMPLICATION_GDBUS_INTERFACE_HH_
index d47ec47c0d0ad6f3eac3fed4fc83972858c07f63..fa54d455eb137ab0502e64e6546d549b883ebf59 100644 (file)
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef WATCHFACE_COMPLICATION_GDBUS_H_
-#define WATCHFACE_COMPLICATION_GDBUS_H_
+#ifndef WATCHFACE_COMPLICATION_GDBUS_HH_
+#define WATCHFACE_COMPLICATION_GDBUS_HH_
 
 #include <unistd.h>
 #include <dlog.h>
@@ -171,4 +171,4 @@ class GDBus : public IGDBus {
 
 }  // namespace watchface_complication
 
-#endif  // WATCHFACE_COMPLICATION_GDBUS_H_
+#endif  // WATCHFACE_COMPLICATION_GDBUS_HH_
index c6041f8d66375546b996ec07a0a9168a3043687a..5e2765d14d0bb05a785e974460e0e997bf51fa23 100644 (file)
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef WATCHFACE_COMPLICATION_PACKAGE_MANAGER_INTERFACE_H_
-#define WATCHFACE_COMPLICATION_PACKAGE_MANAGER_INTERFACE_H_
+#ifndef WATCHFACE_COMPLICATION_PACKAGE_MANAGER_INTERFACE_HH_
+#define WATCHFACE_COMPLICATION_PACKAGE_MANAGER_INTERFACE_HH_
 
 #include <string>
 
@@ -35,4 +35,4 @@ class IPackageManager {
 
 }  // namespace watchface_complication
 
-#endif  // WATCHFACE_COMPLICATION_PACKAGE_MANAGER_INTERFACE_H_
+#endif  // WATCHFACE_COMPLICATION_PACKAGE_MANAGER_INTERFACE_HH_
index 7ba04cb4775a61d82341465d252ea0441937b10d..004bba3e8ce9737e671a9808144159773344a361 100644 (file)
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef WATCHFACE_COMPLICATION_PACKAGE_MANAGER_H_
-#define WATCHFACE_COMPLICATION_PACKAGE_MANAGER_H_
+#ifndef WATCHFACE_COMPLICATION_PACKAGE_MANAGER_HH_
+#define WATCHFACE_COMPLICATION_PACKAGE_MANAGER_HH_
 
 #include <unistd.h>
 #include <dlog.h>
@@ -48,4 +48,4 @@ class PackageManager : public IPackageManager {
 
 }  // namespace watchface_complication
 
-#endif  // WATCHFACE_COMPLICATION_PACKAGE_MANAGER_H_
+#endif  // WATCHFACE_COMPLICATION_PACKAGE_MANAGER_HH_
index 730308525a9477ed743fb5b5ed40cb6617512725..a0fb82030ef62b39d1b8f00ac5c51e135070b1f5 100644 (file)
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef WATCHFACE_COMPLICATION_RECEIVED_EDITABLE_IMPLEMENTATION_H_
-#define WATCHFACE_COMPLICATION_RECEIVED_EDITABLE_IMPLEMENTATION_H_
+#ifndef WATCHFACE_COMPLICATION_RECEIVED_EDITABLE_IMPLEMENTATION_HH_
+#define WATCHFACE_COMPLICATION_RECEIVED_EDITABLE_IMPLEMENTATION_HH_
 
 #include <gio/gio.h>
 #include <bundle_cpp.h>
@@ -58,7 +58,7 @@ class ReceivedEditable::Impl {
 
 }  // namespace watchface_complication
 
-#endif  // WATCHFACE_COMPLICATION_RECEIVED_EDITABLE_IMPLEMENTATION_H_
+#endif  // WATCHFACE_COMPLICATION_RECEIVED_EDITABLE_IMPLEMENTATION_HH_
 
 
 
index 7a607979c364a8b984e7419796e1d98013367b30..2ff7a5124b54cb06e580adc841e4d6c6071aca75 100644 (file)
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef WATCHFACE_COMPLICATION_RECEIVED_EDITABLE_H_
-#define WATCHFACE_COMPLICATION_RECEIVED_EDITABLE_H_
+#ifndef WATCHFACE_COMPLICATION_RECEIVED_EDITABLE_HH_
+#define WATCHFACE_COMPLICATION_RECEIVED_EDITABLE_HH_
 
 #include <gio/gio.h>
 #include <bundle_cpp.h>
@@ -69,4 +69,4 @@ class EXPORT_API ReceivedEditable : public IEditable {
 
 }  // namespace watchface_complication
 
-#endif  // WATCHFACE_COMPLICATION_RECEIVED_EDITABLE_H_
+#endif  // WATCHFACE_COMPLICATION_RECEIVED_EDITABLE_HH_
index b52b103a100df24130cc43255c421cb688716da4..2d99a42dee52177c119ceeb33026f88c6f0a7e85 100644 (file)
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef WATCHFACE_EDITOR_EDITABLES_EDITOR_EVENT_INTERFACE_H_
-#define WATCHFACE_EDITOR_EDITABLES_EDITOR_EVENT_INTERFACE_H_
+#ifndef WATCHFACE_EDITOR_EDITABLES_EDITOR_EVENT_INTERFACE_HH_
+#define WATCHFACE_EDITOR_EDITABLES_EDITOR_EVENT_INTERFACE_HH_
 
 #include <string>
 #include <memory>
@@ -33,4 +33,4 @@ class EXPORT_API IEditablesEditorEvent {
 
 }  // namespace watchface_complication
 
-#endif  // WATCHFACE_EDITOR_EDITABLES_EDITOR_EVENT_INTERFACE_H_
+#endif  // WATCHFACE_EDITOR_EDITABLES_EDITOR_EVENT_INTERFACE_HH_
index 0390794a60aaa853ef96e8df670387cbc0376d39..4a5ad3a6cc59afef9baf945d0ae44d8371059765 100644 (file)
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef WATCHFACE_EDITOR_EDITABLES_EDITOR_IMPLEMENTATION_H_
-#define WATCHFACE_EDITOR_EDITABLES_EDITOR_IMPLEMENTATION_H_
+#ifndef WATCHFACE_EDITOR_EDITABLES_EDITOR_IMPLEMENTATION_HH_
+#define WATCHFACE_EDITOR_EDITABLES_EDITOR_IMPLEMENTATION_HH_
 
 #include <gio/gio.h>
 
@@ -65,4 +65,4 @@ class EditablesEditor::Impl : IGDBus::IGDBusEvent {
 
 }  // namespace watchface_complication
 
-#endif  // WATCHFACE_EDITOR_EDITABLES_EDITOR_IMPLEMENTATION_H_
+#endif  // WATCHFACE_EDITOR_EDITABLES_EDITOR_IMPLEMENTATION_HH_
index d447793411c3e7ffe91a2459565b36f5e8a0f687..c4111cf739b886411a3fba1b724a35357fd766b9 100644 (file)
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef WATCHFACE_EDITOR_EDITABLES_EDITOR_H_
-#define WATCHFACE_EDITOR_EDITABLES_EDITOR_H_
+#ifndef WATCHFACE_EDITOR_EDITABLES_EDITOR_HH_
+#define WATCHFACE_EDITOR_EDITABLES_EDITOR_HH_
 
 #include <gio/gio.h>
 #include <bundle_cpp.h>
@@ -115,4 +115,4 @@ class EXPORT_API EditablesEditor : IEditablesContainerEvent {
 
 }  // namespace watchface_complication
 
-#endif  // WATCHFACE_EDITOR_EDITABLES_EDITOR_H_
+#endif  // WATCHFACE_EDITOR_EDITABLES_EDITOR_HH_
index c3a3776ad60cae145e99ab53cd55df418c7e0015..b637b4e6c80371ab358c3d73f2485919e759d2f5 100644 (file)
@@ -23,7 +23,7 @@
 
 #include <watchface-complication.h>
 #include <watchface-editable.h>
-#include <watchface-common-internal.hh>
+#include <watchface-common-internal.h>
 
 #ifdef __cplusplus
 extern "C" {