removed reliance on dali-adaptor

Changed test cases to use dali-core.h instead of dali.h, which is a dali-adaptor header.

Change-Id: I3ed7c5adb4166f57660f36666fe320fb7395bc9d
Signed-off-by: David Steele <david.steele@partner.samsung.com>

diff --git a/automated-tests/src/dali-internal/utc-Dali-Internal-Font.cpp b/automated-tests/src/dali-internal/utc-Dali-Internal-Font.cpp
index cddc3a9..23b3099 100644 (file)
--- a/automated-tests/src/dali-internal/utc-Dali-Internal-Font.cpp
+++ b/automated-tests/src/dali-internal/utc-Dali-Internal-Font.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali/integration-api/glyph-set.h>
 
 #include <dali-test-suite-utils.h>

diff --git a/automated-tests/src/dali-internal/utc-Dali-Internal-Handles.cpp b/automated-tests/src/dali-internal/utc-Dali-Internal-Handles.cpp
index 7f8ac90..cb1ae63 100644 (file)
--- a/automated-tests/src/dali-internal/utc-Dali-Internal-Handles.cpp
+++ b/automated-tests/src/dali-internal/utc-Dali-Internal-Handles.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali/integration-api/glyph-set.h>
 
 #include <dali-test-suite-utils.h>

diff --git a/automated-tests/src/dali-internal/utc-Dali-Internal-Image-Culling.cpp b/automated-tests/src/dali-internal/utc-Dali-Internal-Image-Culling.cpp
index a759a77..57c5a47 100644 (file)
--- a/automated-tests/src/dali-internal/utc-Dali-Internal-Image-Culling.cpp
+++ b/automated-tests/src/dali-internal/utc-Dali-Internal-Image-Culling.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 
 #include <dali-test-suite-utils.h>
 

diff --git a/automated-tests/src/dali-internal/utc-Dali-Internal-ImageFactory.cpp b/automated-tests/src/dali-internal/utc-Dali-Internal-ImageFactory.cpp
index a936e5d..93648bf 100644 (file)
--- a/automated-tests/src/dali-internal/utc-Dali-Internal-ImageFactory.cpp
+++ b/automated-tests/src/dali-internal/utc-Dali-Internal-ImageFactory.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 
 // Internal headers are allowed here

diff --git a/automated-tests/src/dali-internal/utc-Dali-Internal-Material.cpp b/automated-tests/src/dali-internal/utc-Dali-Internal-Material.cpp
index 516c3c4..0c49524 100644 (file)
--- a/automated-tests/src/dali-internal/utc-Dali-Internal-Material.cpp
+++ b/automated-tests/src/dali-internal/utc-Dali-Internal-Material.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 
 #include <dali-test-suite-utils.h>
 

diff --git a/automated-tests/src/dali-internal/utc-Dali-Internal-ResourceClient.cpp b/automated-tests/src/dali-internal/utc-Dali-Internal-ResourceClient.cpp
index 45a37ec..484bb95 100644 (file)
--- a/automated-tests/src/dali-internal/utc-Dali-Internal-ResourceClient.cpp
+++ b/automated-tests/src/dali-internal/utc-Dali-Internal-ResourceClient.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 #include <test-native-image.h>
 

diff --git a/automated-tests/src/dali-internal/utc-Dali-Internal-Text.cpp b/automated-tests/src/dali-internal/utc-Dali-Internal-Text.cpp
index bcced03..629d6e1 100644 (file)
--- a/automated-tests/src/dali-internal/utc-Dali-Internal-Text.cpp
+++ b/automated-tests/src/dali-internal/utc-Dali-Internal-Text.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali/integration-api/glyph-set.h>
 #include <dali-test-suite-utils.h>
 

diff --git a/automated-tests/src/dali-unmanaged/dali-test-suite-utils/mesh-builder.h b/automated-tests/src/dali-unmanaged/dali-test-suite-utils/mesh-builder.h
index d2ecca9..18538f7 100644 (file)
--- a/automated-tests/src/dali-unmanaged/dali-test-suite-utils/mesh-builder.h
+++ b/automated-tests/src/dali-unmanaged/dali-test-suite-utils/mesh-builder.h
@@ -17,7 +17,6 @@
  *
  */
 
-#include <dali/dali.h>
 #include <dali/public-api/dali-core.h>
 
 namespace Dali

diff --git a/automated-tests/src/dali-unmanaged/utc-Dali-AnimatableMesh.cpp b/automated-tests/src/dali-unmanaged/utc-Dali-AnimatableMesh.cpp
index 91526d5..f4b656f 100644 (file)
--- a/automated-tests/src/dali-unmanaged/utc-Dali-AnimatableMesh.cpp
+++ b/automated-tests/src/dali-unmanaged/utc-Dali-AnimatableMesh.cpp
@@ -18,7 +18,6 @@
 #include <iostream>
 #include <stdlib.h>
 
-#include <dali/dali.h>
 #include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 

diff --git a/automated-tests/src/dali-unmanaged/utc-Dali-Constrainable.cpp b/automated-tests/src/dali-unmanaged/utc-Dali-Constrainable.cpp
index 57a4748..73dcec9 100644 (file)
--- a/automated-tests/src/dali-unmanaged/utc-Dali-Constrainable.cpp
+++ b/automated-tests/src/dali-unmanaged/utc-Dali-Constrainable.cpp
@@ -18,7 +18,6 @@
 #include <iostream>
 #include <stdlib.h>
 
