[dali_1.0.46] Merge branch '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 1b31452..1f413fb 100644 (file)
--- a/dali/public-api/actors/actor.cpp
+++ b/dali/public-api/actors/actor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2015 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.
@@ -22,7 +22,6 @@
 #include <dali/public-api/actors/layer.h>
 #include <dali/public-api/animation/constraint.h>
 #include <dali/public-api/common/dali-common.h>
-#include <dali/public-api/math/degree.h>
 #include <dali/public-api/math/radian.h>
 #include <dali/public-api/math/vector2.h>
 
@@ -260,11 +259,6 @@ PositionInheritanceMode Actor::GetPositionInheritanceMode() const
   return GetImplementation(*this).GetPositionInheritanceMode();
 }
 
-void Actor::SetOrientation(const Degree& angle, const Vector3& axis)
-{
-  GetImplementation(*this).SetOrientation(Radian(angle), axis);
-}
-
 void Actor::SetOrientation(const Radian& angle, const Vector3& axis)
 {
   GetImplementation(*this).SetOrientation(angle, axis);
@@ -275,11 +269,6 @@ void Actor::SetOrientation(const Quaternion& orientation)
   GetImplementation(*this).SetOrientation(orientation);
 }
 
-void Actor::RotateBy(const Degree& angle, const Vector3& axis)
-{
-  GetImplementation(*this).RotateBy(Radian(angle), axis);
-}
-
 void Actor::RotateBy(const Radian& angle, const Vector3& axis)
 {
   GetImplementation(*this).RotateBy(angle, axis);
@@ -455,16 +444,6 @@ bool Actor::IsKeyboardFocusable() const
   return GetImplementation(*this).IsKeyboardFocusable();
 }
 
-void Actor::SetRelayoutEnabled( bool enabled )
-{
-  GetImplementation(*this).SetRelayoutEnabled( enabled );
-}
-
-bool Actor::IsRelayoutEnabled() const
-{
-  return GetImplementation(*this).IsRelayoutEnabled();
-}
-
 void Actor::SetResizePolicy( ResizePolicy::Type policy, Dimension::Type dimension )
 {
   GetImplementation(*this).SetResizePolicy( policy, dimension );
@@ -500,16 +479,6 @@ float Actor::GetRelayoutSize( Dimension::Type dimension ) const
   return GetImplementation(*this).GetRelayoutSize( dimension );
 }
 
-void Actor::RelayoutRequestTree()
-{
-  GetImplementation(*this).RelayoutRequestTree();
-}
-
-void Actor::PropagateRelayoutFlags()
-{
-  GetImplementation(*this).PropagateRelayoutFlags();
-}
-
 void Actor::SetPadding( const Padding& padding )
 {
   Internal::Actor& impl = GetImplementation(*this);
@@ -574,9 +543,9 @@ Actor::HoverSignalType& Actor::HoveredSignal()
   return GetImplementation(*this).HoveredSignal();
 }
 
-Actor::MouseWheelEventSignalType& Actor::MouseWheelEventSignal()
+Actor::WheelEventSignalType& Actor::WheelEventSignal()
 {
-  return GetImplementation(*this).MouseWheelEventSignal();
+  return GetImplementation(*this).WheelEventSignal();
 }
 
 Actor::OnStageSignalType& Actor::OnStageSignal()
@@ -599,13 +568,4 @@ Actor::Actor(Internal::Actor* internal)
 {
 }
 
-void UnparentAndReset( Actor& actor )
-{
-  if( actor )
-  {
-    actor.Unparent();
-    actor.Reset();
-  }
-}
-
 } // namespace Dali