From 228286f3af41623416b6d78abf194a395fec711d Mon Sep 17 00:00:00 2001 From: Adeel Kazmi Date: Wed, 25 Feb 2015 16:59:38 +0000 Subject: [PATCH] Replace vector.h with vector-wrapper.h Change-Id: Ib42e49064314960e3c8cb501983d9972160d4d1e --- dali-toolkit/internal/builder/json-parser-impl.h | 3 +-- dali-toolkit/internal/builder/tree-node-manipulator.h | 2 +- dali-toolkit/public-api/builder/json-parser.cpp | 1 - dali-toolkit/public-api/builder/json-parser.h | 3 +-- dali-toolkit/public-api/builder/tree-node.h | 3 --- 5 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dali-toolkit/internal/builder/json-parser-impl.h b/dali-toolkit/internal/builder/json-parser-impl.h index 8df13b2..30945d7 100644 --- 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 -#include #include - +#include #include // 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 --- 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 // pair #include -#include #include #include +#include // INTERNAL INCLUDES #include diff --git a/dali-toolkit/public-api/builder/json-parser.cpp b/dali-toolkit/public-api/builder/json-parser.cpp index acffb9d..640517c 100644 --- a/dali-toolkit/public-api/builder/json-parser.cpp +++ b/dali-toolkit/public-api/builder/json-parser.cpp @@ -22,7 +22,6 @@ #include #include #include -#include #include #include diff --git a/dali-toolkit/public-api/builder/json-parser.h b/dali-toolkit/public-api/builder/json-parser.h index 8abbe6a..c409d64 100644 --- 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 -#include #include #include +#include // INTERNAL INCLUDES #include -#include 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 --- 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 // pair #include -#include - -// INTERNAL INCLUDES #include namespace Dali -- 2.7.4