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 "Add BuildPickingRay to devel api" into devel/master
[platform/core/uifw/dali-core.git]
/
dali
/
public-api
/
actors
/
custom-actor.cpp
diff --git
a/dali/public-api/actors/custom-actor.cpp
b/dali/public-api/actors/custom-actor.cpp
index
3d26536
..
99cf536
100644
(file)
--- a/
dali/public-api/actors/custom-actor.cpp
+++ b/
dali/public-api/actors/custom-actor.cpp
@@
-24,10
+24,8
@@
namespace Dali
{
namespace Dali
{
-
namespace
{
namespace
{
-
using namespace Dali;
BaseHandle Create()
using namespace Dali;
BaseHandle Create()
@@
-36,37
+34,26
@@
BaseHandle Create()
return BaseHandle();
}
return BaseHandle();
}
-TypeRegistration mType(
typeid(Dali::CustomActor), typeid(Dali::Actor), Create
);
+TypeRegistration mType(
typeid(Dali::CustomActor), typeid(Dali::Actor), Create
);
-}
+}
// namespace
-CustomActor::CustomActor()
-{
-}
+CustomActor::CustomActor() = default;
-CustomActor CustomActor::DownCast(
BaseHandle handle
)
+CustomActor CustomActor::DownCast(
BaseHandle handle
)
{
{
- return CustomActor(
dynamic_cast<Dali::Internal::CustomActor*>(handle.GetObjectPtr())
);
+ return CustomActor(
dynamic_cast<Dali::Internal::CustomActor*>(handle.GetObjectPtr())
);
}
}
-CustomActor::~CustomActor()
-{
-}
+CustomActor::~CustomActor() = default;
-CustomActor::CustomActor(const CustomActor& copy)
-: Actor(copy)
-{
-}
+CustomActor::CustomActor(const CustomActor& copy) = default;
-CustomActor& CustomActor::operator=(const CustomActor& rhs)
-{
- BaseHandle::operator=(rhs);
- return *this;
-}
+CustomActor& CustomActor::operator=(const CustomActor& rhs) = default;
-CustomActor::CustomActor(
CustomActor&& rhs )
= default;
+CustomActor::CustomActor(
CustomActor&& rhs) noexcept
= default;
-CustomActor& CustomActor::operator=(
CustomActor&& rhs )
= default;
+CustomActor& CustomActor::operator=(
CustomActor&& rhs) noexcept
= default;
CustomActorImpl& CustomActor::GetImplementation()
{
CustomActorImpl& CustomActor::GetImplementation()
{
@@
-98,7
+85,7
@@
CustomActor::CustomActor(Internal::CustomActor* internal)
// Without this check, the actor will be deleted a second time, when the handle is disposed of
// causing a crash.
// Without this check, the actor will be deleted a second time, when the handle is disposed of
// causing a crash.
- if
(internal)
+ if(internal)
{
DALI_ASSERT_ALWAYS(internal->ReferenceCount() != 1 && "Are you trying to use CustomActorImpl::Self() inside a CustomActorImpl destructor?");
}
{
DALI_ASSERT_ALWAYS(internal->ReferenceCount() != 1 && "Are you trying to use CustomActorImpl::Self() inside a CustomActorImpl destructor?");
}