Ensure BaseHandle class move noexcept (core public-api)

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

diff --git a/dali/public-api/object/object-registry.cpp b/dali/public-api/object/object-registry.cpp
index 4d1f8b2..3af5d5b 100644 (file)
--- a/dali/public-api/object/object-registry.cpp
+++ b/dali/public-api/object/object-registry.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,42 +23,24 @@
 
 namespace Dali
 {
+ObjectRegistry::ObjectRegistry() = default;
 
-const char* const ObjectRegistry::SIGNAL_OBJECT_CREATED = "object-created";
-const char* const ObjectRegistry::SIGNAL_OBJECT_DESTROYED = "object-destroyed";
+ObjectRegistry::~ObjectRegistry() = default;
 
-ObjectRegistry::ObjectRegistry()
-{
-}
+ObjectRegistry::ObjectRegistry(const ObjectRegistry& copy) = default;
 
-ObjectRegistry::~ObjectRegistry()
-{
-}
+ObjectRegistry& ObjectRegistry::operator=(const ObjectRegistry& rhs) = default;
 
-ObjectRegistry::ObjectRegistry(const ObjectRegistry& copy)
-: BaseHandle(copy)
-{
-}
+ObjectRegistry::ObjectRegistry(ObjectRegistry&& rhs) noexcept = default;
 
-ObjectRegistry& ObjectRegistry::operator=(const ObjectRegistry& rhs)
-{
-  BaseHandle::operator=(rhs);
-  return *this;
-}
-
-ObjectRegistry& ObjectRegistry::operator=(BaseHandle::NullType* rhs)
-{
-  DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle");
-  Reset();
-  return *this;
-}
+ObjectRegistry& ObjectRegistry::operator=(ObjectRegistry&& rhs) noexcept = default;
 
-ObjectRegistry::ObjectCreatedSignalV2& ObjectRegistry::ObjectCreatedSignal()
+ObjectRegistry::ObjectCreatedSignalType& ObjectRegistry::ObjectCreatedSignal()
 {
   return GetImplementation(*this).ObjectCreatedSignal();
 }
 
-ObjectRegistry::ObjectDestroyedSignalV2& ObjectRegistry::ObjectDestroyedSignal()
+ObjectRegistry::ObjectDestroyedSignalType& ObjectRegistry::ObjectDestroyedSignal()
 {
   return GetImplementation(*this).ObjectDestroyedSignal();
 }