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
Merge "Add TextField BACKGROUND property and more Preedit style options" into devel...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
builder
/
tree-node.h
diff --git
a/dali-toolkit/devel-api/builder/tree-node.h
b/dali-toolkit/devel-api/builder/tree-node.h
index
6da465a
..
f99059d
100644
(file)
--- a/
dali-toolkit/devel-api/builder/tree-node.h
+++ b/
dali-toolkit/devel-api/builder/tree-node.h
@@
-1,8
+1,8
@@
-#ifndef
__DALI_SCRIPT_TREE_NODE_H__
-#define
__DALI_SCRIPT_TREE_NODE_H__
+#ifndef
DALI_SCRIPT_TREE_NODE_H
+#define
DALI_SCRIPT_TREE_NODE_H
/*
/*
- * Copyright (c) 201
5
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
9
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.
@@
-21,7
+21,7
@@
// EXTERNAL INCLUDES
#include <utility> // pair
#include <iterator>
// EXTERNAL INCLUDES
#include <utility> // pair
#include <iterator>
-#include <dali
/public-api/common/dali
-common.h>
+#include <dali
-toolkit/public-api/dali-toolkit
-common.h>
namespace Dali
{
namespace Dali
{
@@
-42,7
+42,7
@@
class TreeNodeManipulator;
* TreeNode does not own its string data which is held by a container eg JsonParser
* Modification operations should be done through a container.
*/
* TreeNode does not own its string data which is held by a container eg JsonParser
* Modification operations should be done through a container.
*/
-class DALI_
IMPOR
T_API TreeNode
+class DALI_
TOOLKI
T_API TreeNode
{
public:
/*
{
public:
/*
@@
-105,11
+105,6
@@
public:
* pointer semantics
*/
KeyNodePair operator*();
* pointer semantics
*/
KeyNodePair operator*();
-
- /*
- * pointer semantics
- */
- KeyNodePair operator->();
private:
TreeNode* mNode;
};
private:
TreeNode* mNode;
};
@@
-187,13
+182,20
@@
public:
bool HasSubstitution() const;
/*
bool HasSubstitution() const;
/*
- * Gets a child of the node
- * @param name The name of the child
+ * Gets a child of the node
(using case sensitive matching)
+ * @param name The name of the child
.
* @return The child if found, else NULL
*/
const TreeNode* GetChild(const std::string& name) const;
/*
* @return The child if found, else NULL
*/
const TreeNode* GetChild(const std::string& name) const;
/*
+ * Gets a child of the node (using case insensitive matching)
+ * @param name The name of the child in lower case
+ * @return The child if found, else NULL
+ */
+ const TreeNode* GetChildIgnoreCase(const std::string& name) const;
+
+ /*
* Recursively search for a child of the node
* @param name The name of the child
* @return The child if found, else NULL
* Recursively search for a child of the node
* @param name The name of the child
* @return The child if found, else NULL
@@
-235,4
+237,4
@@
private:
} // namespace Dali
} // namespace Dali
-#endif //
__DALI_SCRIPT_TREE_NODE_H__
+#endif //
DALI_SCRIPT_TREE_NODE_H