From 4b38b709efae6ba534f7d336b70dabb74c804e03 Mon Sep 17 00:00:00 2001 From: Adeel Kazmi Date: Tue, 24 Feb 2015 14:05:38 +0000 Subject: [PATCH] Updates after Handle/Constrainable merge Change-Id: Ia13e9eaa9644af5295ed3c05737019d8bc9f23b7 --- dali-toolkit/internal/controls/alignment/alignment-impl.cpp | 1 + dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp | 2 ++ .../controls/buttons/check-box-button-default-painter-impl.cpp | 2 ++ .../internal/controls/buttons/push-button-default-painter-impl.cpp | 2 ++ dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp | 2 ++ .../controls/gaussian-blur-view/gaussian-blur-view-impl.cpp | 2 ++ .../internal/controls/image-view/masked-image-view-impl.cpp | 2 ++ dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp | 2 ++ dali-toolkit/internal/controls/navigation-frame/navigation-bar.h | 1 + .../internal/controls/page-turn-view/page-turn-view-impl.cpp | 2 ++ dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp | 1 + dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h | 3 ++- .../controls/scroll-component/scroll-bar-internal-impl.cpp | 3 +++ .../internal/controls/scrollable/bouncing-effect-actor.cpp | 6 +++--- .../internal/controls/scrollable/item-view/item-view-impl.cpp | 2 ++ .../internal/controls/scrollable/item-view/item-view-impl.h | 2 +- .../internal/controls/scrollable/scroll-connector-impl.cpp | 2 +- dali-toolkit/internal/controls/scrollable/scroll-connector-impl.h | 4 ++-- .../internal/controls/scrollable/scroll-view/scroll-base-impl.h | 2 ++ .../scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp | 3 +++ .../scrollable/scroll-view/scroll-view-cube-effect-impl.cpp | 3 +++ .../scrollable/scroll-view/scroll-view-depth-effect-impl.cpp | 5 +++++ .../scroll-view/scroll-view-page-carousel-effect-impl.cpp | 3 +++ .../scrollable/scroll-view/scroll-view-page-cube-effect-impl.cpp | 3 +++ dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp | 2 ++ .../internal/controls/super-blur-view/super-blur-view-impl.cpp | 2 ++ dali-toolkit/internal/filters/blur-two-pass-filter.cpp | 2 +- dali-toolkit/internal/filters/blur-two-pass-filter.h | 6 +++--- dali-toolkit/internal/shader-effects/page-turn-effect-impl.cpp | 2 ++ dali-toolkit/internal/shader-effects/page-turn-effect-impl.h | 4 ++++ dali-toolkit/public-api/controls/cluster/cluster.h | 4 ++++ dali-toolkit/public-api/controls/control-impl.cpp | 3 +++ .../public-api/controls/navigation-frame/navigation-control.h | 1 + .../public-api/controls/scrollable/item-view/depth-layout.h | 1 - .../public-api/controls/scrollable/item-view/item-layout.cpp | 3 ++- .../public-api/controls/scrollable/item-view/item-layout.h | 3 ++- dali-toolkit/public-api/controls/scrollable/scroll-connector.cpp | 2 +- dali-toolkit/public-api/controls/scrollable/scroll-connector.h | 4 ++-- .../public-api/controls/scrollable/scroll-view/scroll-view.h | 3 +++ dali-toolkit/public-api/shader-effects/motion-blur-effect.cpp | 2 ++ dali-toolkit/public-api/shader-effects/motion-stretch-effect.cpp | 2 ++ dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.cpp | 3 +++ dali-toolkit/public-api/shader-effects/soft-button-effect.cpp | 7 +++++++ 43 files changed, 98 insertions(+), 18 deletions(-) diff --git a/dali-toolkit/internal/controls/alignment/alignment-impl.cpp b/dali-toolkit/internal/controls/alignment/alignment-impl.cpp index 0f409f6..17dfff6 100644 --- a/dali-toolkit/internal/controls/alignment/alignment-impl.cpp +++ b/dali-toolkit/internal/controls/alignment/alignment-impl.cpp @@ -19,6 +19,7 @@ #include "alignment-impl.h" // EXTERNAL INCLUDES +#include #include // INTERNAL INCLUDES diff --git a/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp b/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp index cf24627..dfbebc4 100644 --- a/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp +++ b/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp @@ -21,6 +21,8 @@ // EXTERNAL INCLUDES #include #include +#include +#include #include #include #include diff --git a/dali-toolkit/internal/controls/buttons/check-box-button-default-painter-impl.cpp b/dali-toolkit/internal/controls/buttons/check-box-button-default-painter-impl.cpp index 40ee650..f0d5497 100644 --- a/dali-toolkit/internal/controls/buttons/check-box-button-default-painter-impl.cpp +++ b/dali-toolkit/internal/controls/buttons/check-box-button-default-painter-impl.cpp @@ -20,6 +20,8 @@ // EXTERNAL INCLUDES #include +#include +#include #include #include diff --git a/dali-toolkit/internal/controls/buttons/push-button-default-painter-impl.cpp b/dali-toolkit/internal/controls/buttons/push-button-default-painter-impl.cpp index 5a60a1d..31176f4 100644 --- a/dali-toolkit/internal/controls/buttons/push-button-default-painter-impl.cpp +++ b/dali-toolkit/internal/controls/buttons/push-button-default-painter-impl.cpp @@ -21,6 +21,8 @@ // EXTERNAL INCLUDES #include #include +#include +#include #include #include diff --git a/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp b/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp index d140750..fcd9939 100644 --- a/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp +++ b/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp @@ -19,6 +19,8 @@ #include "effects-view-impl.h" // EXTERNAL INCLUDES +#include +#include #include #include #include diff --git a/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp b/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp index 430148a..ef1c7dd 100644 --- a/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp +++ b/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp @@ -21,6 +21,8 @@ // EXTERNAL INCLUDES #include #include +#include +#include #include #include #include diff --git a/dali-toolkit/internal/controls/image-view/masked-image-view-impl.cpp b/dali-toolkit/internal/controls/image-view/masked-image-view-impl.cpp index fad0ade..95ccf59 100644 --- a/dali-toolkit/internal/controls/image-view/masked-image-view-impl.cpp +++ b/dali-toolkit/internal/controls/image-view/masked-image-view-impl.cpp @@ -20,6 +20,8 @@ // EXTERNAL INCLUDES #include +#include +#include #include #include #include diff --git a/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp b/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp index 8df457f..24f8e4b 100644 --- a/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp +++ b/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp @@ -19,6 +19,8 @@ #include // EXTERNAL INCLUDES +#include +#include #include #include #include diff --git a/dali-toolkit/internal/controls/navigation-frame/navigation-bar.h b/dali-toolkit/internal/controls/navigation-frame/navigation-bar.h index bf26399..ae6c948 100644 --- a/dali-toolkit/internal/controls/navigation-frame/navigation-bar.h +++ b/dali-toolkit/internal/controls/navigation-frame/navigation-bar.h @@ -22,6 +22,7 @@ #include // INTERNAL INCLUDES +#include #include #include #include diff --git a/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp b/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp index 392f733..e08a223 100644 --- a/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp +++ b/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp @@ -20,6 +20,8 @@ // EXTERNAL INCLUDES #include +#include +#include #include #include #include diff --git a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp index 8c8923a..55a86e2 100755 --- a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp +++ b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp @@ -19,6 +19,7 @@ #include // EXTERNAL INCLUDES +#include #include #include #include diff --git a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h index 1d717c2..6979c52 100755 --- a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h +++ b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h @@ -21,6 +21,7 @@ // EXTERNAL INCLUDES #include #include +#include #include #include @@ -239,7 +240,7 @@ private: private: - Constrainable mScrollPositionObject; ///< From mScrollConnector + Handle mScrollPositionObject; ///< From mScrollConnector ImageActor mIndicator; ///< Image of scroll indicator. Animation mAnimation; ///< Scroll indicator Show/Hide Animation. diff --git a/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.cpp b/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.cpp index bc12931..9af5f0b 100755 --- a/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.cpp +++ b/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.cpp @@ -19,6 +19,9 @@ #include // EXTERNAL INCLUDES +#include +#include +#include #include #include diff --git a/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp b/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp index 4e3bb67..a4f1ffb 100644 --- a/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp +++ b/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp @@ -19,14 +19,14 @@ #include // EXTERNAL INCLUDES +#include #include -#include +#include #include +#include #include #include -#include - namespace Dali { diff --git a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp index 3fbf1d4..cee9c8c 100644 --- a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp +++ b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp @@ -20,6 +20,8 @@ // EXTERNAL INCLUDES #include +#include +#include #include #include #include diff --git a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h index 51bb3ae..991f538 100644 --- a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h +++ b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h @@ -588,7 +588,7 @@ private: Actor mOvershootOverlay; ///< The overlay actor for overshoot effect Dali::Toolkit::ScrollConnector mScrollConnector; ///< Connects ItemView with scrollable components e.g. scroll bars - Constrainable mScrollPositionObject; ///< From mScrollConnector + Handle mScrollPositionObject; ///< From mScrollConnector bool mAddingItems; diff --git a/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.cpp index cf0d74e..76930e0 100644 --- a/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.cpp +++ b/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.cpp @@ -99,7 +99,7 @@ ScrollConnector::ScrollConnector() mMaxLimit( 0.0f ), mContentLength( 0.0f ) { - mScrollPositionObject = Constrainable::New(); + mScrollPositionObject = Handle::New(); mScrollPositionObject.RegisterProperty( Toolkit::ScrollConnector::SCROLL_POSITION_PROPERTY_NAME, 0.0f ); mScrollPositionObject.RegisterProperty( Toolkit::ScrollConnector::OVERSHOOT_PROPERTY_NAME, 0.0f ); diff --git a/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.h b/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.h index 8cd176f..ff91e1b 100644 --- a/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.h +++ b/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.h @@ -115,7 +115,7 @@ public: * Retrieve the object which provides the "scroll-position" property. * @return The scroll-position object. */ - Constrainable GetScrollPositionObject() const + Handle GetScrollPositionObject() const { return mScrollPositionObject; } @@ -151,7 +151,7 @@ private: private: - Constrainable mScrollPositionObject; + Handle mScrollPositionObject; DomainChangedSignalType mDomainChangedSignal; ScrollPositionChangedSignalType mScrollPositionChangedSignal; diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.h b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.h index fa9693e..2413386 100644 --- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.h +++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.h @@ -21,6 +21,8 @@ // EXTERNAL INCLUDES // TODO - Replace list with dali-vector.h #include +#include +#include // INTERNAL INCLUDES diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp index f396645..41276be 100644 --- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp +++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp @@ -17,6 +17,9 @@ // EXTERNAL INCLUDES #include +#include +#include +#include // INTERNAL INCLUDES #include diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.cpp index bda70a46..747eafb 100644 --- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.cpp +++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.cpp @@ -17,6 +17,9 @@ // EXTERNAL INCLUDES #include +#include +#include +#include // INTERNAL INCLUDES #include diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.cpp index f058f16..05c2cd5 100644 --- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.cpp +++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.cpp @@ -15,6 +15,11 @@ * */ +// EXTERNAL INCLUDES +#include +#include +#include + // INTERNAL INCLUDES #include #include diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-carousel-effect-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-carousel-effect-impl.cpp index 93d41df..00cd646 100644 --- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-carousel-effect-impl.cpp +++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-carousel-effect-impl.cpp @@ -20,6 +20,9 @@ // EXTERNAL INCLUDES #include +#include +#include +#include // INTERNAL INCLUDES #include diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-cube-effect-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-cube-effect-impl.cpp index 24a0a92..e47a3a3 100644 --- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-cube-effect-impl.cpp +++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-cube-effect-impl.cpp @@ -20,6 +20,9 @@ // EXTERNAL INCLUDES #include +#include +#include +#include // INTERNAL INCLUDES #include diff --git a/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp b/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp index d47d9bf..3c762ca 100644 --- a/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp +++ b/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp @@ -21,6 +21,8 @@ // EXTERNAL INCLUDES #include #include +#include +#include #include #include #include diff --git a/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp b/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp index d189ed6..37bfef4 100644 --- a/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp +++ b/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp @@ -20,6 +20,8 @@ // EXTERNAL INCLUDES #include +#include +#include #include #include #include diff --git a/dali-toolkit/internal/filters/blur-two-pass-filter.cpp b/dali-toolkit/internal/filters/blur-two-pass-filter.cpp index 5dd5437..a9b3c9e 100644 --- a/dali-toolkit/internal/filters/blur-two-pass-filter.cpp +++ b/dali-toolkit/internal/filters/blur-two-pass-filter.cpp @@ -288,7 +288,7 @@ void BlurTwoPassFilter::SetSize( const Vector2& size ) } } -Constrainable BlurTwoPassFilter::GetHandleForAnimateBlurStrength() +Handle BlurTwoPassFilter::GetHandleForAnimateBlurStrength() { return mShaderForBlending; } diff --git a/dali-toolkit/internal/filters/blur-two-pass-filter.h b/dali-toolkit/internal/filters/blur-two-pass-filter.h index 9b29dde..1e723b9 100644 --- a/dali-toolkit/internal/filters/blur-two-pass-filter.h +++ b/dali-toolkit/internal/filters/blur-two-pass-filter.h @@ -73,10 +73,10 @@ public: // From ImageFilter Property::Index GetBlurStrengthPropertyIndex() const {return mBlurStrengthPropertyIndex;} /** - * Retrieve the constrainable object to animate or constrain the blur strength property - * @return the constrainable object which blend the output image according to the blur strength + * Retrieve the handle to the object in order to animate or constrain the blur strength property + * @return The hadnle to the object which blends the output image according to the blur strength */ - Constrainable GetHandleForAnimateBlurStrength(); + Handle GetHandleForAnimateBlurStrength(); private: /** diff --git a/dali-toolkit/internal/shader-effects/page-turn-effect-impl.cpp b/dali-toolkit/internal/shader-effects/page-turn-effect-impl.cpp index d3d5ecf..ead7e40 100644 --- a/dali-toolkit/internal/shader-effects/page-turn-effect-impl.cpp +++ b/dali-toolkit/internal/shader-effects/page-turn-effect-impl.cpp @@ -20,6 +20,8 @@ // EXTERNAL HEADERS #include +#include +#include #include namespace Dali diff --git a/dali-toolkit/internal/shader-effects/page-turn-effect-impl.h b/dali-toolkit/internal/shader-effects/page-turn-effect-impl.h index 841d200..1e49e33 100644 --- a/dali-toolkit/internal/shader-effects/page-turn-effect-impl.h +++ b/dali-toolkit/internal/shader-effects/page-turn-effect-impl.h @@ -17,6 +17,10 @@ * limitations under the License. * */ + +// EXTERNAL INCLUDES +#include + // INTERNAL INCLUDES #include diff --git a/dali-toolkit/public-api/controls/cluster/cluster.h b/dali-toolkit/public-api/controls/cluster/cluster.h index f8c845a..aff0afb 100644 --- a/dali-toolkit/public-api/controls/cluster/cluster.h +++ b/dali-toolkit/public-api/controls/cluster/cluster.h @@ -18,6 +18,10 @@ * */ +// EXTERNAL INCLUDES +#include +#include + // INTERNAL INCLUDES #include diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp index f686766..1697c9b 100644 --- a/dali-toolkit/public-api/controls/control-impl.cpp +++ b/dali-toolkit/public-api/controls/control-impl.cpp @@ -22,12 +22,15 @@ #include #include #include +#include +#include #include #include #include #include #include +// INTERNAL INCLUDES #include #include #include diff --git a/dali-toolkit/public-api/controls/navigation-frame/navigation-control.h b/dali-toolkit/public-api/controls/navigation-frame/navigation-control.h index ffc7a44..87924f5 100644 --- a/dali-toolkit/public-api/controls/navigation-frame/navigation-control.h +++ b/dali-toolkit/public-api/controls/navigation-frame/navigation-control.h @@ -19,6 +19,7 @@ */ // INTERNAL INCLUDES +#include #include #include #include diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/depth-layout.h b/dali-toolkit/public-api/controls/scrollable/item-view/depth-layout.h index c4e3683..f9b12af 100644 --- a/dali-toolkit/public-api/controls/scrollable/item-view/depth-layout.h +++ b/dali-toolkit/public-api/controls/scrollable/item-view/depth-layout.h @@ -19,7 +19,6 @@ */ // INTERNAL INCLUDES - #include namespace Dali diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp b/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp index d55ed9c..7922ae0 100644 --- a/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp +++ b/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp @@ -19,6 +19,7 @@ #include // EXTERNAL INCLUDES +#include #include #include @@ -329,7 +330,7 @@ float ItemLayout::GetFlickSpeedFactor() const return GetScrollSpeedFactor(); } -void ItemLayout::ApplyConstraints( Actor& actor, const int itemId, const float durationSeconds, Constrainable scrollPositionObject, const Actor& itemViewActor ) +void ItemLayout::ApplyConstraints( Actor& actor, const int itemId, const float durationSeconds, Handle scrollPositionObject, const Actor& itemViewActor ) { // This just implements the default behaviour of constraint application. // Custom layouts can override this function to apply their custom constraints. diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h b/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h index fdea8ec..cf328f2 100644 --- a/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h +++ b/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h @@ -19,6 +19,7 @@ */ // EXTERNAL INCLUDES +#include #include // INTERNAL INCLUDES @@ -407,7 +408,7 @@ public: * @param[in] scrollPositionObject The object which provides the layout position property. * @param[in] itemViewActor The item view instance which requests the application of constraints. */ - DALI_IMPORT_API virtual void ApplyConstraints( Actor& actor, const int itemId, const float durationSeconds, Constrainable scrollPositionObject, const Actor& itemViewActor ); + DALI_IMPORT_API virtual void ApplyConstraints( Actor& actor, const int itemId, const float durationSeconds, Handle scrollPositionObject, const Actor& itemViewActor ); /** * @brief Gets the position of a given item diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-connector.cpp b/dali-toolkit/public-api/controls/scrollable/scroll-connector.cpp index 8650774..a8dac9e 100644 --- a/dali-toolkit/public-api/controls/scrollable/scroll-connector.cpp +++ b/dali-toolkit/public-api/controls/scrollable/scroll-connector.cpp @@ -75,7 +75,7 @@ float ScrollConnector::GetContentLength() const return GetImpl(*this).GetContentLength(); } -Constrainable ScrollConnector::GetScrollPositionObject() const +Handle ScrollConnector::GetScrollPositionObject() const { return GetImpl(*this).GetScrollPositionObject(); } diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-connector.h b/dali-toolkit/public-api/controls/scrollable/scroll-connector.h index 8cd78b7..986f12f 100644 --- a/dali-toolkit/public-api/controls/scrollable/scroll-connector.h +++ b/dali-toolkit/public-api/controls/scrollable/scroll-connector.h @@ -19,7 +19,7 @@ */ // EXTERNAL INCLUDES -#include +#include namespace Dali { @@ -161,7 +161,7 @@ public: * @brief Retrieve the object which provides the "scroll-position" property. * @return The scroll-position object. */ - Constrainable GetScrollPositionObject() const; + Handle GetScrollPositionObject() const; public: // Not intended for application developers diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h index 1dcfb85..8287d53 100644 --- a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h +++ b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h @@ -18,6 +18,9 @@ * */ +// EXTERNAL INCLUDES +#include + // INTERNAL INCLUDES #include diff --git a/dali-toolkit/public-api/shader-effects/motion-blur-effect.cpp b/dali-toolkit/public-api/shader-effects/motion-blur-effect.cpp index 1b77466..034b6b2 100644 --- a/dali-toolkit/public-api/shader-effects/motion-blur-effect.cpp +++ b/dali-toolkit/public-api/shader-effects/motion-blur-effect.cpp @@ -19,6 +19,8 @@ #include // EXTERNAL INCLUDES +#include +#include #include namespace Dali diff --git a/dali-toolkit/public-api/shader-effects/motion-stretch-effect.cpp b/dali-toolkit/public-api/shader-effects/motion-stretch-effect.cpp index 48dff1d..eecf1d0 100644 --- a/dali-toolkit/public-api/shader-effects/motion-stretch-effect.cpp +++ b/dali-toolkit/public-api/shader-effects/motion-stretch-effect.cpp @@ -19,6 +19,8 @@ #include // EXTERNAL INCLUDES +#include +#include #include namespace Dali diff --git a/dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.cpp b/dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.cpp index c18d9e7..334e609 100644 --- a/dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.cpp +++ b/dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.cpp @@ -19,6 +19,9 @@ #include // EXTERNAL INCLUDES +#include +#include +#include #include #include diff --git a/dali-toolkit/public-api/shader-effects/soft-button-effect.cpp b/dali-toolkit/public-api/shader-effects/soft-button-effect.cpp index 92015b9..0ea73e7 100644 --- a/dali-toolkit/public-api/shader-effects/soft-button-effect.cpp +++ b/dali-toolkit/public-api/shader-effects/soft-button-effect.cpp @@ -15,7 +15,14 @@ * */ +// EXTERNAL INCLUDES +#include +#include +#include + +// INTERNAL INCLUDES #include + namespace Dali { -- 2.7.4