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
[dali_1.2.4] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
builder
/
json-parser-impl.h
diff --git
a/dali-toolkit/internal/builder/json-parser-impl.h
b/dali-toolkit/internal/builder/json-parser-impl.h
index
987799e
..
dbdbf45
100644
(file)
--- a/
dali-toolkit/internal/builder/json-parser-impl.h
+++ b/
dali-toolkit/internal/builder/json-parser-impl.h
@@
-18,14
+18,15
@@
*
*/
*
*/
+// EXTERNAL INCLUDES
#include <string>
#include <string>
-#include <vector>
#include <list>
#include <list>
-
-//
+#include <dali/public-api/common/vector-wrapper.h>
#include <dali/public-api/object/base-object.h>
#include <dali/public-api/object/base-object.h>
-#include <dali-toolkit/public-api/builder/json-parser.h>
-#include <dali-toolkit/public-api/builder/tree-node.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/builder/json-parser.h>
+#include <dali-toolkit/devel-api/builder/tree-node.h>
#include <dali-toolkit/internal/builder/builder-get-is.inl.h>
#include <dali-toolkit/internal/builder/builder-get-is.inl.h>
@@
-61,7
+62,7
@@
public:
/*
* @copydoc Toolkit::JsonParser::Parse()
*/
/*
* @copydoc Toolkit::JsonParser::Parse()
*/
-
int
Parse(const std::string& source);
+
bool
Parse(const std::string& source);
/*
* @copydoc Toolkit::JsonParser::Pack()
/*
* @copydoc Toolkit::JsonParser::Pack()