Purge underscored header file barriers

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / builder / replacement.h

diff --git a/dali-toolkit/internal/builder/replacement.h b/dali-toolkit/internal/builder/replacement.h
index 0b54942..24260de 100644 (file)
--- a/dali-toolkit/internal/builder/replacement.h
+++ b/dali-toolkit/internal/builder/replacement.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_INTERNAL_BUILDER_REPLACEMENT__
-#define __DALI_TOOLKIT_INTERNAL_BUILDER_REPLACEMENT__
+#ifndef DALI_TOOLKIT_INTERNAL_BUILDER_REPLACEMENT_H
+#define DALI_TOOLKIT_INTERNAL_BUILDER_REPLACEMENT_H
 
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
@@ -18,8 +18,11 @@
  *
  */
 
+// EXTERNAL INCLUDES
 #include <dali/public-api/object/property-value.h>
-#include <dali-toolkit/public-api/builder/builder.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/builder/builder.h>
 #include <dali-toolkit/internal/builder/builder-get-is.inl.h>
 
 namespace Dali
@@ -99,13 +102,6 @@ public:
    * @param node The TreeNode to check
    * @return Optional value
    */
-  OptionalUnsignedInt IsUnsignedInteger( const TreeNode & node ) const;
-
-  /* @brief Check node for a type
-   *
-   * @param node The TreeNode to check
-   * @return Optional value
-   */
   OptionalVector2 IsVector2( const TreeNode & node ) const;
 
   /* @brief Check node for a type
@@ -145,6 +141,13 @@ public:
 
   /* @brief Check node for a type
    *
+   * @param node The TreeNode to check
+   * @return Optional value
+   */
+  OptionalExtents IsExtents( const TreeNode & node ) const;
+
+  /* @brief Check node for a type
+   *
    * @param child The optional child TreeNode
    * @return Optional value
    */
@@ -227,6 +230,13 @@ public:
    */
   bool IsArray( OptionalChild child, Property::Value& out ) const;
 
+  /* @brief Check node for a type
+   *
+   * @param child The optional child TreeNode
+   * @return Optional value
+   */
+  OptionalExtents IsExtents( OptionalChild child ) const;
+
 private:
   // Overriding map (overrides the default map). The map is not owned.
   const Property::Map* const mOverrideMap;
@@ -252,5 +262,4 @@ private:
 
 } // namespace Dali
 
-
-#endif // header
+#endif // DALI_TOOLKIT_INTERNAL_BUILDER_REPLACEMENT_H