From 087ae4162e2f69448d308c4aa1edd4132447276d Mon Sep 17 00:00:00 2001
From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Thu, 29 May 2014 18:58:21 +0100
Subject: [PATCH] Stop including std::vector directly inside dali

Change-Id: Ia5ec0f6e7dbca29c95cae871857c772fc6697ac6
---
 adaptors/tizen/internal/command-line-options.cpp                      | 3 ++-
 adaptors/tizen/internal/common/damage-observer.h                      | 2 +-
 adaptors/tizen/internal/common/events/event-handler.cpp               | 2 +-
 adaptors/tizen/internal/common/events/gesture-detector.h              | 3 +--
 adaptors/tizen/internal/common/events/gesture-manager.h               | 3 +--
 adaptors/tizen/internal/common/events/pan-gesture-detector-base.h     | 3 +--
 adaptors/tizen/internal/common/events/pan-gesture-detector.h          | 3 +--
 adaptors/tizen/internal/common/events/pinch-gesture-detector.h        | 2 +-
 adaptors/tizen/internal/common/events/tap-gesture-detector.h          | 2 +-
 adaptors/tizen/internal/common/server-connection.h                    | 3 ++-
 adaptors/tizen/internal/common/virtual-keyboard-impl.cpp              | 4 ++--
 .../src/dali-adaptor/dali-test-suite-utils/test-trace-call-stack.h    | 2 +-
 platform-abstractions/interfaces/data-cache.h                         | 2 +-
 13 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/adaptors/tizen/internal/command-line-options.cpp b/adaptors/tizen/internal/command-line-options.cpp
index ad5a8f9..a784a80 100644
--- a/adaptors/tizen/internal/command-line-options.cpp
+++ b/adaptors/tizen/internal/command-line-options.cpp
@@ -23,7 +23,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <iostream>
-#include <vector>
+
+#include <dali/public-api/common/vector-wrapper.h>
 
 using namespace std;
 
diff --git a/adaptors/tizen/internal/common/damage-observer.h b/adaptors/tizen/internal/common/damage-observer.h
index e0fc3b8..eb9dd47 100644
--- a/adaptors/tizen/internal/common/damage-observer.h
+++ b/adaptors/tizen/internal/common/damage-observer.h
@@ -19,7 +19,7 @@
  */
 
 // EXTERNAL INCLUDES
-#include <vector>
+#include <dali/public-api/common/vector-wrapper.h>
 
 #include <dali/public-api/math/rect.h>
 
diff --git a/adaptors/tizen/internal/common/events/event-handler.cpp b/adaptors/tizen/internal/common/events/event-handler.cpp
index 1e156af..06ba01f 100644
--- a/adaptors/tizen/internal/common/events/event-handler.cpp
+++ b/adaptors/tizen/internal/common/events/event-handler.cpp
@@ -22,7 +22,6 @@
 #include <Ecore.h>
 #include <Ecore_Input.h>
 #include <Ecore_X.h>
-#include <vector>
 #include <cstring>
 
 #include <sys/time.h>
@@ -30,6 +29,7 @@
 #include <vconf.h>
 #include <vconf-keys.h>
 
+#include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/events/touch-point.h>
 #include <dali/public-api/events/key-event.h>
 #include <dali/public-api/events/mouse-wheel-event.h>
diff --git a/adaptors/tizen/internal/common/events/gesture-detector.h b/adaptors/tizen/internal/common/events/gesture-detector.h
index 26314de..d7ccf67 100644
--- a/adaptors/tizen/internal/common/events/gesture-detector.h
+++ b/adaptors/tizen/internal/common/events/gesture-detector.h
@@ -19,8 +19,7 @@
  */
 
 // EXTERNAL INCLUDES
-#include <vector>
-
+#include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/events/gesture.h>
 #include <dali/public-api/math/vector2.h>
 #include <dali/public-api/object/ref-object.h>
diff --git a/adaptors/tizen/internal/common/events/gesture-manager.h b/adaptors/tizen/internal/common/events/gesture-manager.h
index a96f9f5..5a482fc 100644
--- a/adaptors/tizen/internal/common/events/gesture-manager.h
+++ b/adaptors/tizen/internal/common/events/gesture-manager.h
@@ -19,8 +19,7 @@
  */
 
 // EXTERNAL INCLUDES
-#include <vector>
-
+#include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/math/vector2.h>
 #include <dali/integration-api/gesture-manager.h>
 