-#include <dali/dali.h>
 #include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 

diff --git a/automated-tests/src/dali-unmanaged/utc-Dali-Context.cpp b/automated-tests/src/dali-unmanaged/utc-Dali-Context.cpp
index 1b02069..db5059e 100644 (file)
--- a/automated-tests/src/dali-unmanaged/utc-Dali-Context.cpp
+++ b/automated-tests/src/dali-unmanaged/utc-Dali-Context.cpp
@@ -18,7 +18,6 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
 #include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 

diff --git a/automated-tests/src/dali-unmanaged/utc-Dali-CustomActor.cpp b/automated-tests/src/dali-unmanaged/utc-Dali-CustomActor.cpp
index fa4ae08..93ca794 100644 (file)
--- a/automated-tests/src/dali-unmanaged/utc-Dali-CustomActor.cpp
+++ b/automated-tests/src/dali-unmanaged/utc-Dali-CustomActor.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 
 #include <dali/integration-api/events/touch-event-integ.h>
 #include <dali/integration-api/events/mouse-wheel-event-integ.h>

diff --git a/automated-tests/src/dali-unmanaged/utc-Dali-DistanceField.cpp b/automated-tests/src/dali-unmanaged/utc-Dali-DistanceField.cpp
index 931cccc..8e67bc5 100644 (file)
--- a/automated-tests/src/dali-unmanaged/utc-Dali-DistanceField.cpp
+++ b/automated-tests/src/dali-unmanaged/utc-Dali-DistanceField.cpp
@@ -20,7 +20,6 @@
 
 #include <stdlib.h>
 
-#include <dali/dali.h>
 #include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 

diff --git a/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsBody.cpp b/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsBody.cpp
index c98542d..2068928 100644 (file)
--- a/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsBody.cpp
+++ b/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsBody.cpp
@@ -17,7 +17,6 @@
 
 #include <iostream>
 #include <stdlib.h>
-#include <dali/dali.h>
 #include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 

diff --git a/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsBodyConfig.cpp b/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsBodyConfig.cpp
index b251e39..17baffd 100644 (file)
--- a/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsBodyConfig.cpp
+++ b/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsBodyConfig.cpp
@@ -18,7 +18,6 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
 #include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 

diff --git a/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsJoint.cpp b/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsJoint.cpp
index 8b1794e..2da0996 100644 (file)
--- a/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsJoint.cpp
+++ b/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsJoint.cpp
@@ -17,7 +17,6 @@
 
 #include <iostream>
 #include <stdlib.h>
-#include <dali/dali.h>
 #include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 

diff --git a/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsShape.cpp b/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsShape.cpp
index 95a3a86..c0a462f 100644 (file)
--- a/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsShape.cpp
+++ b/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsShape.cpp
@@ -17,7 +17,6 @@
 
 #include <iostream>
 #include <stdlib.h>
-#include <dali/dali.h>
 #include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 

diff --git a/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsWorld.cpp b/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsWorld.cpp
index 68cf59e..6b107e8 100644 (file)
--- a/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsWorld.cpp
+++ b/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsWorld.cpp
@@ -17,7 +17,6 @@
 
 #include <iostream>
 #include <stdlib.h>
-#include <dali/dali.h>
 #include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 #include <test-dynamics.h>

diff --git a/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsWorldConfig.cpp b/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsWorldConfig.cpp
index d6a7857..3e71dd3 100644 (file)
--- a/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsWorldConfig.cpp
+++ b/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsWorldConfig.cpp
@@ -17,7 +17,6 @@
 
 #include <iostream>
 #include <stdlib.h>
-#include <dali/dali.h>
 #include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 

diff --git a/automated-tests/src/dali-unmanaged/utc-Dali-EncodedBufferImage.cpp b/automated-tests/src/dali-unmanaged/utc-Dali-EncodedBufferImage.cpp
index 571499b..ba99845 100644 (file)
--- a/automated-tests/src/dali-unmanaged/utc-Dali-EncodedBufferImage.cpp
+++ b/automated-tests/src/dali-unmanaged/utc-Dali-EncodedBufferImage.cpp
@@ -17,7 +17,6 @@
 
 #include <iostream>
 #include <stdlib.h>
-#include <dali/dali.h>
 #include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 

diff --git a/automated-tests/src/dali-unmanaged/utc-Dali-GlyphImage.cpp b/automated-tests/src/dali-unmanaged/utc-Dali-GlyphImage.cpp
index 3d74e78..a1f2379 100644 (file)
--- a/automated-tests/src/dali-unmanaged/utc-Dali-GlyphImage.cpp
+++ b/automated-tests/src/dali-unmanaged/utc-Dali-GlyphImage.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 
 using namespace Dali;

diff --git a/automated-tests/src/dali-unmanaged/utc-Dali-HitTestAlgorithm.cpp b/automated-tests/src/dali-unmanaged/utc-Dali-HitTestAlgorithm.cpp
index eb0b628..fd075ff 100644 (file)
--- a/automated-tests/src/dali-unmanaged/utc-Dali-HitTestAlgorithm.cpp
+++ b/automated-tests/src/dali-unmanaged/utc-Dali-HitTestAlgorithm.cpp
@@ -18,7 +18,6 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
 #include <dali/public-api/dali-core.h>
 #include <dali/integration-api/events/touch-event-integ.h>
 #include <dali-test-suite-utils.h>

