[3.0] Remove experimental features

Change-Id: I899b20951d6efdd3b1f955db88d490df82aa053a
Signed-off-by: Adeel Kazmi <adeel.kazmi@samsung.com>

diff --git a/adaptors/common/object-profiler.cpp b/adaptors/common/object-profiler.cpp
index 2a1e71a..7d86bf0 100644 (file)
--- a/adaptors/common/object-profiler.cpp
+++ b/adaptors/common/object-profiler.cpp
@@ -22,7 +22,6 @@
 #include <stdlib.h>
 #include <dali/integration-api/debug.h>
 #include <dali/integration-api/profiling.h>
-#include <dali/public-api/actors/image-actor.h>
 #include <dali/public-api/common/stage.h>
 #include <dali/public-api/object/ref-object.h>
 #include <dali/public-api/object/base-object.h>

diff --git a/adaptors/ecore/common/ecore-indicator-impl.cpp b/adaptors/ecore/common/ecore-indicator-impl.cpp
index b954b69..7d4bb4b 100644 (file)
--- a/adaptors/ecore/common/ecore-indicator-impl.cpp
+++ b/adaptors/ecore/common/ecore-indicator-impl.cpp
@@ -37,8 +37,6 @@
 #include <dali/public-api/events/touch-event.h>
 #include <dali/public-api/events/touch-point.h>
 #include <dali/public-api/common/stage.h>
-#include <dali/public-api/actors/blending.h>
-#include <dali/public-api/shader-effects/shader-effect.h>
 #include <dali/public-api/images/buffer-image.h>
 
 #include <dali/integration-api/debug.h>

diff --git a/adaptors/ecore/common/ecore-indicator-impl.h b/adaptors/ecore/common/ecore-indicator-impl.h
index 53e93d1..47a2ac5 100644 (file)
--- a/adaptors/ecore/common/ecore-indicator-impl.h
+++ b/adaptors/ecore/common/ecore-indicator-impl.h
@@ -19,7 +19,6 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/public-api/actors/image-actor.h>
 #include <dali/public-api/animation/animation.h>
 #include <dali/public-api/events/pan-gesture.h>
 #include <dali/public-api/events/pan-gesture-detector.h>

diff --git a/adaptors/emscripten/wrappers/dali-wrapper.cpp b/adaptors/emscripten/wrappers/dali-wrapper.cpp
index e7bc777..9df479b 100644 (file)
--- a/adaptors/emscripten/wrappers/dali-wrapper.cpp
+++ b/adaptors/emscripten/wrappers/dali-wrapper.cpp
@@ -882,11 +882,6 @@ EMSCRIPTEN_BINDINGS(dali_wrapper)
     .value("TRIANGLE_STRIP",  Dali::Geometry::TRIANGLE_STRIP)
 ;
 
-  enum_<Dali::Image::ReleasePolicy>("ReleasePolicy")
-    .value("UNUSED",          Dali::Image::UNUSED)
-    .value("NEVER",           Dali::Image::NEVER)
-;
-
   enum_<Dali::Pixel::Format>("PixelFormat")
     .value("A8", Dali::Pixel::Format::A8)
     .value("L8", Dali::Pixel::Format::L8)

diff --git a/adaptors/emscripten/wrappers/shader-effect-wrapper.h b/adaptors/emscripten/wrappers/shader-effect-wrapper.h
index b2b3d0d..51f7cf8 100644 (file)
--- a/adaptors/emscripten/wrappers/shader-effect-wrapper.h
+++ b/adaptors/emscripten/wrappers/shader-effect-wrapper.h
@@ -2,7 +2,7 @@
 #define __DALI_SHADER_EFFECT_WRAPPER_H__
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/dali-core.h>
+#include <dali/devel-api/shader-effects/shader-effect.h>
 #include "emscripten/emscripten.h"
 #include "emscripten/bind.h"