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
Add post processor
[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
358c21c
..
7780ec6
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) 20
14
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.
@@
-27,18
+27,15
@@
namespace Dali
{
namespace Dali
{
-
namespace Toolkit
{
namespace Toolkit
{
-
class TreeNode;
+class TreeNode;
}
namespace Toolkit
{
}
namespace Toolkit
{
-
namespace Internal
{
namespace Internal
{
-
/*
* Supports template replacement functionality
*
/*
* Supports template replacement functionality
*
@@
-46,7
+43,6
@@
namespace Internal
class Replacement
{
public:
class Replacement
{
public:
-
/*
* Constructor
*/
/*
* Constructor
*/
@@
-59,7
+55,7
@@
public:
* @param overrideMap The user overriding map
* @param defaultMap The default map to use
*/
* @param overrideMap The user overriding map
* @param defaultMap The default map to use
*/
- Replacement(
const Property::Map& overrideMap, const Property::Map& defaultMap
);
+ Replacement(
const Property::Map& overrideMap, const Property::Map& defaultMap
);
/*
* Constructor with default map
/*
* Constructor with default map
@@
-67,168
+63,175
@@
public:
* Make a deep copy of the tree.
* @param overrideMap The user overriding map
*/
* Make a deep copy of the tree.
* @param overrideMap The user overriding map
*/
- Replacement(
const Property::Map& defaultMap
);
+ Replacement(
const Property::Map& defaultMap
);
/* @brief Check node for a type
*
* @param node The TreeNode to check
* @return Optional value
*/
/* @brief Check node for a type
*
* @param node The TreeNode to check
* @return Optional value
*/
- OptionalString IsString(
const TreeNode& node
) const;
+ OptionalString IsString(
const TreeNode& node
) const;
/* @brief Check node for a type
*
* @param node The TreeNode to check
* @return Optional value
*/
/* @brief Check node for a type
*
* @param node The TreeNode to check
* @return Optional value
*/
- OptionalBoolean IsBoolean(
const TreeNode & node
) const;
+ OptionalBoolean IsBoolean(
const TreeNode& node
) const;
/* @brief Check node for a type
*
* @param node The TreeNode to check
* @return Optional value
*/
/* @brief Check node for a type
*
* @param node The TreeNode to check
* @return Optional value
*/
- OptionalFloat IsFloat(
const TreeNode & node
) const;
+ OptionalFloat IsFloat(
const TreeNode& node
) const;
/* @brief Check node for a type
*
* @param node The TreeNode to check
* @return Optional value
*/
/* @brief Check node for a type
*
* @param node The TreeNode to check
* @return Optional value
*/
- OptionalInteger IsInteger(
const TreeNode & node
) const;
+ OptionalInteger IsInteger(
const TreeNode& node
) const;
/* @brief Check node for a type
*
* @param node The TreeNode to check
* @return Optional value
*/
/* @brief Check node for a type
*
* @param node The TreeNode to check
* @return Optional value
*/
- Optional
UnsignedInt IsUnsignedInteger( const TreeNode & node
) const;
+ Optional
Vector2 IsVector2(const TreeNode& node
) const;
/* @brief Check node for a type
*
* @param node The TreeNode to check
* @return Optional value
*/
/* @brief Check node for a type
*
* @param node The TreeNode to check
* @return Optional value
*/
- OptionalVector
2 IsVector2( const TreeNode & node
) const;
+ OptionalVector
3 IsVector3(const TreeNode& node
) const;
/* @brief Check node for a type
*
* @param node The TreeNode to check
* @return Optional value
*/
/* @brief Check node for a type
*
* @param node The TreeNode to check
* @return Optional value
*/
- OptionalVector
3 IsVector3( const TreeNode & node
) const;
+ OptionalVector
4 IsVector4(const TreeNode& node
) const;
/* @brief Check node for a type
*
* @param node The TreeNode to check
* @return Optional value
*/
/* @brief Check node for a type
*
* @param node The TreeNode to check
* @return Optional value
*/
- Optional
Vector4 IsVector4( const TreeNode & node
) const;
+ Optional
Matrix IsMatrix(const TreeNode& node
) const;
/* @brief Check node for a type
*
* @param node The TreeNode to check
* @return Optional value
*/
/* @brief Check node for a type
*
* @param node The TreeNode to check
* @return Optional value
*/
- OptionalMatrix
IsMatrix( const TreeNode & node
) const;
+ OptionalMatrix
3 IsMatrix3(const TreeNode& node
) const;
/* @brief Check node for a type
*
* @param node The TreeNode to check
* @return Optional value
*/
/* @brief Check node for a type
*
* @param node The TreeNode to check
* @return Optional value
*/
- Optional
Matrix3 IsMatrix3( const TreeNode & node
) const;
+ Optional
Rect IsRect(const TreeNode& node
) const;
/* @brief Check node for a type
*
* @param node The TreeNode to check
* @return Optional value
*/
/* @brief Check node for a type
*
* @param node The TreeNode to check
* @return Optional value
*/
- OptionalRect IsRect( const TreeNode & node ) const;
+ OptionalExtents IsExtents(const TreeNode& node) const;
+
+ /* @brief Check node for a type
+ *
+ * @param child The optional child TreeNode
+ * @return Optional value
+ */
+ OptionalString IsString(OptionalChild child) const;
/* @brief Check node for a type
*
* @param child The optional child TreeNode
* @return Optional value
*/
/* @brief Check node for a type
*
* @param child The optional child TreeNode
* @return Optional value
*/
- Optional
String IsString( OptionalChild child
) const;
+ Optional
Float IsFloat(OptionalChild child
) const;
/* @brief Check node for a type
*
* @param child The optional child TreeNode
* @return Optional value
*/
/* @brief Check node for a type
*
* @param child The optional child TreeNode
* @return Optional value
*/
- Optional
Float IsFloat( OptionalChild child
) const;
+ Optional
Boolean IsBoolean(OptionalChild child
) const;
/* @brief Check node for a type
*
* @param child The optional child TreeNode
* @return Optional value
*/
/* @brief Check node for a type
*
* @param child The optional child TreeNode
* @return Optional value
*/
- Optional
Boolean IsBoolean( OptionalChild child
) const;
+ Optional
Integer IsInteger(OptionalChild child
) const;
/* @brief Check node for a type
*
* @param child The optional child TreeNode
* @return Optional value
*/
/* @brief Check node for a type
*
* @param child The optional child TreeNode
* @return Optional value
*/
- Optional
Integer IsInteger( OptionalChild child
) const;
+ Optional
Vector2 IsVector2(OptionalChild child
) const;
/* @brief Check node for a type
*
* @param child The optional child TreeNode
* @return Optional value
*/
/* @brief Check node for a type
*
* @param child The optional child TreeNode
* @return Optional value
*/
- OptionalVector
2 IsVector2( OptionalChild child
) const;
+ OptionalVector
3 IsVector3(OptionalChild child
) const;
/* @brief Check node for a type
*
* @param child The optional child TreeNode
* @return Optional value
*/
/* @brief Check node for a type
*
* @param child The optional child TreeNode
* @return Optional value
*/
- OptionalVector
3 IsVector3( OptionalChild child
) const;
+ OptionalVector
4 IsVector4(OptionalChild child
) const;
/* @brief Check node for a type
*
* @param child The optional child TreeNode
* @return Optional value
*/
/* @brief Check node for a type
*
* @param child The optional child TreeNode
* @return Optional value
*/
- Optional
Vector4 IsVector4( OptionalChild child
) const;
+ Optional
Matrix IsMatrix(OptionalChild child
) const;
/* @brief Check node for a type
*
* @param child The optional child TreeNode
* @return Optional value
*/
/* @brief Check node for a type
*
* @param child The optional child TreeNode
* @return Optional value
*/
- OptionalMatrix
IsMatrix( OptionalChild child
) const;
+ OptionalMatrix
3 IsMatrix3(OptionalChild child
) const;
/* @brief Check node for a type
*
* @param child The optional child TreeNode
* @return Optional value
*/
/* @brief Check node for a type
*
* @param child The optional child TreeNode
* @return Optional value
*/
- Optional
Matrix3 IsMatrix3( OptionalChild child
) const;
+ Optional
Rect IsRect(OptionalChild child
) const;
/* @brief Check node for a type
*
* @param child The optional child TreeNode
* @return Optional value
*/
/* @brief Check node for a type
*
* @param child The optional child TreeNode
* @return Optional value
*/
-
OptionalRect IsRect( OptionalChild child
) const;
+
bool IsMap(OptionalChild child, Property::Value& out
) const;
/* @brief Check node for a type
*
* @param child The optional child TreeNode
* @return Optional value
*/
/* @brief Check node for a type
*
* @param child The optional child TreeNode
* @return Optional value
*/
- bool Is
Map( OptionalChild child, Property::Value& out
) const;
+ bool Is
Array(OptionalChild child, Property::Value& out
) const;
/* @brief Check node for a type
*
* @param child The optional child TreeNode
* @return Optional value
*/
/* @brief Check node for a type
*
* @param child The optional child TreeNode
* @return Optional value
*/
-
bool IsArray( OptionalChild child, Property::Value& out
) const;
+
OptionalExtents IsExtents(OptionalChild child
) const;
private:
// Overriding map (overrides the default map). The map is not owned.
private:
// Overriding map (overrides the default map). The map is not owned.
@@
-242,11
+245,10
@@
private:
// Replacement( const Replacement& copy );
// Returns the string if the node has a full replacement ie IMAGES if node is "{IMAGES}"
// Replacement( const Replacement& copy );
// Returns the string if the node has a full replacement ie IMAGES if node is "{IMAGES}"
- OptionalString HasFullReplacement(
const TreeNode & node
) const;
+ OptionalString HasFullReplacement(
const TreeNode& node
) const;
// Returns the property value for a full replacement from the maps
// Returns the property value for a full replacement from the maps
- Property::Value GetFullReplacement( const std::string& replacementString ) const;
-
+ Property::Value GetFullReplacement(const std::string& replacementString) const;
};
} // namespace Internal
};
} // namespace Internal
@@
-255,5
+257,4
@@
private:
} // namespace Dali
} // namespace Dali
-
-#endif // header
+#endif // DALI_TOOLKIT_INTERNAL_BUILDER_REPLACEMENT_H