diff --git a/automated-tests/src/dali-unmanaged/utc-Dali-LightActor.cpp b/automated-tests/src/dali-unmanaged/utc-Dali-LightActor.cpp
index ea9cbe9..75ce2d9 100644 (file)
--- a/automated-tests/src/dali-unmanaged/utc-Dali-LightActor.cpp
+++ b/automated-tests/src/dali-unmanaged/utc-Dali-LightActor.cpp
@@ -18,7 +18,6 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
 #include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 

diff --git a/automated-tests/src/dali-unmanaged/utc-Dali-MeshActor.cpp b/automated-tests/src/dali-unmanaged/utc-Dali-MeshActor.cpp
index 4aefce8..7d62217 100644 (file)
--- a/automated-tests/src/dali-unmanaged/utc-Dali-MeshActor.cpp
+++ b/automated-tests/src/dali-unmanaged/utc-Dali-MeshActor.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 
 using namespace Dali;

diff --git a/automated-tests/src/dali-unmanaged/utc-Dali-MeshData.cpp b/automated-tests/src/dali-unmanaged/utc-Dali-MeshData.cpp
index f13f935..1aceab7 100644 (file)
--- a/automated-tests/src/dali-unmanaged/utc-Dali-MeshData.cpp
+++ b/automated-tests/src/dali-unmanaged/utc-Dali-MeshData.cpp
@@ -18,7 +18,6 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
 #include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 

diff --git a/automated-tests/src/dali-unmanaged/utc-Dali-Model.cpp b/automated-tests/src/dali-unmanaged/utc-Dali-Model.cpp
index 9b0da3c..ff27252 100644 (file)
--- a/automated-tests/src/dali-unmanaged/utc-Dali-Model.cpp
+++ b/automated-tests/src/dali-unmanaged/utc-Dali-Model.cpp
@@ -18,7 +18,6 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
 #include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 

diff --git a/automated-tests/src/dali-unmanaged/utc-Dali-MouseWheelEvent.cpp b/automated-tests/src/dali-unmanaged/utc-Dali-MouseWheelEvent.cpp
index c219de9..1b40e40 100644 (file)
--- a/automated-tests/src/dali-unmanaged/utc-Dali-MouseWheelEvent.cpp
+++ b/automated-tests/src/dali-unmanaged/utc-Dali-MouseWheelEvent.cpp
@@ -17,7 +17,6 @@
 
 #include <iostream>
 #include <stdlib.h>
-#include <dali/dali.h>
 #include <dali/public-api/dali-core.h>
 #include <dali/integration-api/events/mouse-wheel-event-integ.h>
 #include <dali-test-suite-utils.h>

diff --git a/automated-tests/src/dali-unmanaged/utc-Dali-NinePatchImages.cpp b/automated-tests/src/dali-unmanaged/utc-Dali-NinePatchImages.cpp
index ad58a21..510282c 100644 (file)
--- a/automated-tests/src/dali-unmanaged/utc-Dali-NinePatchImages.cpp
+++ b/automated-tests/src/dali-unmanaged/utc-Dali-NinePatchImages.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 
 using namespace Dali;

diff --git a/automated-tests/src/dali-unmanaged/utc-Dali-ObjectRegistry.cpp b/automated-tests/src/dali-unmanaged/utc-Dali-ObjectRegistry.cpp
index c9b4fc9..d772a3f 100644 (file)
--- a/automated-tests/src/dali-unmanaged/utc-Dali-ObjectRegistry.cpp
+++ b/automated-tests/src/dali-unmanaged/utc-Dali-ObjectRegistry.cpp
@@ -18,7 +18,6 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
 #include <dali-test-suite-utils.h>
 #include <dali/public-api/dali-core.h>
 

diff --git a/automated-tests/src/dali-unmanaged/utc-Dali-Random.cpp b/automated-tests/src/dali-unmanaged/utc-Dali-Random.cpp
index fc626cd..3b68d76 100644 (file)
--- a/automated-tests/src/dali-unmanaged/utc-Dali-Random.cpp
+++ b/automated-tests/src/dali-unmanaged/utc-Dali-Random.cpp
@@ -18,7 +18,6 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
 #include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 

diff --git a/automated-tests/src/dali-unmanaged/utc-Dali-RenderTask.cpp b/automated-tests/src/dali-unmanaged/utc-Dali-RenderTask.cpp
index 3da60fb..5710e4d 100644 (file)
--- a/automated-tests/src/dali-unmanaged/utc-Dali-RenderTask.cpp
+++ b/automated-tests/src/dali-unmanaged/utc-Dali-RenderTask.cpp
@@ -18,7 +18,6 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
 #include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 

diff --git a/automated-tests/src/dali-unmanaged/utc-Dali-Scripting.cpp b/automated-tests/src/dali-unmanaged/utc-Dali-Scripting.cpp
index a18e876..5ae7a6e 100644 (file)
--- a/automated-tests/src/dali-unmanaged/utc-Dali-Scripting.cpp
+++ b/automated-tests/src/dali-unmanaged/utc-Dali-Scripting.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 
 using namespace Dali;

