Merge "[ATSPI] Fix for SCREEN coordinate type in GetExtents" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / public-api / enums.h

diff --git a/dali-toolkit/public-api/enums.h b/dali-toolkit/public-api/enums.h
index 84b1176..eeca933 100644 (file)
--- a/dali-toolkit/public-api/enums.h
+++ b/dali-toolkit/public-api/enums.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_ENUMS_H__
-#define __DALI_TOOLKIT_ENUMS_H__
+#ifndef DALI_TOOLKIT_ENUMS_H
+#define DALI_TOOLKIT_ENUMS_H
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -19,7 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali/public-api/common/dali-common.h>
+#include <dali-toolkit/public-api/dali-toolkit-common.h>
 
 namespace Dali
 {
@@ -40,7 +40,6 @@ namespace Toolkit
  */
 namespace ControlOrientation
 {
-
 /**
  * @brief Enumeration for the internal orientation of a control.
  * @SINCE_1_0.0
@@ -61,7 +60,7 @@ enum Type
  * @param[in] orientation The orientation
  * @return true if the orientation is vertical
  */
-DALI_IMPORT_API bool IsVertical(ControlOrientation::Type orientation);
+DALI_TOOLKIT_API bool IsVertical(ControlOrientation::Type orientation);
 
 /**
  * @brief Queries whether an orientation is horizontal.
@@ -70,7 +69,7 @@ DALI_IMPORT_API bool IsVertical(ControlOrientation::Type orientation);
  * @param[in] orientation The orientation
  * @return true if the orientation is horizontal
  */
-DALI_IMPORT_API bool IsHorizontal(ControlOrientation::Type orientation);
+DALI_TOOLKIT_API bool IsHorizontal(ControlOrientation::Type orientation);
 
 /**
  * @}
@@ -79,4 +78,4 @@ DALI_IMPORT_API bool IsHorizontal(ControlOrientation::Type orientation);
 
 } // namespace Dali
 
-#endif // __DALI_TOOLKIT_ENUMS_H__
+#endif // DALI_TOOLKIT_ENUMS_H