Merge "JavaScript support for DALi" into tizen

diff --git a/dali-toolkit/internal/builder/json-parser-impl.h b/dali-toolkit/internal/builder/json-parser-impl.h
index 8df13b2..30945d7 100644 (file)
--- a/dali-toolkit/internal/builder/json-parser-impl.h
+++ b/dali-toolkit/internal/builder/json-parser-impl.h
@@ -20,9 +20,8 @@
 
 // EXTERNAL INCLUDES
 #include <string>
-#include <vector>
 #include <list>
-
+#include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/object/base-object.h>
 
 // INTERNAL INCLUDES

diff --git a/dali-toolkit/internal/builder/tree-node-manipulator.h b/dali-toolkit/internal/builder/tree-node-manipulator.h
index bd69537..cd5a7ad 100644 (file)
--- a/dali-toolkit/internal/builder/tree-node-manipulator.h
+++ b/dali-toolkit/internal/builder/tree-node-manipulator.h
@@ -21,10 +21,10 @@
 // EXTERNAL INCLUDES
 #include <utility> // pair
 #include <iterator>
-#include <vector>
 #include <cstring>
 
 #include <dali/public-api/common/dali-common.h>
+#include <dali/public-api/common/vector-wrapper.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/builder/tree-node.h>

diff --git a/dali-toolkit/public-api/builder/json-parser.cpp b/dali-toolkit/public-api/builder/json-parser.cpp
index acffb9d..640517c 100644 (file)
--- a/dali-toolkit/public-api/builder/json-parser.cpp
+++ b/dali-toolkit/public-api/builder/json-parser.cpp
@@ -22,7 +22,6 @@
 #include <memory.h>
 #include <functional>
 #include <iostream>
-#include <vector>
 #include <cstring>
 #include <algorithm>
 

diff --git a/dali-toolkit/public-api/builder/json-parser.h b/dali-toolkit/public-api/builder/json-parser.h
index 8abbe6a..c409d64 100644 (file)
--- a/dali-toolkit/public-api/builder/json-parser.h
+++ b/dali-toolkit/public-api/builder/json-parser.h
@@ -20,13 +20,12 @@
 
 // EXTERNAL INCLUDES
 #include <string>
-#include <vector>
 #include <list>
 #include <ostream>
+#include <dali/public-api/object/base-handle.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/builder/tree-node.h>
-#include <dali/public-api/object/base-handle.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/public-api/builder/tree-node.h b/dali-toolkit/public-api/builder/tree-node.h
index 710e0d8..69e6e47 100644 (file)
--- a/dali-toolkit/public-api/builder/tree-node.h
+++ b/dali-toolkit/public-api/builder/tree-node.h
@@ -21,9 +21,6 @@
 // EXTERNAL INCLUDES
 #include <utility> // pair
 #include <iterator>
-#include <vector>
-
-// INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 
 namespace Dali