X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fbuilder%2Fbuilder-declarations.h;h=963869bd9958326a2b7f3d3e8db8b08ac7853669;hb=b8da2e53925b9abb9fa362560069e8ca4aa62f81;hp=21c49a10b81a01ac7b50bb72d929c0d23a09941b;hpb=cded468bd11aab522fae3f2a9818170160c74ff9;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/builder/builder-declarations.h b/dali-toolkit/internal/builder/builder-declarations.h
index 21c49a1..963869b 100644
--- a/dali-toolkit/internal/builder/builder-declarations.h
+++ b/dali-toolkit/internal/builder/builder-declarations.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_BUILDER_DECLARATIONS_H__
-#define __DALI_TOOLKIT_BUILDER_DECLARATIONS_H__
+#ifndef DALI_TOOLKIT_BUILDER_DECLARATIONS_H
+#define DALI_TOOLKIT_BUILDER_DECLARATIONS_H
 
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 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,32 +19,34 @@
  */
 
 // EXTERNAL INCLUDES
+#include <dali/public-api/common/extents.h>
+#include <dali/public-api/math/matrix.h>
+#include <dali/public-api/math/matrix3.h>
 #include <dali/public-api/math/rect.h>
 #include <dali/public-api/math/vector2.h>
 #include <dali/public-api/math/vector3.h>
 #include <dali/public-api/math/vector4.h>
-#include <dali/public-api/math/matrix.h>
-#include <dali/public-api/math/matrix3.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/builder/tree-node.h>
+#include <dali-toolkit/devel-api/builder/tree-node.h>
 #include <dali-toolkit/internal/builder/optional-value.h>
 
 typedef Dali::Toolkit::TreeNode TreeNode;
 typedef TreeNode::ConstIterator TreeConstIter;
 
-typedef OptionalValue<const TreeNode&> OptionalChild;
-typedef OptionalValue<std::string> OptionalString;
-typedef OptionalValue<float> OptionalFloat;
-typedef OptionalValue<int> OptionalInteger;
-typedef OptionalValue<unsigned int> OptionalUnsignedInt;
-typedef OptionalValue<bool> OptionalBoolean;
-typedef OptionalValue<Dali::Vector2> OptionalVector2;
-typedef OptionalValue<Dali::Vector3> OptionalVector3;
-typedef OptionalValue<Dali::Vector4> OptionalVector4;
-typedef OptionalValue<std::string> OptionalString;
-typedef OptionalValue<Dali::Matrix> OptionalMatrix;
-typedef OptionalValue<Dali::Matrix3> OptionalMatrix3;
+typedef OptionalValue<const TreeNode&>  OptionalChild;
+typedef OptionalValue<std::string>      OptionalString;
+typedef OptionalValue<float>            OptionalFloat;
+typedef OptionalValue<int>              OptionalInteger;
+typedef OptionalValue<unsigned int>     OptionalUnsignedInt;
+typedef OptionalValue<bool>             OptionalBoolean;
+typedef OptionalValue<Dali::Vector2>    OptionalVector2;
+typedef OptionalValue<Dali::Vector3>    OptionalVector3;
+typedef OptionalValue<Dali::Vector4>    OptionalVector4;
+typedef OptionalValue<std::string>      OptionalString;
+typedef OptionalValue<Dali::Matrix>     OptionalMatrix;
+typedef OptionalValue<Dali::Matrix3>    OptionalMatrix3;
 typedef OptionalValue<Dali::Rect<int> > OptionalRect;
+typedef OptionalValue<Dali::Extents>    OptionalExtents;
 
-#endif // __DALI_TOOLKIT_BUILDER_DECLARATIONS_H__
+#endif // DALI_TOOLKIT_BUILDER_DECLARATIONS_H