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 "Fix SetPrimaryCursorPosition() behaviour when no focus" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-scene-loader
/
internal
/
json-util.h
diff --git
a/dali-scene-loader/internal/json-util.h
b/dali-scene-loader/internal/json-util.h
index
64a99cd
..
9121bcd
100644
(file)
--- a/
dali-scene-loader/internal/json-util.h
+++ b/
dali-scene-loader/internal/json-util.h
@@
-1,7
+1,7
@@
#ifndef DALI_SCENE_LOADER_JSON_UTIL_H_
#define DALI_SCENE_LOADER_JSON_UTIL_H_
/*
#ifndef DALI_SCENE_LOADER_JSON_UTIL_H_
#define DALI_SCENE_LOADER_JSON_UTIL_H_
/*
- * Copyright (c) 202
0
Samsung Electronics Co., Ltd.
+ * Copyright (c) 202
1
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,17
+21,16
@@
#include "dali-scene-loader/public-api/index.h"
// EXTERNAL INCLUDES
#include "dali-scene-loader/public-api/index.h"
// EXTERNAL INCLUDES
-#include "dali
/public-api/common/vector-wrapper
.h"
+#include "dali
-toolkit/devel-api/builder/tree-node
.h"
#include "dali/public-api/animation/time-period.h"
#include "dali/public-api/animation/time-period.h"
-#include "dali/public-api/
object/property
.h"
+#include "dali/public-api/
common/vector-wrapper
.h"
#include "dali/public-api/math/vector4.h"
#include "dali/public-api/math/vector4.h"
-#include "dali
-toolkit/devel-api/builder/tree-node
.h"
+#include "dali
/public-api/object/property
.h"
namespace Dali
{
namespace SceneLoader
{
namespace Dali
{
namespace SceneLoader
{
-
bool ReadBool(const Toolkit::TreeNode* node, bool& num);
bool ReadInt(const Toolkit::TreeNode* node, int& num);
bool ReadBool(const Toolkit::TreeNode* node, bool& num);
bool ReadInt(const Toolkit::TreeNode* node, int& num);
@@
-89,7
+88,7
@@
Property::Value ReadPropertyValue(const Property::Type& propType, const Toolkit:
*/
Property::Value ReadPropertyValue(const Toolkit::TreeNode& tn);
*/
Property::Value ReadPropertyValue(const Toolkit::TreeNode& tn);
-}
-}
+}
// namespace SceneLoader
+}
// namespace Dali
#endif //DALI_SCENE_LOADER_JSON_UTIL_H_
#endif //DALI_SCENE_LOADER_JSON_UTIL_H_