projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated all header files to new format
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
builder
/
builder-get-is.inl.h
diff --git
a/dali-toolkit/internal/builder/builder-get-is.inl.h
b/dali-toolkit/internal/builder/builder-get-is.inl.h
index
01dab59
..
0a7f6d5
100644
(file)
--- a/
dali-toolkit/internal/builder/builder-get-is.inl.h
+++ b/
dali-toolkit/internal/builder/builder-get-is.inl.h
@@
-2,7
+2,7
@@
#define DALI_TOOLKIT_INTERNAL_BUILDER_GET_IS_INL
/*
#define DALI_TOOLKIT_INTERNAL_BUILDER_GET_IS_INL
/*
- * Copyright (c) 20
19
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
21
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-23,12
+23,12
@@
inline OptionalChild IsChild(const TreeNode* node, const std::string& childName)
{
inline OptionalChild IsChild(const TreeNode* node, const std::string& childName)
{
- if(
node
)
+ if(
node
)
{
const TreeNode* c = node->GetChild(childName);
{
const TreeNode* c = node->GetChild(childName);
- if(
NULL != c
)
+ if(
NULL != c
)
{
{
- return OptionalChild(
*c
);
+ return OptionalChild(
*c
);
}
else
{
}
else
{
@@
-43,12
+43,12
@@
inline OptionalChild IsChild(const TreeNode* node, const std::string& childName)
inline OptionalChild IsChildIgnoreCase(const TreeNode* node, const std::string& childName)
{
inline OptionalChild IsChildIgnoreCase(const TreeNode* node, const std::string& childName)
{
- if(
node
)
+ if(
node
)
{
const TreeNode* c = node->GetChildIgnoreCase(childName);
{
const TreeNode* c = node->GetChildIgnoreCase(childName);
- if(
NULL != c
)
+ if(
NULL != c
)
{
{
- return OptionalChild(
*c
);
+ return OptionalChild(
*c
);
}
else
{
}
else
{
@@
-73,7
+73,7
@@
inline OptionalChild IsChildIgnoreCase(const TreeNode& node, const std::string&
inline OptionalString IsString(const OptionalChild& node)
{
inline OptionalString IsString(const OptionalChild& node)
{
- if(
node && (*node).GetType() == TreeNode::STRING
)
+ if(
node && (*node).GetType() == TreeNode::STRING
)
{
return OptionalString((*node).GetString());
}
{
return OptionalString((*node).GetString());
}
@@
-87,36
+87,36
@@
inline OptionalFloat IsFloat(const OptionalChild& node)
{
OptionalFloat ret;
{
OptionalFloat ret;
- if(
node
)
+ if(
node
)
{
{
- if(
(*node).GetType() == TreeNode::FLOAT
)
+ if(
(*node).GetType() == TreeNode::FLOAT
)
{
ret = (*node).GetFloat();
}
{
ret = (*node).GetFloat();
}
- else if(
(*node).GetType() == TreeNode::INTEGER
)
+ else if(
(*node).GetType() == TreeNode::INTEGER
)
{
// JSON has number not float/int but JsonParser discriminates.
// Here we don't care so we allow coercion
{
// JSON has number not float/int but JsonParser discriminates.
// Here we don't care so we allow coercion
- ret = static_cast<float>(
(*node).GetInteger()
);
+ ret = static_cast<float>(
(*node).GetInteger()
);
}
}
return ret;
}
}
}
return ret;
}
-inline OptionalInteger IsInteger(const OptionalChild
&
node)
+inline OptionalInteger IsInteger(const OptionalChild
&
node)
{
OptionalInteger ret;
{
OptionalInteger ret;
- if(
node
)
+ if(
node
)
{
{
- if(
(*node).GetType() == TreeNode::INTEGER
)
+ if(
(*node).GetType() == TreeNode::INTEGER
)
{
ret = (*node).GetInteger();
}
{
ret = (*node).GetInteger();
}
- else if(
(*node).GetType() == TreeNode::FLOAT
)
+ else if(
(*node).GetType() == TreeNode::FLOAT
)
{
{
- ret = static_cast<int>(
(*node).GetFloat()
);
+ ret = static_cast<int>(
(*node).GetFloat()
);
}
}
}
}
@@
-125,7
+125,7
@@
inline OptionalInteger IsInteger(const OptionalChild &node)
inline OptionalBoolean IsBoolean(const OptionalChild& node)
{
inline OptionalBoolean IsBoolean(const OptionalChild& node)
{
- if(
node && (*node).GetType() == TreeNode::BOOLEAN
)
+ if(
node && (*node).GetType() == TreeNode::BOOLEAN
)
{
return OptionalBoolean(1 == (*node).GetInteger());
}
{
return OptionalBoolean(1 == (*node).GetInteger());
}
@@
-135,18
+135,17
@@
inline OptionalBoolean IsBoolean(const OptionalChild& node)
}
}
}
}
-
// copy N Numbers
// copy N Numbers
-template
<typename T>
+template<typename T>
inline bool CopyNumbers(TreeNode::ConstIterator iter, int N, T& vector)
{
for(int i = 0; i < N; ++i)
{
inline bool CopyNumbers(TreeNode::ConstIterator iter, int N, T& vector)
{
for(int i = 0; i < N; ++i)
{
- if(
(*iter).second.GetType() == TreeNode::FLOAT)
+ if((*iter).second.GetType() == TreeNode::FLOAT)
{
vector[i] = (*iter).second.GetFloat();
}
{
vector[i] = (*iter).second.GetFloat();
}
- else if(
(*iter).second.GetType() == TreeNode::INTEGER
)
+ else if(
(*iter).second.GetType() == TreeNode::INTEGER
)
{
vector[i] = static_cast<float>((*iter).second.GetInteger());
}
{
vector[i] = static_cast<float>((*iter).second.GetInteger());
}
@@
-164,10
+163,10
@@
inline OptionalVector4 IsVector4(const OptionalChild& node)
{
OptionalVector4 ret;
{
OptionalVector4 ret;
- if(
node && (TreeNode::ARRAY == (*node).GetType()) && (*node).Size() >= 4
)
+ if(
node && (TreeNode::ARRAY == (*node).GetType()) && (*node).Size() >= 4
)
{
Dali::Vector4 v;
{
Dali::Vector4 v;
- if(
CopyNumbers((*node).CBegin(), 4, v)
)
+ if(
CopyNumbers((*node).CBegin(), 4, v)
)
{
ret = OptionalVector4(v);
}
{
ret = OptionalVector4(v);
}
@@
-180,10
+179,10
@@
inline OptionalVector3 IsVector3(const OptionalChild& node)
{
OptionalVector3 ret;
{
OptionalVector3 ret;
- if(
node && (TreeNode::ARRAY == (*node).GetType()) && (*node).Size() >= 3
)
+ if(
node && (TreeNode::ARRAY == (*node).GetType()) && (*node).Size() >= 3
)
{
Dali::Vector3 v;
{
Dali::Vector3 v;
- if(
CopyNumbers((*node).CBegin(), 3, v)
)
+ if(
CopyNumbers((*node).CBegin(), 3, v)
)
{
ret = OptionalVector3(v);
}
{
ret = OptionalVector3(v);
}
@@
-196,10
+195,10
@@
inline OptionalVector2 IsVector2(const OptionalChild& node)
{
OptionalVector2 ret;
{
OptionalVector2 ret;
- if(
node && (TreeNode::ARRAY == (*node).GetType()) && (*node).Size() >= 2
)
+ if(
node && (TreeNode::ARRAY == (*node).GetType()) && (*node).Size() >= 2
)
{
Dali::Vector2 v;
{
Dali::Vector2 v;
- if(
CopyNumbers((*node).CBegin(), 2, v)
)
+ if(
CopyNumbers((*node).CBegin(), 2, v)
)
{
ret = OptionalVector2(v);
}
{
ret = OptionalVector2(v);
}
@@
-208,14
+207,14
@@
inline OptionalVector2 IsVector2(const OptionalChild& node)
return ret;
}
return ret;
}
-inline OptionalMatrix IsMatrix(const OptionalChild
&
node)
+inline OptionalMatrix IsMatrix(const OptionalChild
&
node)
{
OptionalMatrix ret;
{
OptionalMatrix ret;
- if(
node && (TreeNode::ARRAY == (*node).GetType()) && (*node).Size() >= 16
)
+ if(
node && (TreeNode::ARRAY == (*node).GetType()) && (*node).Size() >= 16
)
{
float v[16];
{
float v[16];
- if(
CopyNumbers((*node).CBegin(), 16, v)
)
+ if(
CopyNumbers((*node).CBegin(), 16, v)
)
{
ret = OptionalMatrix(Dali::Matrix(v));
}
{
ret = OptionalMatrix(Dali::Matrix(v));
}
@@
-228,14
+227,12
@@
inline OptionalMatrix3 IsMatrix3(const OptionalChild& node)
{
OptionalMatrix3 ret;
{
OptionalMatrix3 ret;
- if(
node && (TreeNode::ARRAY == (*node).GetType()) && (*node).Size() >= 9
)
+ if(
node && (TreeNode::ARRAY == (*node).GetType()) && (*node).Size() >= 9
)
{
float v[9];
{
float v[9];
- if(
CopyNumbers((*node).CBegin(), 9, v)
)
+ if(
CopyNumbers((*node).CBegin(), 9, v)
)
{
{
- ret = OptionalMatrix3(Dali::Matrix3(v[0], v[1], v[2],
- v[3], v[4], v[5],
- v[6], v[7], v[8] ));
+ ret = OptionalMatrix3(Dali::Matrix3(v[0], v[1], v[2], v[3], v[4], v[5], v[6], v[7], v[8]));
}
}
}
}
@@
-250,8
+247,8
@@
inline OptionalRect IsRect(const OptionalChild& node)
if((*node).Size() >= 4)
{
TreeNode::ConstIterator iter((*node).CBegin());
if((*node).Size() >= 4)
{
TreeNode::ConstIterator iter((*node).CBegin());
- int v[4];
- if(
CopyNumbers((*node).CBegin(), 4, v)
)
+ int
v[4];
+ if(
CopyNumbers((*node).CBegin(), 4, v)
)
{
ret = OptionalRect(Dali::Rect<int>(v[0], v[1], v[2], v[3]));
}
{
ret = OptionalRect(Dali::Rect<int>(v[0], v[1], v[2], v[3]));
}
@@
-268,8
+265,8
@@
inline OptionalExtents IsExtents(const OptionalChild& node)
if((*node).Size() >= 4)
{
TreeNode::ConstIterator iter((*node).CBegin());
if((*node).Size() >= 4)
{
TreeNode::ConstIterator iter((*node).CBegin());
- int v[4];
- if(
CopyNumbers((*node).CBegin(), 4, v)
)
+ int
v[4];
+ if(
CopyNumbers((*node).CBegin(), 4, v)
)
{
extents = OptionalExtents(Dali::Extents(v[0], v[1], v[2], v[3]));
}
{
extents = OptionalExtents(Dali::Extents(v[0], v[1], v[2], v[3]));
}
@@
-281,164
+278,162
@@
inline OptionalExtents IsExtents(const OptionalChild& node)
//
//
//
//
//
//
-inline OptionalString IsString(
const TreeNode& parent, const std::string& childName)
+inline OptionalString IsString(const TreeNode& parent, const std::string& childName)
{
{
- return IsString(
IsChild(&parent, childName)
);
+ return IsString(
IsChild(&parent, childName)
);
}
}
-inline OptionalFloat IsFloat(
const TreeNode& parent, const std::string& childName)
+inline OptionalFloat IsFloat(const TreeNode& parent, const std::string& childName)
{
{
- return IsFloat(
IsChild(&parent, childName)
);
+ return IsFloat(
IsChild(&parent, childName)
);
}
}
-inline OptionalInteger IsInteger(
const TreeNode& parent, const std::string& childName)
+inline OptionalInteger IsInteger(const TreeNode& parent, const std::string& childName)
{
{
- return IsInteger(
IsChild(&parent, childName)
);
+ return IsInteger(
IsChild(&parent, childName)
);
}
}
-inline OptionalBoolean IsBoolean(
const TreeNode& parent, const std::string& childName)
+inline OptionalBoolean IsBoolean(const TreeNode& parent, const std::string& childName)
{
{
- return IsBoolean(
IsChild(parent, childName)
);
+ return IsBoolean(
IsChild(parent, childName)
);
}
}
-inline OptionalVector4 IsVector4(const TreeNode
&
parent, const std::string& childName)
+inline OptionalVector4 IsVector4(const TreeNode
&
parent, const std::string& childName)
{
{
- return IsVector4(
IsChild(parent, childName)
);
+ return IsVector4(
IsChild(parent, childName)
);
}
}
-inline OptionalVector3 IsVector3(const TreeNode
&
parent, const std::string& childName)
+inline OptionalVector3 IsVector3(const TreeNode
&
parent, const std::string& childName)
{
{
- return IsVector3(
IsChild(parent, childName)
);
+ return IsVector3(
IsChild(parent, childName)
);
}
}
-inline OptionalVector2 IsVector2(const TreeNode
&
parent, const std::string& childName)
+inline OptionalVector2 IsVector2(const TreeNode
&
parent, const std::string& childName)
{
{
- return IsVector2(
IsChild(parent, childName)
);
+ return IsVector2(
IsChild(parent, childName)
);
}
}
-inline OptionalMatrix IsMatrix(const TreeNode
&
parent, const std::string& childName)
+inline OptionalMatrix IsMatrix(const TreeNode
&
parent, const std::string& childName)
{
{
- return IsMatrix(
IsChild(parent, childName)
);
+ return IsMatrix(
IsChild(parent, childName)
);
}
}
-inline OptionalMatrix3 IsMatrix3(const TreeNode
&
parent, const std::string& childName)
+inline OptionalMatrix3 IsMatrix3(const TreeNode
&
parent, const std::string& childName)
{
{
- return IsMatrix3(
IsChild(&parent, childName)
);
+ return IsMatrix3(
IsChild(&parent, childName)
);
}
}
-inline OptionalRect IsRect(const TreeNode
&
parent, const std::string& childName)
+inline OptionalRect IsRect(const TreeNode
&
parent, const std::string& childName)
{
{
- return IsRect(
IsChild(&parent, childName)
);
+ return IsRect(
IsChild(&parent, childName)
);
}
}
-inline OptionalExtents IsExtents(const TreeNode
&
parent, const std::string& childName)
+inline OptionalExtents IsExtents(const TreeNode
&
parent, const std::string& childName)
{
{
- return IsExtents(
IsChild(&parent, childName)
);
+ return IsExtents(
IsChild(&parent, childName)
);
}
//
//
//
}
//
//
//
-inline OptionalString IsString(
const TreeNode& node
)
+inline OptionalString IsString(
const TreeNode& node
)
{
{
- return IsString(
OptionalChild( node )
);
+ return IsString(
OptionalChild(node)
);
}
}
-inline OptionalFloat IsFloat(
const TreeNode& node
)
+inline OptionalFloat IsFloat(
const TreeNode& node
)
{
{
- return IsFloat(
OptionalChild( node )
);
+ return IsFloat(
OptionalChild(node)
);
}
}
-inline OptionalInteger IsInteger(
const TreeNode& node
)
+inline OptionalInteger IsInteger(
const TreeNode& node
)
{
{
- return IsInteger(
OptionalChild( node )
);
+ return IsInteger(
OptionalChild(node)
);
}
}
-inline OptionalBoolean IsBoolean(
const TreeNode& node
)
+inline OptionalBoolean IsBoolean(
const TreeNode& node
)
{
{
- return IsBoolean(
OptionalChild( node )
);
+ return IsBoolean(
OptionalChild(node)
);
}
}
-inline OptionalVector4 IsVector4(const TreeNode
&node
)
+inline OptionalVector4 IsVector4(const TreeNode
& node
)
{
{
- return IsVector4(
OptionalChild( node )
);
+ return IsVector4(
OptionalChild(node)
);
}
}
-inline OptionalVector3 IsVector3(const TreeNode
&node
)
+inline OptionalVector3 IsVector3(const TreeNode
& node
)
{
{
- return IsVector3(
OptionalChild( node )
);
+ return IsVector3(
OptionalChild(node)
);
}
}
-inline OptionalVector2 IsVector2(const TreeNode
&node
)
+inline OptionalVector2 IsVector2(const TreeNode
& node
)
{
{
- return IsVector2(
OptionalChild( node )
);
+ return IsVector2(
OptionalChild(node)
);
}
}
-inline OptionalMatrix IsMatrix(const TreeNode
&node
)
+inline OptionalMatrix IsMatrix(const TreeNode
& node
)
{
{
- return IsMatrix(
OptionalChild( node )
);
+ return IsMatrix(
OptionalChild(node)
);
}
}
-inline OptionalMatrix3 IsMatrix3(const TreeNode
&node
)
+inline OptionalMatrix3 IsMatrix3(const TreeNode
& node
)
{
{
- return IsMatrix3(
OptionalChild( node )
);
+ return IsMatrix3(
OptionalChild(node)
);
}
}
-inline OptionalRect IsRect(const TreeNode
&node
)
+inline OptionalRect IsRect(const TreeNode
& node
)
{
{
- return IsRect(
OptionalChild( node )
);
+ return IsRect(
OptionalChild(node)
);
}
}
-inline OptionalExtents IsExtents(const TreeNode
&node
)
+inline OptionalExtents IsExtents(const TreeNode
& node
)
{
{
- return IsExtents(
OptionalChild( node )
);
+ return IsExtents(
OptionalChild(node)
);
}
//
//
//
}
//
//
//
-inline Dali::Vector4 GetVector4(const TreeNode
&
child)
+inline Dali::Vector4 GetVector4(const TreeNode
&
child)
{
{
- OptionalVector4 v(
IsVector4( OptionalChild( child ) )
);
+ OptionalVector4 v(
IsVector4(OptionalChild(child))
);
DALI_ASSERT_ALWAYS(v);
return *v;
}
DALI_ASSERT_ALWAYS(v);
return *v;
}
-inline Dali::Vector3 GetVector3(const TreeNode
&
child)
+inline Dali::Vector3 GetVector3(const TreeNode
&
child)
{
{
- OptionalVector3 v(
IsVector3( OptionalChild( child ) )
);
+ OptionalVector3 v(
IsVector3(OptionalChild(child))
);
DALI_ASSERT_ALWAYS(v);
return *v;
}
DALI_ASSERT_ALWAYS(v);
return *v;
}
-inline Dali::Vector2 GetVector2(const TreeNode
&
child)
+inline Dali::Vector2 GetVector2(const TreeNode
&
child)
{
{
- OptionalVector2 v(
IsVector2( OptionalChild( child ) )
);
+ OptionalVector2 v(
IsVector2(OptionalChild(child))
);
DALI_ASSERT_ALWAYS(v);
return *v;
}
DALI_ASSERT_ALWAYS(v);
return *v;
}
-inline float GetFloat(const TreeNode
&
child)
+inline float GetFloat(const TreeNode
&
child)
{
{
- OptionalFloat v(
IsFloat( OptionalChild( child ) )
);
+ OptionalFloat v(
IsFloat(OptionalChild(child))
);
DALI_ASSERT_ALWAYS(v);
return *v;
}
DALI_ASSERT_ALWAYS(v);
return *v;
}
-inline bool GetBoolean(const TreeNode
&
child)
+inline bool GetBoolean(const TreeNode
&
child)
{
{
- OptionalBoolean v(
IsBoolean( OptionalChild( child ) )
);
+ OptionalBoolean v(
IsBoolean(OptionalChild(child))
);
DALI_ASSERT_ALWAYS(v);
return *v;
}
DALI_ASSERT_ALWAYS(v);
return *v;
}
-inline int GetInteger(const TreeNode
&
child)
+inline int GetInteger(const TreeNode
&
child)
{
{
- OptionalInteger v(
IsInteger( OptionalChild( child ) )
);
+ OptionalInteger v(
IsInteger(OptionalChild(child))
);
DALI_ASSERT_ALWAYS(v);
return *v;
}
DALI_ASSERT_ALWAYS(v);
return *v;
}
-
-
#endif // DALI_TOOLKIT_INTERNAL_BUILDER_GET_IS_INL
#endif // DALI_TOOLKIT_INTERNAL_BUILDER_GET_IS_INL