diff --git a/automated-tests/src/dali-unmanaged/utc-Dali-ShaderEffect.cpp b/automated-tests/src/dali-unmanaged/utc-Dali-ShaderEffect.cpp
index 480b5b6..24e9c47 100644 (file)
--- a/automated-tests/src/dali-unmanaged/utc-Dali-ShaderEffect.cpp
+++ b/automated-tests/src/dali-unmanaged/utc-Dali-ShaderEffect.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 
 using namespace Dali;

diff --git a/automated-tests/src/dali-unmanaged/utc-Dali-Spline.cpp b/automated-tests/src/dali-unmanaged/utc-Dali-Spline.cpp
index 9fa2313..6d3b629 100644 (file)
--- a/automated-tests/src/dali-unmanaged/utc-Dali-Spline.cpp
+++ b/automated-tests/src/dali-unmanaged/utc-Dali-Spline.cpp
@@ -18,7 +18,6 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
 #include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 

diff --git a/automated-tests/src/dali-unmanaged/utc-Dali-TypeRegistry.cpp b/automated-tests/src/dali-unmanaged/utc-Dali-TypeRegistry.cpp
index 32efbec..2533f7e 100644 (file)
--- a/automated-tests/src/dali-unmanaged/utc-Dali-TypeRegistry.cpp
+++ b/automated-tests/src/dali-unmanaged/utc-Dali-TypeRegistry.cpp
@@ -17,7 +17,6 @@
 
 #include <iostream>
 #include <stdlib.h>
-#include <dali/dali.h>
 #include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 #include <dali/integration-api/events/long-press-gesture-event.h>
@@ -1143,4 +1142,3 @@ int UtcDaliTypeRegistryNamedType(void)
   DALI_TEST_CHECK( namedActorPropertyCount > actorPropertyCount );
   END_TEST;
 }
-

diff --git a/automated-tests/src/dali-unmanaged/utc-Dali-Utf8.cpp b/automated-tests/src/dali-unmanaged/utc-Dali-Utf8.cpp
index 4e61f3f..851d758 100644 (file)
--- a/automated-tests/src/dali-unmanaged/utc-Dali-Utf8.cpp
+++ b/automated-tests/src/dali-unmanaged/utc-Dali-Utf8.cpp
@@ -18,7 +18,6 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
 #include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 

diff --git a/automated-tests/src/dali-unmanaged/utc-Dali-Vector.cpp b/automated-tests/src/dali-unmanaged/utc-Dali-Vector.cpp
index 9503b83..667a217 100644 (file)
--- a/automated-tests/src/dali-unmanaged/utc-Dali-Vector.cpp
+++ b/automated-tests/src/dali-unmanaged/utc-Dali-Vector.cpp
@@ -17,7 +17,6 @@
 
 #include <iostream>
 #include <stdlib.h>
-#include <dali/dali.h>
 #include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 

diff --git a/automated-tests/src/dali/dali-test-suite-utils/dali-test-suite-utils.cpp b/automated-tests/src/dali/dali-test-suite-utils/dali-test-suite-utils.cpp
index a518dd9..f70e3be 100644 (file)
--- a/automated-tests/src/dali/dali-test-suite-utils/dali-test-suite-utils.cpp
+++ b/automated-tests/src/dali/dali-test-suite-utils/dali-test-suite-utils.cpp
@@ -16,7 +16,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <stdarg.h>
 
 #include "dali-test-suite-utils.h"

diff --git a/automated-tests/src/dali/utc-Dali-ActiveConstraint.cpp b/automated-tests/src/dali/utc-Dali-ActiveConstraint.cpp
index 3a9a2e7..bdc4f8a 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-ActiveConstraint.cpp
+++ b/automated-tests/src/dali/utc-Dali-ActiveConstraint.cpp
@@ -17,7 +17,7 @@
 
 #include <iostream>
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 
 using namespace Dali;

diff --git a/automated-tests/src/dali/utc-Dali-Actor.cpp b/automated-tests/src/dali/utc-Dali-Actor.cpp
index e6b9758..2a3342d 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Actor.cpp
+++ b/automated-tests/src/dali/utc-Dali-Actor.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "assert.h"
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <string>
 #include <dali/integration-api/events/touch-event-integ.h>
 #include <dali-test-suite-utils.h>

diff --git a/automated-tests/src/dali/utc-Dali-AlphaFunctions.cpp b/automated-tests/src/dali/utc-Dali-AlphaFunctions.cpp
index ef70b64..5148733 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-AlphaFunctions.cpp
+++ b/automated-tests/src/dali/utc-Dali-AlphaFunctions.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 
 using namespace Dali;

diff --git a/automated-tests/src/dali/utc-Dali-AngleAxis.cpp b/automated-tests/src/dali/utc-Dali-AngleAxis.cpp
index de9f5e4..46a2c70 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-AngleAxis.cpp
+++ b/automated-tests/src/dali/utc-Dali-AngleAxis.cpp
@@ -17,7 +17,7 @@
 
 #include <iostream>
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 
 void utc_dali_angle_axis_startup(void)

diff --git a/automated-tests/src/dali/utc-Dali-AnimatableMesh.cpp b/automated-tests/src/dali/utc-Dali-AnimatableMesh.cpp
index 5715075..86404cb 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-AnimatableMesh.cpp
+++ b/automated-tests/src/dali/utc-Dali-AnimatableMesh.cpp
@@ -17,7 +17,7 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 
 using namespace Dali;

