Fix wrong include declaration

Change-Id: I9198a11146581fe2e8e4e3ad74e71dcdb9ddc1bf
Signed-off-by: hyunho <hhstark.kang@samsung.com>

diff --git a/watchface-common/db-manager.hh b/watchface-common/db-manager.hh
index 4c50263..c1f3685 100644 (file)
--- a/watchface-common/db-manager.hh
+++ b/watchface-common/db-manager.hh
@@ -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_

diff --git a/watchface-common/include/watchface-common-internal.h b/watchface-common/include/watchface-common-internal.h
index caf563d..04e80ab 100644 (file)
--- a/watchface-common/include/watchface-common-internal.h
+++ b/watchface-common/include/watchface-common-internal.h
@@ -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

diff --git a/watchface-common/shared-handle.hh b/watchface-common/shared-handle.hh
index c8402ee..3ff3191 100644 (file)
--- a/watchface-common/shared-handle.hh
+++ b/watchface-common/shared-handle.hh
@@ -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

diff --git a/watchface-common/watchface-common-internal.hh b/watchface-common/watchface-common-internal.hh
index ba47a5f..ec0c6c3 100644 (file)
--- a/watchface-common/watchface-common-internal.hh
+++ b/watchface-common/watchface-common-internal.hh
@@ -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>
 
@@ -58,12 +58,6 @@
 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_

diff --git a/watchface-common/watchface-exception.hh b/watchface-common/watchface-exception.hh
index 4504fbd..0665cbe 100644 (file)
--- a/watchface-common/watchface-exception.hh
+++ b/watchface-common/watchface-exception.hh
@@ -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_

diff --git a/watchface-common/watchface-util.hh b/watchface-common/watchface-util.hh
index b670733..ebd2f20 100644 (file)
--- a/watchface-common/watchface-util.hh
+++ b/watchface-common/watchface-util.hh
@@ -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_

diff --git a/watchface-complication-provider/complication-provider-event-interface.hh b/watchface-complication-provider/complication-provider-event-interface.hh
index 38bac5e..58195ae 100644 (file)
--- a/watchface-complication-provider/complication-provider-event-interface.hh
+++ b/watchface-complication-provider/complication-provider-event-interface.hh
@@ -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_

diff --git a/watchface-complication-provider/complication-provider-implementation.hh b/watchface-complication-provider/complication-provider-implementation.hh
index 1d1e8a0..a5e8bab 100644 (file)
--- a/watchface-complication-provider/complication-provider-implementation.hh
+++ b/watchface-complication-provider/complication-provider-implementation.hh
@@ -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_
 

diff --git a/watchface-complication-provider/complication-provider.hh b/watchface-complication-provider/complication-provider.hh
index 479994e..876615b 100644 (file)
--- a/watchface-complication-provider/complication-provider.hh
+++ b/watchface-complication-provider/complication-provider.hh
@@ -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.hh
similarity index 99%
rename from watchface-complication/complication-connector-implementation.h
rename to watchface-complication/complication-connector-implementation.hh
index 7e7acaf..becec2d 100644 (file)
--- a/watchface-complication/complication-connector-implementation.h
+++ b/watchface-complication/complication-connector-implementation.hh
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef WATCHFACE_COMPLICATION_COMPLICATION_CONNECTOR_IMPLEMENTATION_H_
-#define WATCHFACE_COMPLICATION_COMPLICATION_CONNECTOR_IMPLEMENTATION_H_
+#ifndef WATCHFACE_COMPLICATION_COMPLICATION_CONNECTOR_IMPLEMENTATION_HH_
+#define WATCHFACE_COMPLICATION_COMPLICATION_CONNECTOR_IMPLEMENTATION_HH_
 
 #include <gio/gio.h>
 #include <dlog.h>
@@ -133,4 +133,4 @@ class ComplicationConnector::Impl {
 
 }  // namespace watchface_complication
 
-#endif  // WATCHFACE_COMPLICATION_COMPLICATION_CONNECTOR_IMPLEMENTATION_H_
+#endif  // WATCHFACE_COMPLICATION_COMPLICATION_CONNECTOR_IMPLEMENTATION_HH_

diff --git a/watchface-complication/complication-connector.cc b/watchface-complication/complication-connector.cc
index cfcdfd9..f9984aa 100644 (file)
--- a/watchface-complication/complication-connector.cc
+++ b/watchface-complication/complication-connector.cc
@@ -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"

diff --git a/watchface-complication/complication-connector.hh b/watchface-complication/complication-connector.hh
index f87319f..64e5953 100644 (file)
--- a/watchface-complication/complication-connector.hh
+++ b/watchface-complication/complication-connector.hh
@@ -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_

diff --git a/watchface-complication/complication-event-interface.hh b/watchface-complication/complication-event-interface.hh
index 0e7bd13..de96935 100644 (file)
--- a/watchface-complication/complication-event-interface.hh
+++ b/watchface-complication/complication-event-interface.hh
@@ -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_

diff --git a/watchface-complication/complication-implementation.hh b/watchface-complication/complication-implementation.hh
index a41e880..0d86092 100644 (file)
--- a/watchface-complication/complication-implementation.hh
+++ b/watchface-complication/complication-implementation.hh
@@ -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_

diff --git a/watchface-complication/complication-internal.hh b/watchface-complication/complication-internal.hh
index 2688847..0cbe9bc 100644 (file)
--- a/watchface-complication/complication-internal.hh
+++ b/watchface-complication/complication-internal.hh
@@ -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_ */

