Merge "(Partial Update) Mark as not rendered if the node is transparent or culled...

[platform/core/uifw/dali-core.git] / dali / public-api / object / base-handle.cpp

diff --git a/dali/public-api/object/base-handle.cpp b/dali/public-api/object/base-handle.cpp
index c339c63..e0e612e 100644 (file)
--- a/dali/public-api/object/base-handle.cpp
+++ b/dali/public-api/object/base-handle.cpp
@@ -23,36 +23,31 @@
 #include <dali/public-api/object/type-registry.h>
 
 // INTERNAL INCLUDES
-#include <dali/internal/event/common/object-impl.h>
 #include <dali/integration-api/debug.h>
+#include <dali/internal/event/common/object-impl.h>
 
 namespace Dali
 {
-
 BaseHandle::BaseHandle(Dali::BaseObject* handle)
 : mObjectHandle(handle)
 {
 }
 
-BaseHandle::BaseHandle()
-{
-}
+BaseHandle::BaseHandle() = default;
 
-BaseHandle::~BaseHandle()
-{
-}
+BaseHandle::~BaseHandle() = default;
 
 BaseHandle::BaseHandle(const BaseHandle& handle) = default;
 
 BaseHandle& BaseHandle::operator=(const BaseHandle& rhs) = default;
 
-BaseHandle::BaseHandle( BaseHandle&& rhs ) = default;
+BaseHandle::BaseHandle(BaseHandle&& rhs) = default;
 
-BaseHandle& BaseHandle::operator=( BaseHandle&& rhs ) = default;
+BaseHandle& BaseHandle::operator=(BaseHandle&& rhs) = default;
 
 bool BaseHandle::DoAction(const std::string& command, const Property::Map& attributes)
 {
-  return GetImplementation(*this).DoAction( command, attributes );
+  return GetImplementation(*this).DoAction(command, attributes);
 }
 
 const std::string& BaseHandle::GetTypeName() const
@@ -80,9 +75,9 @@ void BaseHandle::Reset()
   mObjectHandle = nullptr;
 }
 
-BaseHandle::operator BaseHandle::BooleanType() const
+BaseHandle::operator bool() const
 {
-  return mObjectHandle ? &BaseHandle::ThisIsSaferThanReturningVoidStar : nullptr;
+  return static_cast<bool>(mObjectHandle);
 }
 
 bool BaseHandle::operator==(const BaseHandle& rhs) const
@@ -100,9 +95,9 @@ Dali::RefObject* BaseHandle::GetObjectPtr() const
   return mObjectHandle.Get();
 }
 
-bool BaseHandle::DoConnectSignal( ConnectionTrackerInterface* connectionTracker, const std::string& signalName, FunctorDelegate* functor )
+bool BaseHandle::DoConnectSignal(ConnectionTrackerInterface* connectionTracker, const std::string& signalName, FunctorDelegate* functor)
 {
-  return GetImplementation(*this).DoConnectSignal( connectionTracker, signalName, functor );
+  return GetImplementation(*this).DoConnectSignal(connectionTracker, signalName, functor);
 }
 
 } // namespace Dali