diff --git a/automated-tests/src/dali/utc-Dali-Animation.cpp b/automated-tests/src/dali/utc-Dali-Animation.cpp
index b3aa783..effd38a 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Animation.cpp
+++ b/automated-tests/src/dali/utc-Dali-Animation.cpp
@@ -19,7 +19,7 @@
 #include <algorithm>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 
 using std::max;
@@ -9147,4 +9147,3 @@ int UtcDaliAnimationSignalOrder(void)
 
   END_TEST;
 }
-

diff --git a/automated-tests/src/dali/utc-Dali-Any.cpp b/automated-tests/src/dali/utc-Dali-Any.cpp
index ada68c6..82908a0 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Any.cpp
+++ b/automated-tests/src/dali/utc-Dali-Any.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 #include <stdlib.h>
 
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 
 // Temp include

diff --git a/automated-tests/src/dali/utc-Dali-BaseHandle.cpp b/automated-tests/src/dali/utc-Dali-BaseHandle.cpp
index 109df8b..626fb37 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-BaseHandle.cpp
+++ b/automated-tests/src/dali/utc-Dali-BaseHandle.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali/integration-api/events/touch-event-integ.h>
 
 #include "dali-test-suite-utils/dali-test-suite-utils.h"

diff --git a/automated-tests/src/dali/utc-Dali-BitmapImage.cpp b/automated-tests/src/dali/utc-Dali-BitmapImage.cpp
index fe7f60c..459e23e 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-BitmapImage.cpp
+++ b/automated-tests/src/dali/utc-Dali-BitmapImage.cpp
@@ -19,7 +19,7 @@
 #include <algorithm>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 
 using std::max;

diff --git a/automated-tests/src/dali/utc-Dali-CameraActor.cpp b/automated-tests/src/dali/utc-Dali-CameraActor.cpp
index cb1088c..6ef4cb8 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-CameraActor.cpp
+++ b/automated-tests/src/dali/utc-Dali-CameraActor.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 
 #include "dali-test-suite-utils/dali-test-suite-utils.h"
 

diff --git a/automated-tests/src/dali/utc-Dali-Character.cpp b/automated-tests/src/dali/utc-Dali-Character.cpp
index 14c4724..9f0a47c 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Character.cpp
+++ b/automated-tests/src/dali/utc-Dali-Character.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 
 using namespace Dali;

diff --git a/automated-tests/src/dali/utc-Dali-Constraint.cpp b/automated-tests/src/dali/utc-Dali-Constraint.cpp
index e560e2d..cd832d4 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Constraint.cpp
+++ b/automated-tests/src/dali/utc-Dali-Constraint.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 
 using namespace Dali;

diff --git a/automated-tests/src/dali/utc-Dali-CustomActor.cpp b/automated-tests/src/dali/utc-Dali-CustomActor.cpp
index 1f961a2..3feb248 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-CustomActor.cpp
+++ b/automated-tests/src/dali/utc-Dali-CustomActor.cpp
@@ -17,7 +17,7 @@
 
 #include <iostream>
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 
 #include <dali/integration-api/events/touch-event-integ.h>
 #include <dali/integration-api/events/mouse-wheel-event-integ.h>

diff --git a/automated-tests/src/dali/utc-Dali-Degree.cpp b/automated-tests/src/dali/utc-Dali-Degree.cpp
index c4e0817..be2cbd0 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Degree.cpp
+++ b/automated-tests/src/dali/utc-Dali-Degree.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 
 using namespace Dali;

diff --git a/automated-tests/src/dali/utc-Dali-Font.cpp b/automated-tests/src/dali/utc-Dali-Font.cpp
index 4f2bde2..dc80fbf 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Font.cpp
+++ b/automated-tests/src/dali/utc-Dali-Font.cpp
@@ -19,7 +19,7 @@
 
 #include <stdlib.h>
 #include <errno.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 
 using namespace Dali;

diff --git a/automated-tests/src/dali/utc-Dali-FontParameters.cpp b/automated-tests/src/dali/utc-Dali-FontParameters.cpp
index e10e247..fc80f91 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-FontParameters.cpp
+++ b/automated-tests/src/dali/utc-Dali-FontParameters.cpp
@@ -19,7 +19,7 @@
 
 #include <stdlib.h>
 #include <errno.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 
 #include <dali-test-suite-utils.h>
 

diff --git a/automated-tests/src/dali/utc-Dali-FrameBufferImage.cpp b/automated-tests/src/dali/utc-Dali-FrameBufferImage.cpp
index 1fb4487..e44171e 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-FrameBufferImage.cpp
+++ b/automated-tests/src/dali/utc-Dali-FrameBufferImage.cpp
@@ -19,7 +19,7 @@
 #include <algorithm>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 
 using std::max;

diff --git a/automated-tests/src/dali/utc-Dali-Gesture.cpp b/automated-tests/src/dali/utc-Dali-Gesture.cpp
index 96e91ea..ccd31a6 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Gesture.cpp
+++ b/automated-tests/src/dali/utc-Dali-Gesture.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 
 using namespace Dali;

diff --git a/automated-tests/src/dali/utc-Dali-GestureDetector.cpp b/automated-tests/src/dali/utc-Dali-GestureDetector.cpp
index d4c524a..42fad1e 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-GestureDetector.cpp
+++ b/automated-tests/src/dali/utc-Dali-GestureDetector.cpp
@@ -19,7 +19,7 @@
 
 #include <stdlib.h>
 #include <algorithm>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 
 using namespace Dali;

