Merge Handle & Constrainable

[platform/core/uifw/dali-core.git] / dali / public-api / dali-core.h

diff --git a/dali/public-api/dali-core.h b/dali/public-api/dali-core.h
index 3fdd352..d321c74 100644 (file)
--- a/dali/public-api/dali-core.h
+++ b/dali/public-api/dali-core.h
@@ -38,21 +38,23 @@
 #include <dali/public-api/animation/active-constraint.h>
 #include <dali/public-api/animation/alpha-functions.h>
 #include <dali/public-api/animation/animation.h>
-#include <dali/public-api/animation/animator-functions.h>
 #include <dali/public-api/animation/constraint-functions.h>
 #include <dali/public-api/animation/constraint-source.h>
 #include <dali/public-api/animation/constraint.h>
 #include <dali/public-api/animation/constraints.h>
 #include <dali/public-api/animation/interpolator-functions.h>
 #include <dali/public-api/animation/key-frames.h>
+#include <dali/public-api/animation/path.h>
 #include <dali/public-api/animation/time-period.h>
 
+#include <dali/public-api/common/compile-time-assert.h>
 #include <dali/public-api/common/constants.h>
 #include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/common/dali-vector.h>
 #include <dali/public-api/common/intrusive-ptr.h>
 #include <dali/public-api/common/light.h>
 #include <dali/public-api/common/loading-state.h>
+#include <dali/public-api/common/mutex.h>
 #include <dali/public-api/common/stage.h>
 #include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/common/view-mode.h>
@@ -89,6 +91,7 @@
 #include <dali/public-api/geometry/mesh-factory.h>
 #include <dali/public-api/geometry/spline.h>
 
+#include <dali/public-api/images/atlas.h>
 #include <dali/public-api/images/bitmap-image.h>
 #include <dali/public-api/images/distance-field.h>
 #include <dali/public-api/images/encoded-buffer-image.h>
@@ -101,7 +104,6 @@
 #include <dali/public-api/images/pixel.h>
 
 #include <dali/public-api/math/angle-axis.h>
-#include <dali/public-api/math/compile-time-assert.h>
 #include <dali/public-api/math/compile-time-math.h>
 #include <dali/public-api/math/degree.h>
 #include <dali/public-api/math/math-utils.h>
@@ -124,12 +126,12 @@
 #include <dali/public-api/object/any.h>
 #include <dali/public-api/object/base-handle.h>
 #include <dali/public-api/object/base-object.h>
-#include <dali/public-api/object/constrainable.h>
 #include <dali/public-api/object/handle.h>
 #include <dali/public-api/object/object-registry.h>
 #include <dali/public-api/object/property-conditions.h>
 #include <dali/public-api/object/property-index.h>
 #include <dali/public-api/object/property-input.h>
+#include <dali/public-api/object/property-map.h>
 #include <dali/public-api/object/property-notification-declarations.h>
 #include <dali/public-api/object/property-notification.h>
 #include <dali/public-api/object/property-types.h>
@@ -148,7 +150,7 @@
 #include <dali/public-api/signals/callback.h>
 #include <dali/public-api/signals/connection-tracker-interface.h>
 #include <dali/public-api/signals/connection-tracker.h>
-#include <dali/public-api/signals/dali-signal-v2.h>
+#include <dali/public-api/signals/dali-signal.h>
 #include <dali/public-api/signals/functor-delegate.h>
 #include <dali/public-api/signals/signal-slot-connections.h>
 #include <dali/public-api/signals/signal-slot-observers.h>