Merge "Clean up the code to build successfully on macOS" into devel/master

[platform/core/uifw/dali-core.git] / dali / devel-api / common / stage.cpp

diff --git a/dali/devel-api/common/stage.cpp b/dali/devel-api/common/stage.cpp
index b07b63f..1729b5a 100644 (file)
--- a/dali/devel-api/common/stage.cpp
+++ b/dali/devel-api/common/stage.cpp
@@ -19,39 +19,24 @@
 #include <dali/devel-api/common/stage.h>
 
 // INTERNAL INCLUDES
-#include <dali/public-api/actors/actor.h>
-#include <dali/public-api/render-tasks/render-task-list.h>
-#include <dali/internal/event/common/stage-impl.h>
 #include <dali/internal/common/core-impl.h>
+#include <dali/internal/event/common/stage-impl.h>
+#include <dali/public-api/actors/actor.h>
 #include <dali/public-api/actors/layer.h>
 #include <dali/public-api/object/object-registry.h>
+#include <dali/public-api/render-tasks/render-task-list.h>
 
 namespace Dali
 {
-
 using Internal::Core;
 
-const Vector4 Stage::DEFAULT_BACKGROUND_COLOR(0.0f, 0.0f, 0.0f, 1.0f);
-const Vector4 Stage::DEBUG_BACKGROUND_COLOR(0.2f, 0.5f, 0.2f, 1.0f);
-
-Stage::Stage()
-{
-}
+Stage::Stage() = default;
 
-Stage::~Stage()
-{
-}
+Stage::~Stage() = default;
 
-Stage::Stage(const Stage& handle)
-: BaseHandle(handle)
-{
-}
+Stage::Stage(const Stage& handle) = default;
 
-Stage& Stage::operator=(const Stage& rhs)
-{
-  BaseHandle::operator=(rhs);
-  return *this;
-}
+Stage& Stage::operator=(const Stage& rhs) = default;
 
 Stage::Stage(Internal::Stage* internal)
 : BaseHandle(internal)
@@ -61,8 +46,8 @@ Stage::Stage(Internal::Stage* internal)
 Stage Stage::GetCurrent()
 {
   Internal::Stage* stage = Internal::Stage::GetCurrent();
-  DALI_ASSERT_ALWAYS( stage && "Stage doesn't exist" );
-  return Stage( stage );
+  DALI_ASSERT_ALWAYS(stage && "Stage doesn't exist");
+  return Stage(stage);
 }
 
 bool Stage::IsInstalled()
@@ -82,7 +67,7 @@ void Stage::Remove(Actor& actor)
 
 RenderTaskList Stage::GetRenderTaskList() const
 {
-  return RenderTaskList( &GetImplementation(*this).GetRenderTaskList() );
+  return RenderTaskList(&GetImplementation(*this).GetRenderTaskList());
 }
 
 Vector2 Stage::GetSize() const
@@ -123,15 +108,15 @@ Vector2 Stage::GetDpi() const
 ObjectRegistry Stage::GetObjectRegistry() const
 {
   Internal::Stage* stage = Internal::Stage::GetCurrent();
-  DALI_ASSERT_ALWAYS( stage && "GetObjectRegistry() : Stage is null" );
+  DALI_ASSERT_ALWAYS(stage && "GetObjectRegistry() : Stage is null");
 
   Internal::ObjectRegistry& internal = stage->GetObjectRegistry();
   return ObjectRegistry(&internal);
 }
 
-void Stage::KeepRendering( float durationSeconds )
+void Stage::KeepRendering(float durationSeconds)
 {
-  GetImplementation(*this).KeepRendering( durationSeconds );
+  GetImplementation(*this).KeepRendering(durationSeconds);
 }
 
 Stage::KeyEventSignalType& Stage::KeyEventSignal()
@@ -144,9 +129,9 @@ Stage::EventProcessingFinishedSignalType& Stage::EventProcessingFinishedSignal()
   return GetImplementation(*this).EventProcessingFinishedSignal();
 }
 
-Stage::TouchSignalType& Stage::TouchSignal()
+Stage::TouchEventSignalType& Stage::TouchedSignal()
 {
-  return GetImplementation( *this ).TouchSignal();
+  return GetImplementation(*this).TouchedSignal();
 }
 
 Stage::WheelEventSignalType& Stage::WheelEventSignal()