diff --git a/automated-tests/src/dali/utc-Dali-Handle.cpp b/automated-tests/src/dali/utc-Dali-Handle.cpp
index 0839ddd..8587420 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Handle.cpp
+++ b/automated-tests/src/dali/utc-Dali-Handle.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include "dali-test-suite-utils/dali-test-suite-utils.h"
 
 using namespace Dali;

diff --git a/automated-tests/src/dali/utc-Dali-Image.cpp b/automated-tests/src/dali/utc-Dali-Image.cpp
index cf192fd..3e7f150 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Image.cpp
+++ b/automated-tests/src/dali/utc-Dali-Image.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 #include <algorithm>
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 #include <test-native-image.h>
 

diff --git a/automated-tests/src/dali/utc-Dali-ImageActor.cpp b/automated-tests/src/dali/utc-Dali-ImageActor.cpp
index b30c625..ad43e2e 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-ImageActor.cpp
+++ b/automated-tests/src/dali/utc-Dali-ImageActor.cpp
@@ -17,7 +17,7 @@
 
 #include <iostream>
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include "dali-test-suite-utils/dali-test-suite-utils.h"
 
 using namespace Dali;

diff --git a/automated-tests/src/dali/utc-Dali-ImageAttributes.cpp b/automated-tests/src/dali/utc-Dali-ImageAttributes.cpp
index 309fa70..0874419 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-ImageAttributes.cpp
+++ b/automated-tests/src/dali/utc-Dali-ImageAttributes.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 #include <algorithm>
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 
 using std::max;

diff --git a/automated-tests/src/dali/utc-Dali-KeyEvent.cpp b/automated-tests/src/dali/utc-Dali-KeyEvent.cpp
index 66ad021..c73dee8 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-KeyEvent.cpp
+++ b/automated-tests/src/dali/utc-Dali-KeyEvent.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali/integration-api/events/key-event-integ.h>
 
 #include <dali-test-suite-utils.h>

diff --git a/automated-tests/src/dali/utc-Dali-Layer.cpp b/automated-tests/src/dali/utc-Dali-Layer.cpp
index 8e9dc56..f92cef0 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Layer.cpp
+++ b/automated-tests/src/dali/utc-Dali-Layer.cpp
@@ -19,7 +19,7 @@
 
 #include <stdlib.h>
 
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 
 #include <dali-test-suite-utils.h>
 

diff --git a/automated-tests/src/dali/utc-Dali-LongPressGesture.cpp b/automated-tests/src/dali/utc-Dali-LongPressGesture.cpp
index d57d756..b047942 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-LongPressGesture.cpp
+++ b/automated-tests/src/dali/utc-Dali-LongPressGesture.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 
 using namespace Dali;

diff --git a/automated-tests/src/dali/utc-Dali-LongPressGestureDetector.cpp b/automated-tests/src/dali/utc-Dali-LongPressGestureDetector.cpp
index 433082b..56c1146 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-LongPressGestureDetector.cpp
+++ b/automated-tests/src/dali/utc-Dali-LongPressGestureDetector.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali/integration-api/events/touch-event-integ.h>
 #include <dali/integration-api/events/long-press-gesture-event.h>
 #include <dali/integration-api/system-overlay.h>

diff --git a/automated-tests/src/dali/utc-Dali-Material.cpp b/automated-tests/src/dali/utc-Dali-Material.cpp
index 09d1cc2..77c8eac 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Material.cpp
+++ b/automated-tests/src/dali/utc-Dali-Material.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 
 using namespace Dali;

diff --git a/automated-tests/src/dali/utc-Dali-MathUtils.cpp b/automated-tests/src/dali/utc-Dali-MathUtils.cpp
index bf1efa2..84b992f 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-MathUtils.cpp
+++ b/automated-tests/src/dali/utc-Dali-MathUtils.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 
 using namespace Dali;

diff --git a/automated-tests/src/dali/utc-Dali-Matrix.cpp b/automated-tests/src/dali/utc-Dali-Matrix.cpp
index 573e63e..70e1188 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Matrix.cpp
+++ b/automated-tests/src/dali/utc-Dali-Matrix.cpp
@@ -19,7 +19,7 @@
 #include <sstream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 
 using namespace Dali;

diff --git a/automated-tests/src/dali/utc-Dali-Matrix3.cpp b/automated-tests/src/dali/utc-Dali-Matrix3.cpp
index 0209469..c96859d 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Matrix3.cpp
+++ b/automated-tests/src/dali/utc-Dali-Matrix3.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 
 

diff --git a/automated-tests/src/dali/utc-Dali-MeshActor.cpp b/automated-tests/src/dali/utc-Dali-MeshActor.cpp
index b8abe3a..5c5a996 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-MeshActor.cpp
+++ b/automated-tests/src/dali/utc-Dali-MeshActor.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 
 using namespace Dali;

diff --git a/automated-tests/src/dali/utc-Dali-PanGesture.cpp b/automated-tests/src/dali/utc-Dali-PanGesture.cpp
index 919d40f..681da1d 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-PanGesture.cpp
+++ b/automated-tests/src/dali/utc-Dali-PanGesture.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 
 using namespace Dali;

