X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Fintegration-api%2Fscene.cpp;h=6d69db89ac4a9091de4be422bdb703dc4bae2a13;hb=4c9fb2902c2b74710ca56c2068b13644b8c2bcb6;hp=a5fc5a2d9a04be11a1bcf1348aaa82d4ed6c6252;hpb=18f6fcf69cf3d80dc045c1201b9668e8a1a99227;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/dali/integration-api/scene.cpp b/dali/integration-api/scene.cpp
index a5fc5a2..6d69db8 100644
--- a/dali/integration-api/scene.cpp
+++ b/dali/integration-api/scene.cpp
@@ -19,59 +19,52 @@
 #include <dali/integration-api/scene.h>
 
 // INTERNAL INCLUDES
+#include <dali/internal/event/common/scene-impl.h>
 #include <dali/public-api/actors/layer.h>
 #include <dali/public-api/render-tasks/render-task-list.h>
-#include <dali/internal/event/common/scene-impl.h>
 
 namespace Dali
 {
-
 namespace Integration
 {
-
-Scene Scene::New( Size size )
+Scene Scene::New(Size size)
 {
-  Internal::ScenePtr internal = Internal::Scene::New( size );
-  return Scene( internal.Get() );
+  Internal::ScenePtr internal = Internal::Scene::New(size);
+  return Scene(internal.Get());
 }
 
-Scene Scene::DownCast( BaseHandle handle )
+Scene Scene::New(Size size, int orientation)
 {
-  return Scene( dynamic_cast<Dali::Internal::Scene*>( handle.GetObjectPtr()) );
+  Internal::ScenePtr internal = Internal::Scene::New(size, orientation);
+  return Scene(internal.Get());
 }
 
-Scene::Scene()
+Scene Scene::DownCast(BaseHandle handle)
 {
+  return Scene(dynamic_cast<Dali::Internal::Scene*>(handle.GetObjectPtr()));
 }
 
-Scene::~Scene()
-{
-}
+Scene::Scene() = default;
 
-Scene::Scene( const Scene& handle )
-:BaseHandle(handle)
-{
-}
+Scene::~Scene() = default;
+
+Scene::Scene(const Scene& handle) = default;
 
-Scene::Scene( Internal::Scene* internal )
+Scene::Scene(Internal::Scene* internal)
 : BaseHandle(internal)
 {
 }
 
-Scene& Scene::operator=( const Scene& rhs )
-{
-  BaseHandle::operator=(rhs);
-  return *this;
-}
+Scene& Scene::operator=(const Scene& rhs) = default;
 
-void Scene::Add( Actor actor )
+void Scene::Add(Actor actor)
 {
-  GetImplementation(*this).Add( GetImplementation(actor) );
+  GetImplementation(*this).Add(GetImplementation(actor));
 }
 
-void Scene::Remove( Actor actor )
+void Scene::Remove(Actor actor)
 {
-  GetImplementation(*this).Remove( GetImplementation(actor) );
+  GetImplementation(*this).Remove(GetImplementation(actor));
 }
 
 Size Scene::GetSize() const
@@ -79,9 +72,9 @@ Size Scene::GetSize() const
   return GetImplementation(*this).GetSize();
 }
 
-void Scene::SetDpi( Vector2 dpi )
+void Scene::SetDpi(Vector2 dpi)
 {
-  GetImplementation(*this).SetDpi( dpi );
+  GetImplementation(*this).SetDpi(dpi);
 }
 
 Vector2 Scene::GetDpi() const
@@ -89,9 +82,9 @@ Vector2 Scene::GetDpi() const
   return GetImplementation(*this).GetDpi();
 }
 
-void Scene::SetBackgroundColor( const Vector4& color )
+void Scene::SetBackgroundColor(const Vector4& color)
 {
-  GetImplementation(*this).SetBackgroundColor( color );
+  GetImplementation(*this).SetBackgroundColor(color);
 }
 
 Vector4 Scene::GetBackgroundColor() const
@@ -101,7 +94,7 @@ Vector4 Scene::GetBackgroundColor() const
 
 RenderTaskList Scene::GetRenderTaskList() const
 {
-  return RenderTaskList( &GetImplementation(*this).GetRenderTaskList() );
+  return RenderTaskList(&GetImplementation(*this).GetRenderTaskList());
 }
 
 Layer Scene::GetRootLayer() const
