Merge "Clean up the code to build successfully on macOS" into devel/master

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

diff --git a/dali/public-api/object/type-info.cpp b/dali/public-api/object/type-info.cpp
index 2188fbd..50a1fc9 100644 (file)
--- a/dali/public-api/object/type-info.cpp
+++ b/dali/public-api/object/type-info.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.
@@ -25,72 +25,93 @@
 
 namespace Dali
 {
+TypeInfo::TypeInfo() = default;
 
-TypeInfo::TypeInfo()
+TypeInfo::~TypeInfo() = default;
+
+TypeInfo::TypeInfo(const TypeInfo& copy) = default;
+
+TypeInfo& TypeInfo::operator=(const TypeInfo& rhs) = default;
+
+TypeInfo::TypeInfo(TypeInfo&& rhs) = default;
+
+TypeInfo& TypeInfo::operator=(TypeInfo&& rhs) = default;
+
+const std::string& TypeInfo::GetName() const
 {
+  return GetImplementation(*this).GetName();
 }
 
-TypeInfo::~TypeInfo()
+const std::string& TypeInfo::GetBaseName() const
 {
+  return GetImplementation(*this).GetBaseName();
 }
 
-TypeInfo::TypeInfo(const TypeInfo& copy)
-: BaseHandle(copy)
+BaseHandle TypeInfo::CreateInstance() const
 {
+  return GetImplementation(*this).CreateInstance();
 }
 
-TypeInfo& TypeInfo::operator=(const TypeInfo& rhs)
+TypeInfo::CreateFunction TypeInfo::GetCreator() const
 {
-  BaseHandle::operator=(rhs);
-  return *this;
+  return GetImplementation(*this).GetCreator();
 }
 
-TypeInfo& TypeInfo::operator=(BaseHandle::NullType* rhs)
+size_t TypeInfo::GetActionCount() const
 {
-  DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle");
-  Reset();
-  return *this;
+  return GetImplementation(*this).GetActionCount();
 }
 
-const std::string& TypeInfo::GetName()
+std::string TypeInfo::GetActionName(size_t index)
 {
-  return GetImplementation(*this).GetName();
+  return GetImplementation(*this).GetActionName(static_cast<uint32_t>(index));
 }
 
-const std::string& TypeInfo::GetBaseName()
+size_t TypeInfo::GetSignalCount() const
 {
-  return GetImplementation(*this).GetBaseName();
+  return GetImplementation(*this).GetSignalCount();
 }
 
-BaseHandle TypeInfo::CreateInstance()
+std::string TypeInfo::GetSignalName(size_t index)
 {
-  return GetImplementation(*this).CreateInstance();
+  return GetImplementation(*this).GetSignalName(static_cast<uint32_t>(index));
 }
 
-TypeInfo::CreateFunction TypeInfo::GetCreator()
+size_t TypeInfo::GetPropertyCount() const
 {
-  return GetImplementation(*this).GetCreator();
+  return GetImplementation(*this).GetPropertyCount();
+}
+
+void TypeInfo::GetPropertyIndices(Property::IndexContainer& indices) const
+{
+  indices.Clear(); // We do not want to clear the container if called internally, so only clear here
+  GetImplementation(*this).GetPropertyIndices(indices);
 }
 
-TypeInfo::NameContainer TypeInfo::GetActions()
+const std::string& TypeInfo::GetPropertyName(Property::Index index) const
 {
-  return GetImplementation(*this).GetActions();
+  return GetImplementation(*this).GetRegisteredPropertyName(index);
 }
 
-TypeInfo::NameContainer TypeInfo::GetSignals()
+Property::Index TypeInfo::GetChildPropertyIndex(const std::string& name) const
 {
-  return GetImplementation(*this).GetSignals();
+  return GetImplementation(*this).GetChildPropertyIndex(name);
 }
 
-void TypeInfo::GetPropertyIndices( Property::IndexContainer& indices ) const
+const std::string& TypeInfo::GetChildPropertyName(Property::Index index) const
 {
-  indices.clear(); // We do not want to clear the container if called internally, so only clear here
-  GetImplementation(*this).GetPropertyIndices( indices );
+  return GetImplementation(*this).GetChildPropertyName(index);
 }
 
-const std::string& TypeInfo::GetPropertyName( Property::Index index ) const
+Property::Type TypeInfo::GetChildPropertyType(Property::Index index) const
 {
-  return GetImplementation(*this).GetPropertyName( index );
+  return GetImplementation(*this).GetChildPropertyType(index);
+}
+
+void TypeInfo::GetChildPropertyIndices(Property::IndexContainer& indices) const
+{
+  indices.Clear(); // We do not want to clear the container if called internally, so only clear here
+  GetImplementation(*this).GetChildPropertyIndices(indices);
 }
 
 TypeInfo::TypeInfo(Internal::TypeInfo* internal)
@@ -99,4 +120,3 @@ TypeInfo::TypeInfo(Internal::TypeInfo* internal)
 }
 
 } // namespace Dali
-