diff --git a/automated-tests/src/dali/utc-Dali-PanGestureDetector.cpp b/automated-tests/src/dali/utc-Dali-PanGestureDetector.cpp
index bf5a1e5..4dd5232 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-PanGestureDetector.cpp
+++ b/automated-tests/src/dali/utc-Dali-PanGestureDetector.cpp
@@ -19,7 +19,7 @@
 
 #include <stdlib.h>
 #include <cmath>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali/integration-api/events/touch-event-integ.h>
 #include <dali/integration-api/events/pan-gesture-event.h>
 #include <dali/integration-api/system-overlay.h>

diff --git a/automated-tests/src/dali/utc-Dali-PinchGesture.cpp b/automated-tests/src/dali/utc-Dali-PinchGesture.cpp
index 43818a4..3ea45c2 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-PinchGesture.cpp
+++ b/automated-tests/src/dali/utc-Dali-PinchGesture.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 
 using namespace Dali;

diff --git a/automated-tests/src/dali/utc-Dali-PinchGestureDetector.cpp b/automated-tests/src/dali/utc-Dali-PinchGestureDetector.cpp
index bd8c58b..33b583c 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-PinchGestureDetector.cpp
+++ b/automated-tests/src/dali/utc-Dali-PinchGestureDetector.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali/integration-api/events/touch-event-integ.h>
 #include <dali/integration-api/events/pinch-gesture-event.h>
 #include <dali/integration-api/system-overlay.h>

diff --git a/automated-tests/src/dali/utc-Dali-Pixel.cpp b/automated-tests/src/dali/utc-Dali-Pixel.cpp
index efdc941..c73d261 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Pixel.cpp
+++ b/automated-tests/src/dali/utc-Dali-Pixel.cpp
@@ -19,7 +19,7 @@
 #include <algorithm>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 
 using std::max;

diff --git a/automated-tests/src/dali/utc-Dali-PropertyNotification.cpp b/automated-tests/src/dali/utc-Dali-PropertyNotification.cpp
index 69de8ce..18d3d70 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-PropertyNotification.cpp
+++ b/automated-tests/src/dali/utc-Dali-PropertyNotification.cpp
@@ -19,7 +19,7 @@
 
 #include <stdlib.h>
 #include <boost/bind.hpp>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 
 using namespace Dali;

diff --git a/automated-tests/src/dali/utc-Dali-Quaternion.cpp b/automated-tests/src/dali/utc-Dali-Quaternion.cpp
index 59c6529..fbd663b 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Quaternion.cpp
+++ b/automated-tests/src/dali/utc-Dali-Quaternion.cpp
@@ -19,7 +19,7 @@
 #include <sstream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 
 using namespace Dali;

diff --git a/automated-tests/src/dali/utc-Dali-Radian.cpp b/automated-tests/src/dali/utc-Dali-Radian.cpp
index 954089a..c463a4c 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Radian.cpp
+++ b/automated-tests/src/dali/utc-Dali-Radian.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 
 using namespace Dali;

diff --git a/automated-tests/src/dali/utc-Dali-Rect.cpp b/automated-tests/src/dali/utc-Dali-Rect.cpp
index dfe0278..33938da 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Rect.cpp
+++ b/automated-tests/src/dali/utc-Dali-Rect.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 
 using namespace Dali;

diff --git a/automated-tests/src/dali/utc-Dali-RenderTask.cpp b/automated-tests/src/dali/utc-Dali-RenderTask.cpp
index 3cb2076..0e2b2ba 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-RenderTask.cpp
+++ b/automated-tests/src/dali/utc-Dali-RenderTask.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 #include <dali/integration-api/debug.h>
 

diff --git a/automated-tests/src/dali/utc-Dali-RenderTaskList.cpp b/automated-tests/src/dali/utc-Dali-RenderTaskList.cpp
index 9349f72..7b78f4b 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-RenderTaskList.cpp
+++ b/automated-tests/src/dali/utc-Dali-RenderTaskList.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 
 using namespace Dali;

diff --git a/automated-tests/src/dali/utc-Dali-RenderableActor.cpp b/automated-tests/src/dali/utc-Dali-RenderableActor.cpp
index e0a7408..0699654 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-RenderableActor.cpp
+++ b/automated-tests/src/dali/utc-Dali-RenderableActor.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 
 #include <dali/integration-api/events/touch-event-integ.h>
 #include <dali-test-suite-utils.h>

diff --git a/automated-tests/src/dali/utc-Dali-ShaderEffect.cpp b/automated-tests/src/dali/utc-Dali-ShaderEffect.cpp
index b069631..43735f3 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-ShaderEffect.cpp
+++ b/automated-tests/src/dali/utc-Dali-ShaderEffect.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 
 using namespace Dali;

diff --git a/automated-tests/src/dali/utc-Dali-SignalTemplatesFunctors.cpp b/automated-tests/src/dali/utc-Dali-SignalTemplatesFunctors.cpp
index 9e1062d..896e34e 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-SignalTemplatesFunctors.cpp
+++ b/automated-tests/src/dali/utc-Dali-SignalTemplatesFunctors.cpp
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 
 // INTERNAL INCLUDES
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 
 using namespace Dali;

