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 "Set focus to web engine." into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
builder
/
tree-node-manipulator.h
diff --git
a/dali-toolkit/internal/builder/tree-node-manipulator.h
b/dali-toolkit/internal/builder/tree-node-manipulator.h
index
c21f4e1
..
cc9e98b
100644
(file)
--- a/
dali-toolkit/internal/builder/tree-node-manipulator.h
+++ b/
dali-toolkit/internal/builder/tree-node-manipulator.h
@@
-1,8
+1,8
@@
-#ifndef
__DALI_SCRIPT_TREE_NODE_MANIPULATOR_H__
-#define
__DALI_SCRIPT_TREE_NODE_MANIPULATOR_H__
+#ifndef
DALI_SCRIPT_TREE_NODE_MANIPULATOR_H
+#define
DALI_SCRIPT_TREE_NODE_MANIPULATOR_H
/*
/*
- * Copyright (c) 201
4
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.
@@
-18,14
+18,16
@@
*
*/
*
*/
+// EXTERNAL INCLUDES
#include <utility> // pair
#include <iterator>
#include <utility> // pair
#include <iterator>
-#include <vector>
#include <cstring>
#include <cstring>
+#include <dali-toolkit/public-api/dali-toolkit-common.h>
+#include <dali/public-api/common/vector-wrapper.h>
+
// INTERNAL INCLUDES
// INTERNAL INCLUDES
-#include <dali/public-api/common/dali-common.h>
-#include <dali-toolkit/public-api/builder/tree-node.h>
+#include <dali-toolkit/devel-api/builder/tree-node.h>
namespace Dali
{
namespace Dali
{
@@
-189,21
+191,21
@@
private:
/*
* Do write to string stream
*/
/*
* Do write to string stream
*/
- void DoWrite(const TreeNode *value, std::ostream& output, int
ident
) const;
+ void DoWrite(const TreeNode *value, std::ostream& output, int
level, int ident, bool groupChildren
) const;
};
/*
* Collect nodes
*/
};
/*
* Collect nodes
*/
-struct CollectNodes
: public std::unary_function<TreeNode*, void>
+struct CollectNodes
{
CollectNodes() {};
/*
* Call operator to add nodes to the list
*/
{
CollectNodes() {};
/*
* Call operator to add nodes to the list
*/
-
result_type operator()(argument_type
& n)
+
void operator()(TreeNode*
& n)
{
DALI_ASSERT_DEBUG(n && "Operation on NULL JSON node");
nodes.push_back(n);
{
DALI_ASSERT_DEBUG(n && "Operation on NULL JSON node");
nodes.push_back(n);
@@
-239,7
+241,7
@@
void DepthFirst( TreeNode* node, Operation& operation)
* @param tree The tree to search
* @return the TreeNode if found, else NULL
*/
* @param tree The tree to search
* @return the TreeNode if found, else NULL
*/
-const TreeNode* FindIt(
const std::string&
childName, const TreeNode* tree);
+const TreeNode* FindIt(
std::string_view
childName, const TreeNode* tree);
/*
* Copy string to a buffer
/*
* Copy string to a buffer
@@
-258,4
+260,4
@@
char *CopyString( const char *fromString, VectorCharIter& iter, const VectorChar
} // namespace Dali
} // namespace Dali
-#endif //
__DALI_SCRIPT_TREE_NODE_MANIPULATOR_H__
+#endif //
DALI_SCRIPT_TREE_NODE_MANIPULATOR_H