From 653beaaac0b661428036675d3e3bb1adbb8b5b1c Mon Sep 17 00:00:00 2001 From: Muhammad Umar Date: Thu, 14 Jun 2018 19:50:36 +0100 Subject: [PATCH] Exporting one constructor used by csharpbinder and making an API private. Change-Id: I041537afa224654dc45db335b57778ecba074e8c --- dali-toolkit/devel-api/layouting/layout-item-impl.h | 20 ++++++++++---------- dali-toolkit/devel-api/layouting/layout-item.h | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dali-toolkit/devel-api/layouting/layout-item-impl.h b/dali-toolkit/devel-api/layouting/layout-item-impl.h index e59ca96..c44d251 100644 --- a/dali-toolkit/devel-api/layouting/layout-item-impl.h +++ b/dali-toolkit/devel-api/layouting/layout-item-impl.h @@ -113,16 +113,6 @@ public: bool IsLayoutAnimated() const; /** - * @brief Register child properties of layout with owner type. - * - * The Actor hierarchy uses these registered properties in the type - * system to ensure child custom properties are properly initialized. - * - * @param[in] containerType The type of the containing view (owner) - */ - void RegisterChildProperties( const std::string& containerType ); - - /** * @brief This is called to find out how big a layout should be. * * The parent supplies constraint information in the width and height parameters. @@ -440,6 +430,16 @@ private: */ void OnLayoutAnimationFinished( Animation& animation ); + /** + * @brief Register child properties of layout with owner type. + * + * The Actor hierarchy uses these registered properties in the type + * system to ensure child custom properties are properly initialized. + * + * @param[in] containerType The type of the containing view (owner) + */ + void RegisterChildProperties( const std::string& containerType ); + public: class Impl; // Class declaration is public so we can add devel API's in the future diff --git a/dali-toolkit/devel-api/layouting/layout-item.h b/dali-toolkit/devel-api/layouting/layout-item.h index 3bb96bb..6722f22 100644 --- a/dali-toolkit/devel-api/layouting/layout-item.h +++ b/dali-toolkit/devel-api/layouting/layout-item.h @@ -121,7 +121,7 @@ public: * * @param[in] actor A pointer to a newly allocated Dali resource */ - explicit DALI_INTERNAL LayoutItem( Internal::LayoutItem* LayoutItem ); + explicit LayoutItem( Internal::LayoutItem* LayoutItem ); /// @endcond }; -- 2.7.4