@@ -114,19 +107,19 @@ uint32_t Scene::GetLayerCount() const
   return GetImplementation(*this).GetLayerCount();
 }
 
-Layer Scene::GetLayer( uint32_t depth ) const
+Layer Scene::GetLayer(uint32_t depth) const
 {
-  return GetImplementation(*this).GetLayer( depth );
+  return GetImplementation(*this).GetLayer(depth);
 }
 
-void Scene::SurfaceResized( float width, float height, int orientation, bool forceUpdate )
+void Scene::SurfaceResized(float width, float height)
 {
-  GetImplementation( *this ).SurfaceResized( width, height, orientation, forceUpdate );
+  GetImplementation(*this).SurfaceResized(width, height);
 }
 
 void Scene::SurfaceReplaced()
 {
-  GetImplementation( *this ).SurfaceReplaced();
+  GetImplementation(*this).SurfaceReplaced();
 }
 
 void Scene::Discard()
@@ -134,14 +127,14 @@ void Scene::Discard()
   GetImplementation(*this).Discard();
 }
 
-Integration::Scene Scene::Get( Actor actor )
+Integration::Scene Scene::Get(Actor actor)
 {
-  return Dali::Integration::Scene( &GetImplementation( actor ).GetScene() );
+  return Dali::Integration::Scene(&GetImplementation(actor).GetScene());
 }
 
-void Scene::QueueEvent( const Integration::Event& event )
+void Scene::QueueEvent(const Integration::Event& event)
 {
-  GetImplementation(*this).QueueEvent( event );
+  GetImplementation(*this).QueueEvent(event);
 }
 
 void Scene::ProcessEvents()
@@ -149,24 +142,24 @@ void Scene::ProcessEvents()
   GetImplementation(*this).ProcessEvents();
 }
 
-void Scene::AddFrameRenderedCallback( std::unique_ptr< CallbackBase > callback, int32_t frameId )
+void Scene::AddFrameRenderedCallback(std::unique_ptr<CallbackBase> callback, int32_t frameId)
 {
-  GetImplementation( *this ).AddFrameRenderedCallback( std::move( callback ), frameId );
+  GetImplementation(*this).AddFrameRenderedCallback(std::move(callback), frameId);
 }
 
-void Scene::AddFramePresentedCallback( std::unique_ptr< CallbackBase > callback, int32_t frameId )
+void Scene::AddFramePresentedCallback(std::unique_ptr<CallbackBase> callback, int32_t frameId)
 {
-  GetImplementation( *this ).AddFramePresentedCallback( std::move( callback ), frameId );
+  GetImplementation(*this).AddFramePresentedCallback(std::move(callback), frameId);
 }
 
-void Scene::GetFrameRenderedCallback( FrameCallbackContainer& callbacks )
+void Scene::GetFrameRenderedCallback(FrameCallbackContainer& callbacks)
 {
-  GetImplementation( *this ).GetFrameRenderedCallback( callbacks );
+  GetImplementation(*this).GetFrameRenderedCallback(callbacks);
 }
 
-void Scene::GetFramePresentedCallback( FrameCallbackContainer& callbacks )
+void Scene::GetFramePresentedCallback(FrameCallbackContainer& callbacks)
 {
-  GetImplementation( *this ).GetFramePresentedCallback( callbacks );
+  GetImplementation(*this).GetFramePresentedCallback(callbacks);
 }
 
 Scene::EventProcessingFinishedSignalType& Scene::EventProcessingFinishedSignal()
@@ -184,9 +177,9 @@ Scene::KeyEventGeneratedSignalType& Scene::KeyEventGeneratedSignal()
   return GetImplementation(*this).KeyEventGeneratedSignal();
 }
 
-Scene::TouchSignalType& Scene::TouchSignal()
+Scene::TouchEventSignalType& Scene::TouchedSignal()
 {
-  return GetImplementation(*this).TouchSignal();
+  return GetImplementation(*this).TouchedSignal();
 }
 
 Scene::WheelEventSignalType& Scene::WheelEventSignal()
@@ -194,6 +187,6 @@ Scene::WheelEventSignalType& Scene::WheelEventSignal()
   return GetImplementation(*this).WheelEventSignal();
 }
 
-} // Integration
+} // namespace Integration
 
-} // Dali
+} // namespace Dali