diff --git a/watchface-complication/complication.hh b/watchface-complication/complication.hh
index 3c7684a..10a03c2 100755 (executable)
--- a/watchface-complication/complication.hh
+++ b/watchface-complication/complication.hh
@@ -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_

diff --git a/watchface-complication/design-element-implementation.hh b/watchface-complication/design-element-implementation.hh
index df490cf..c5ae434 100644 (file)
--- a/watchface-complication/design-element-implementation.hh
+++ b/watchface-complication/design-element-implementation.hh
@@ -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_
 
 
 

diff --git a/watchface-complication/design-element.hh b/watchface-complication/design-element.hh
index 2c2c7bb..f469660 100644 (file)
--- a/watchface-complication/design-element.hh
+++ b/watchface-complication/design-element.hh
@@ -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_

diff --git a/watchface-complication/editable-interface.hh b/watchface-complication/editable-interface.hh
index 1162567..5931a2f 100644 (file)
--- a/watchface-complication/editable-interface.hh
+++ b/watchface-complication/editable-interface.hh
@@ -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_

diff --git a/watchface-complication/editables-container-event-interface.hh b/watchface-complication/editables-container-event-interface.hh
index e9b7f27..c3e390e 100644 (file)
--- a/watchface-complication/editables-container-event-interface.hh
+++ b/watchface-complication/editables-container-event-interface.hh
@@ -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_

diff --git a/watchface-complication/editables-container-implementation.hh b/watchface-complication/editables-container-implementation.hh
index 4d3d555..c2b58b9 100644 (file)
--- a/watchface-complication/editables-container-implementation.hh
+++ b/watchface-complication/editables-container-implementation.hh
@@ -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_
 
 
 

diff --git a/watchface-complication/editables-container.hh b/watchface-complication/editables-container.hh
index 9a38649..85274a6 100644 (file)
--- a/watchface-complication/editables-container.hh
+++ b/watchface-complication/editables-container.hh
@@ -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_

diff --git a/watchface-complication/editables-manager-implementation.hh b/watchface-complication/editables-manager-implementation.hh
index 3e3b29c..40e45fa 100644 (file)
--- a/watchface-complication/editables-manager-implementation.hh
+++ b/watchface-complication/editables-manager-implementation.hh
@@ -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_

diff --git a/watchface-complication/editables-manager.hh b/watchface-complication/editables-manager.hh
index 4b0f3e1..19f661c 100644 (file)
--- a/watchface-complication/editables-manager.hh
+++ b/watchface-complication/editables-manager.hh
@@ -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_

diff --git a/watchface-complication/gdbus-interface.hh b/watchface-complication/gdbus-interface.hh
index 66c3033..b627d9b 100644 (file)
--- a/watchface-complication/gdbus-interface.hh
+++ b/watchface-complication/gdbus-interface.hh
@@ -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_

diff --git a/watchface-complication/gdbus.hh b/watchface-complication/gdbus.hh
index d47ec47..fa54d45 100644 (file)
--- a/watchface-complication/gdbus.hh
+++ b/watchface-complication/gdbus.hh
@@ -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_

diff --git a/watchface-complication/package-manager-interface.hh b/watchface-complication/package-manager-interface.hh
index c6041f8..5e2765d 100644 (file)
--- a/watchface-complication/package-manager-interface.hh
+++ b/watchface-complication/package-manager-interface.hh
@@ -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_

diff --git a/watchface-complication/package-manager.hh b/watchface-complication/package-manager.hh
index 7ba04cb..004bba3 100644 (file)
--- a/watchface-complication/package-manager.hh
+++ b/watchface-complication/package-manager.hh
@@ -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_

diff --git a/watchface-complication/received-editable-implementation.hh b/watchface-complication/received-editable-implementation.hh
index 7303085..a0fb820 100644 (file)
--- a/watchface-complication/received-editable-implementation.hh
+++ b/watchface-complication/received-editable-implementation.hh
@@ -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_
 
 
 

diff --git a/watchface-complication/received-editable.hh b/watchface-complication/received-editable.hh
index 7a60797..2ff7a51 100644 (file)
--- a/watchface-complication/received-editable.hh
+++ b/watchface-complication/received-editable.hh
@@ -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_

diff --git a/watchface-editor/editables-editor-event-interface.hh b/watchface-editor/editables-editor-event-interface.hh
index b52b103..2d99a42 100644 (file)
--- a/watchface-editor/editables-editor-event-interface.hh
+++ b/watchface-editor/editables-editor-event-interface.hh
@@ -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_

diff --git a/watchface-editor/editables-editor-implementation.hh b/watchface-editor/editables-editor-implementation.hh
index 0390794..4a5ad3a 100644 (file)
--- a/watchface-editor/editables-editor-implementation.hh
+++ b/watchface-editor/editables-editor-implementation.hh
@@ -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_

diff --git a/watchface-editor/editables-editor.hh b/watchface-editor/editables-editor.hh
index d447793..c4111cf 100644 (file)
--- a/watchface-editor/editables-editor.hh
+++ b/watchface-editor/editables-editor.hh
@@ -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_

diff --git a/watchface-editor/include/watchface-editor.h b/watchface-editor/include/watchface-editor.h
index c3a3776..b637b4e 100644 (file)
--- a/watchface-editor/include/watchface-editor.h
+++ b/watchface-editor/include/watchface-editor.h
@@ -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" {