-#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) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
// EXTERNAL INCLUDES
#include <utility> // pair
#include <iterator>
-#include <vector>
#include <cstring>
-#include <dali/public-api/common/dali-common.h>
+#include <dali-toolkit/public-api/dali-toolkit-common.h>
+#include <dali/public-api/common/vector-wrapper.h>
// INTERNAL INCLUDES
-#include <dali-toolkit/public-api/builder/tree-node.h>
+#include <dali-toolkit/devel-api/builder/tree-node.h>
namespace Dali
{
/*
* 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
*/
-struct CollectNodes : public std::unary_function<TreeNode*, void>
+struct CollectNodes
{
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);
* @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
} // namespace Dali
-#endif // __DALI_SCRIPT_TREE_NODE_MANIPULATOR_H__
+#endif // DALI_SCRIPT_TREE_NODE_MANIPULATOR_H