X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Fpublic-api%2Fobject%2Fbase-handle.cpp;h=121cc0dd4549e31c55730562bfbd4d4a2ccfec8b;hb=53f9fe2ef16f8124ab976c9995146a0fd342775e;hp=45473a37db52fee647e070ed735a10403109114b;hpb=a416e02739d885d7469ddba790c15974df6091e1;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/dali/public-api/object/base-handle.cpp b/dali/public-api/object/base-handle.cpp
index 45473a3..121cc0d 100644
--- a/dali/public-api/object/base-handle.cpp
+++ b/dali/public-api/object/base-handle.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,43 +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)
-  : mObjectHandle(handle.mObjectHandle)
-{
-}
+BaseHandle::BaseHandle(const BaseHandle& handle) = default;
 
-BaseHandle& BaseHandle::operator=(const BaseHandle& rhs)
-{
-  if( this != &rhs )
-  {
-    this->mObjectHandle = rhs.mObjectHandle;
-  }
+BaseHandle& BaseHandle::operator=(const BaseHandle& rhs) = default;
 
-  return *this;
-}
+BaseHandle::BaseHandle(BaseHandle&& rhs) = default;
 
-bool BaseHandle::DoAction(const std::string& command, const std::vector<Property::Value>& attributes)
+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
@@ -74,26 +62,22 @@ bool BaseHandle::GetTypeInfo(Dali::TypeInfo& typeInfo) const
 
 BaseObject& BaseHandle::GetBaseObject()
 {
-  DALI_ASSERT_ALWAYS( mObjectHandle.Get() && "BaseHandle is empty" );
-
   return static_cast<BaseObject&>(*mObjectHandle);
 }
 
 const BaseObject& BaseHandle::GetBaseObject() const
 {
-  DALI_ASSERT_ALWAYS(mObjectHandle.Get() && "BaseHandle is empty" );
-
   return static_cast<const BaseObject&>(*mObjectHandle);
 }
 
 void BaseHandle::Reset()
 {
-  mObjectHandle = NULL;
+  mObjectHandle = nullptr;
 }
 
 BaseHandle::operator BaseHandle::BooleanType() const
 {
-  return mObjectHandle ? &BaseHandle::ThisIsSaferThanReturningVoidStar : NULL;
+  return mObjectHandle ? &BaseHandle::ThisIsSaferThanReturningVoidStar : nullptr;
 }
 
 bool BaseHandle::operator==(const BaseHandle& rhs) const
@@ -111,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