diff --git a/automated-tests/src/dali/utc-Dali-SignalTemplatesV2.cpp b/automated-tests/src/dali/utc-Dali-SignalTemplatesV2.cpp
index 6bb79e7..99bdab8 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-SignalTemplatesV2.cpp
+++ b/automated-tests/src/dali/utc-Dali-SignalTemplatesV2.cpp
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 
 // INTERNAL INCLUDES
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 
 using namespace Dali;

diff --git a/automated-tests/src/dali/utc-Dali-Stage.cpp b/automated-tests/src/dali/utc-Dali-Stage.cpp
index f392fa2..1ab4559 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Stage.cpp
+++ b/automated-tests/src/dali/utc-Dali-Stage.cpp
@@ -19,7 +19,7 @@
 
 #include <stdlib.h>
 
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali/integration-api/events/key-event-integ.h>
 #include <dali/integration-api/events/touch-event-integ.h>
 

diff --git a/automated-tests/src/dali/utc-Dali-TapGesture.cpp b/automated-tests/src/dali/utc-Dali-TapGesture.cpp
index 88612b9..8df2557 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-TapGesture.cpp
+++ b/automated-tests/src/dali/utc-Dali-TapGesture.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 
 using namespace Dali;

diff --git a/automated-tests/src/dali/utc-Dali-TapGestureDetector.cpp b/automated-tests/src/dali/utc-Dali-TapGestureDetector.cpp
index 0e85555..fbe9622 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-TapGestureDetector.cpp
+++ b/automated-tests/src/dali/utc-Dali-TapGestureDetector.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali/integration-api/events/touch-event-integ.h>
 #include <dali/integration-api/events/tap-gesture-event.h>
 #include <dali/integration-api/system-overlay.h>

diff --git a/automated-tests/src/dali/utc-Dali-Text.cpp b/automated-tests/src/dali/utc-Dali-Text.cpp
index 58e4b4a..595e5bf 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Text.cpp
+++ b/automated-tests/src/dali/utc-Dali-Text.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 
 using namespace Dali;

diff --git a/automated-tests/src/dali/utc-Dali-TextActor.cpp b/automated-tests/src/dali/utc-Dali-TextActor.cpp
index 4b72eff..012070a 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-TextActor.cpp
+++ b/automated-tests/src/dali/utc-Dali-TextActor.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 #include <stdlib.h>
 
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 
 using namespace Dali;

diff --git a/automated-tests/src/dali/utc-Dali-TextStyle.cpp b/automated-tests/src/dali/utc-Dali-TextStyle.cpp
index 0632339..e1aa8dd 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-TextStyle.cpp
+++ b/automated-tests/src/dali/utc-Dali-TextStyle.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 
 using namespace Dali;

diff --git a/automated-tests/src/dali/utc-Dali-TouchEventCombiner.cpp b/automated-tests/src/dali/utc-Dali-TouchEventCombiner.cpp
index 33ddc98..80eb3da 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-TouchEventCombiner.cpp
+++ b/automated-tests/src/dali/utc-Dali-TouchEventCombiner.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali/integration-api/events/touch-event-combiner.h>
 #include <dali/integration-api/events/touch-event-integ.h>
 #include <dali-test-suite-utils.h>

diff --git a/automated-tests/src/dali/utc-Dali-TouchProcessing.cpp b/automated-tests/src/dali/utc-Dali-TouchProcessing.cpp
index ebdc154..b0c3709 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-TouchProcessing.cpp
+++ b/automated-tests/src/dali/utc-Dali-TouchProcessing.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali/integration-api/events/touch-event-integ.h>
 #include <dali/integration-api/system-overlay.h>
 #include <dali-test-suite-utils.h>

diff --git a/automated-tests/src/dali/utc-Dali-Vector2.cpp b/automated-tests/src/dali/utc-Dali-Vector2.cpp
index a26d133..8375100 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Vector2.cpp
+++ b/automated-tests/src/dali/utc-Dali-Vector2.cpp
@@ -19,7 +19,7 @@
 #include <sstream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 
 using namespace Dali;

diff --git a/automated-tests/src/dali/utc-Dali-Vector3.cpp b/automated-tests/src/dali/utc-Dali-Vector3.cpp
index 7c4cc63..c0c4496 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Vector3.cpp
+++ b/automated-tests/src/dali/utc-Dali-Vector3.cpp
@@ -19,7 +19,7 @@
 #include <sstream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 
 using namespace Dali;

diff --git a/automated-tests/src/dali/utc-Dali-Vector4.cpp b/automated-tests/src/dali/utc-Dali-Vector4.cpp
index 698e635..547645c 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Vector4.cpp
+++ b/automated-tests/src/dali/utc-Dali-Vector4.cpp
@@ -19,7 +19,7 @@
 #include <sstream>
 
 #include <stdlib.h>
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 
 using namespace Dali;

diff --git a/capi/dali/public-api/dali-core-capi-internal.h b/capi/dali/public-api/dali-core-capi-internal.h
index eda53e2..c9edb4a 100644 (file)
--- a/capi/dali/public-api/dali-core-capi-internal.h
+++ b/capi/dali/public-api/dali-core-capi-internal.h
@@ -73,6 +73,7 @@
 #include <dali/public-api/images/frame-buffer-image.h>
 #include <dali/public-api/images/image-attributes.h>
 #include <dali/public-api/images/image.h>
+#include <dali/public-api/images/native-image.h>
 #include <dali/public-api/images/pixel.h>
 #include <dali/public-api/images/glyph-image.h>