X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=dali-toolkit%2Fpublic-api%2Fbuilder%2Ftree-node.h;h=893caee8302f636e6d7a550a51523d6a4bbe7e6b;hb=61be2f8d3c96e01da8e6ade2a76a192ff6ab6945;hp=44c06711ed0497fef55c0ad1f40e556b9cf1476b;hpb=e2eda444afbe82e9591fe198eef339227f90a616;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/public-api/builder/tree-node.h b/dali-toolkit/public-api/builder/tree-node.h index 44c0671..893caee 100644 --- a/dali-toolkit/public-api/builder/tree-node.h +++ b/dali-toolkit/public-api/builder/tree-node.h @@ -1,30 +1,29 @@ #ifndef __DALI_SCRIPT_TREE_NODE_H__ #define __DALI_SCRIPT_TREE_NODE_H__ -// -// Copyright (c) 2014 Samsung Electronics Co., Ltd. -// -// Licensed under the Flora License, Version 1.0 (the License); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://floralicense.org/license/ -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an AS IS BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// +/* + * Copyright (c) 2015 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +// EXTERNAL INCLUDES #include // pair #include -#include - -// INTERNAL INCLUDES #include -namespace Dali DALI_IMPORT_API +namespace Dali { namespace Toolkit @@ -43,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. */ -class TreeNode +class DALI_IMPORT_API TreeNode { public: /* @@ -207,11 +206,11 @@ private: /* * Constructor */ - TreeNode(); + DALI_INTERNAL TreeNode(); // non copyable or assignable - TreeNode(TreeNode &); - TreeNode& operator=(const TreeNode&); + DALI_INTERNAL TreeNode(TreeNode &); + DALI_INTERNAL TreeNode& operator=(const TreeNode&); const char* mName; ///< The nodes name (if any)