diff --git a/adaptors/tizen/internal/common/events/pan-gesture-detector-base.h b/adaptors/tizen/internal/common/events/pan-gesture-detector-base.h
index 30f19ab..eb63c16 100644
--- a/adaptors/tizen/internal/common/events/pan-gesture-detector-base.h
+++ b/adaptors/tizen/internal/common/events/pan-gesture-detector-base.h
@@ -19,8 +19,7 @@
  */
 
 // EXTERNAL INCLUDES
-#include <vector>
-
+#include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/math/vector2.h>
 #include <dali/integration-api/events/pan-gesture-event.h>
 
diff --git a/adaptors/tizen/internal/common/events/pan-gesture-detector.h b/adaptors/tizen/internal/common/events/pan-gesture-detector.h
index 5cff862..189e125 100644
--- a/adaptors/tizen/internal/common/events/pan-gesture-detector.h
+++ b/adaptors/tizen/internal/common/events/pan-gesture-detector.h
@@ -19,8 +19,7 @@
  */
 
 // EXTERNAL INCLUDES
-#include <vector>
-
+#include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/math/vector2.h>
 
 // INTERNAL INCLUDES
diff --git a/adaptors/tizen/internal/common/events/pinch-gesture-detector.h b/adaptors/tizen/internal/common/events/pinch-gesture-detector.h
index d6fa80c..62c1b7d 100644
--- a/adaptors/tizen/internal/common/events/pinch-gesture-detector.h
+++ b/adaptors/tizen/internal/common/events/pinch-gesture-detector.h
@@ -19,7 +19,7 @@
  */
 
 // EXTERNAL INCLUDES
-#include <vector>
+#include <dali/public-api/common/vector-wrapper.h>
 
 // INTERNAL INCLUDES
 #include <internal/common/events/gesture-detector.h>
diff --git a/adaptors/tizen/internal/common/events/tap-gesture-detector.h b/adaptors/tizen/internal/common/events/tap-gesture-detector.h
index 4a78fc0..59655eb 100644
--- a/adaptors/tizen/internal/common/events/tap-gesture-detector.h
+++ b/adaptors/tizen/internal/common/events/tap-gesture-detector.h
@@ -19,7 +19,7 @@
  */
 
 // EXTERNAL INCLUDES
-#include <vector>
+#include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/adaptor-framework/common/timer.h>
 
 // INTERNAL INCLUDES
diff --git a/adaptors/tizen/internal/common/server-connection.h b/adaptors/tizen/internal/common/server-connection.h
index cfacaf5..3838570 100644
--- a/adaptors/tizen/internal/common/server-connection.h
+++ b/adaptors/tizen/internal/common/server-connection.h
@@ -19,10 +19,11 @@
  */
 
 // EXTERNAL INCLUDES
-#include <vector>
 #include <Ecore.h>
 #include <Ecore_Ipc.h>
 
+#include <dali/public-api/common/vector-wrapper.h>
+
 namespace Dali
 {
 namespace Internal
diff --git a/adaptors/tizen/internal/common/virtual-keyboard-impl.cpp b/adaptors/tizen/internal/common/virtual-keyboard-impl.cpp
index ba05a13..7c354b4 100644
--- a/adaptors/tizen/internal/common/virtual-keyboard-impl.cpp
+++ b/adaptors/tizen/internal/common/virtual-keyboard-impl.cpp
@@ -21,11 +21,11 @@
 // EXTERNAL INCLUDES
 #include <X11/Xlib.h>
 #include <Ecore_X.h>
-#include <vector>
 #include <algorithm>
 
-#include <dali/integration-api/debug.h>
+#include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/adaptor-framework/common/adaptor.h>
+#include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
 #include <internal/common/locale-utils.h>
diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-trace-call-stack.h b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-trace-call-stack.h
index 3dd6065..b98e42f 100644
--- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-trace-call-stack.h
+++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-trace-call-stack.h
@@ -19,7 +19,7 @@
  */
 
 #include <string>
-#include <vector>
+#include <dali/public-api/common/vector-wrapper.h>
 
 namespace Dali
 {
diff --git a/platform-abstractions/interfaces/data-cache.h b/platform-abstractions/interfaces/data-cache.h
index e1aacc7..f359d81 100644
--- a/platform-abstractions/interfaces/data-cache.h
+++ b/platform-abstractions/interfaces/data-cache.h
@@ -19,8 +19,8 @@
  */
 
 // EXTERNAL INCLUDES
-#include <vector>
 #include <string>
+#include <dali/public-api/common/vector-wrapper.h>
 
 namespace Dali
 {
-- 
2.7.4