Merge "Remove Actor::OnStage public API" into devel/master

[platform/core/uifw/dali-core.git] / dali / public-api / actors / actor.cpp

diff --git a/dali/public-api/actors/actor.cpp b/dali/public-api/actors/actor.cpp
index 1595881..cf897e9 100644 (file)
--- a/dali/public-api/actors/actor.cpp
+++ b/dali/public-api/actors/actor.cpp
@@ -65,26 +65,6 @@ Actor& Actor::operator=(const Actor& rhs)
   return *this;
 }
 
-uint32_t Actor::GetId() const
-{
-  return GetImplementation(*this).GetId();
-}
-
-bool Actor::IsRoot() const
-{
-  return GetImplementation(*this).IsRoot();
-}
-
-bool Actor::OnStage() const
-{
-  return GetImplementation(*this).OnStage();
-}
-
-bool Actor::IsLayer() const
-{
-  return GetImplementation(*this).IsLayer();
-}
-
 Layer Actor::GetLayer()
 {
   return GetImplementation(*this).GetLayer();
@@ -135,26 +115,6 @@ Actor Actor::GetParent() const
   return Actor(parent);
 }
 
-void Actor::SetSize(float width, float height)
-{
-  GetImplementation(*this).SetSize(width, height);
-}
-
-void Actor::SetSize(float width, float height, float depth)
-{
-  GetImplementation(*this).SetSize(width, height, depth);
-}
-
-void Actor::SetSize(const Vector2& size)
-{
-  GetImplementation(*this).SetSize( size );
-}
-
-void Actor::SetSize(const Vector3& size)
-{
-  GetImplementation(*this).SetSize( size );
-}
-
 Vector3 Actor::GetTargetSize() const
 {
   return GetImplementation(*this).GetTargetSize();
@@ -165,51 +125,11 @@ Vector3 Actor::GetNaturalSize() const
   return GetImplementation(*this).GetNaturalSize();
 }
 
-void Actor::SetPosition(float x, float y)
-{
-  GetImplementation(*this).SetPosition(x, y);
-}
-
-void Actor::SetPosition(float x, float y, float z)
-{
-  GetImplementation(*this).SetPosition(x, y, z);
-}
-
-void Actor::SetPosition(const Vector3& position)
-{
-  GetImplementation(*this).SetPosition(position);
-}
-
-void Actor::SetX(float x)
-{
-  GetImplementation(*this).SetX(x);
-}
-
-void Actor::SetY(float y)
-{
-  GetImplementation(*this).SetY(y);
-}
-
-void Actor::SetZ(float z)
-{
-  GetImplementation(*this).SetZ(z);
-}
-
 void Actor::TranslateBy(const Vector3& distance)
 {
   GetImplementation(*this).TranslateBy(distance);
 }
 
-void Actor::SetOrientation(const Radian& angle, const Vector3& axis)
-{
-  GetImplementation(*this).SetOrientation(angle, axis);
-}
-
-void Actor::SetOrientation(const Quaternion& orientation)
-{
-  GetImplementation(*this).SetOrientation(orientation);
-}
-
 void Actor::RotateBy(const Radian& angle, const Vector3& axis)
 {
   GetImplementation(*this).RotateBy(angle, axis);
@@ -220,71 +140,16 @@ void Actor::RotateBy(const Quaternion& relativeRotation)
   GetImplementation(*this).RotateBy(relativeRotation);
 }
 
-void Actor::SetScale(float scale)
-{
-  GetImplementation(*this).SetScale(scale);
-}
-
-void Actor::SetScale(float scaleX, float scaleY, float scaleZ)
-{
-  GetImplementation(*this).SetScale(scaleX, scaleY, scaleZ);
-}
-
-void Actor::SetScale(const Vector3& scale)
-{
-  GetImplementation(*this).SetScale(scale);
-}
-
 void Actor::ScaleBy(const Vector3& relativeScale)
 {
   GetImplementation(*this).ScaleBy(relativeScale);
 }
 
-void Actor::SetSizeModeFactor(const Vector3& factor)
-{
-  GetImplementation(*this).SetSizeModeFactor(factor);
-}
-
-Vector3 Actor::GetSizeModeFactor() const
-{
-  return GetImplementation(*this).GetSizeModeFactor();
-}
-
-void Actor::SetColorMode( ColorMode colorMode )
-{
-  GetImplementation(*this).SetColorMode(colorMode);
-}
-
-ColorMode Actor::GetColorMode() const
-{
-  return GetImplementation(*this).GetColorMode();
-}
-
-void Actor::SetDrawMode( DrawMode::Type drawMode )
-{
-  GetImplementation(*this).SetDrawMode( drawMode );
-}
-
-DrawMode::Type Actor::GetDrawMode() const
-{
-  return GetImplementation(*this).GetDrawMode();
-}
-
 bool Actor::ScreenToLocal(float& localX, float& localY, float screenX, float screenY) const
 {
   return GetImplementation(*this).ScreenToLocal(localX, localY, screenX, screenY);
 }
 
-void Actor::SetKeyboardFocusable( bool focusable )
-{
-  GetImplementation(*this).SetKeyboardFocusable(focusable);
-}
-
-bool Actor::IsKeyboardFocusable() const
-{
-  return GetImplementation(*this).IsKeyboardFocusable();
-}
-
 void Actor::Raise()
 {
   GetImplementation( *this ).Raise();
@@ -325,16 +190,6 @@ ResizePolicy::Type Actor::GetResizePolicy( Dimension::Type dimension ) const
   return GetImplementation(*this).GetResizePolicy( dimension );
 }
 
-void Actor::SetSizeScalePolicy( SizeScalePolicy::Type policy )
-{
-  GetImplementation(*this).SetSizeScalePolicy( policy );
-}
-
-SizeScalePolicy::Type Actor::GetSizeScalePolicy() const
-{
-  return GetImplementation(*this).GetSizeScalePolicy();
-}
-
 float Actor::GetHeightForWidth( float width )
 {
   return GetImplementation(*this).GetHeightForWidth( width );
@@ -350,35 +205,6 @@ float Actor::GetRelayoutSize( Dimension::Type dimension ) const
   return GetImplementation(*this).GetRelayoutSize( dimension );
 }
 
-void Actor::SetPadding( const Padding& padding )
-{
-  Internal::Actor& impl = GetImplementation(*this);
-
-  Vector2 widthPadding( padding.left, padding.right );
-  impl.SetPadding( widthPadding, Dimension::WIDTH );
-
-  Vector2 heightPadding( padding.bottom, padding.top );
-  impl.SetPadding( heightPadding, Dimension::HEIGHT );
-}
-
-void Actor::GetPadding( Padding& paddingOut ) const
-{
-  const Internal::Actor& impl = GetImplementation(*this);
-
-  Vector2 widthPadding = impl.GetPadding( Dimension::WIDTH );
-  Vector2 heightPadding = impl.GetPadding( Dimension::HEIGHT );
-
-  paddingOut.left = widthPadding.x;
-  paddingOut.right = widthPadding.y;
-  paddingOut.bottom = heightPadding.x;
-  paddingOut.top = heightPadding.y;
-}
-
-int32_t Actor::GetHierarchyDepth()
-{
-  return GetImplementation(*this).GetHierarchyDepth();
-}
-
 Actor::TouchSignalType& Actor::TouchedSignal()
 {
   DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: TouchedSignal() is deprecated and will be removed from next release. Use TouchSignal() instead.\n" );