projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel/master' into tizen
[platform/core/uifw/dali-core.git]
/
dali
/
integration-api
/
scene.cpp
diff --git
a/dali/integration-api/scene.cpp
b/dali/integration-api/scene.cpp
index
2675ba5
..
6d69db8
100644
(file)
--- a/
dali/integration-api/scene.cpp
+++ b/
dali/integration-api/scene.cpp
@@
-44,29
+44,18
@@
Scene Scene::DownCast(BaseHandle handle)
return Scene(dynamic_cast<Dali::Internal::Scene*>(handle.GetObjectPtr()));
}
return Scene(dynamic_cast<Dali::Internal::Scene*>(handle.GetObjectPtr()));
}
-Scene::Scene()
-{
-}
+Scene::Scene() = default;
-Scene::~Scene()
-{
-}
+Scene::~Scene() = default;
-Scene::Scene(const Scene& handle)
-: BaseHandle(handle)
-{
-}
+Scene::Scene(const Scene& handle) = default;
Scene::Scene(Internal::Scene* internal)
: BaseHandle(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)
{
@@
-123,9
+112,9
@@
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()
}
void Scene::SurfaceReplaced()