[dali_1.1.4] Merge branch '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..03d96dc 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) 2015 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.
@@ -45,46 +45,54 @@ TypeInfo& TypeInfo::operator=(const TypeInfo& rhs)
   return *this;
 }
 
-TypeInfo& TypeInfo::operator=(BaseHandle::NullType* rhs)
-{
-  DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle");
-  Reset();
-  return *this;
-}
-
-const std::string& TypeInfo::GetName()
+const std::string& TypeInfo::GetName() const
 {
   return GetImplementation(*this).GetName();
 }
 
-const std::string& TypeInfo::GetBaseName()
+const std::string& TypeInfo::GetBaseName() const
 {
   return GetImplementation(*this).GetBaseName();
 }
 
-BaseHandle TypeInfo::CreateInstance()
+BaseHandle TypeInfo::CreateInstance() const
 {
   return GetImplementation(*this).CreateInstance();
 }
 
-TypeInfo::CreateFunction TypeInfo::GetCreator()
+TypeInfo::CreateFunction TypeInfo::GetCreator() const
 {
   return GetImplementation(*this).GetCreator();
 }
 
-TypeInfo::NameContainer TypeInfo::GetActions()
+size_t TypeInfo::GetActionCount() const
+{
+  return GetImplementation(*this).GetActionCount();
+}
+
+std::string TypeInfo::GetActionName(size_t index)
+{
+  return GetImplementation(*this).GetActionName(index);
+}
+
+size_t TypeInfo::GetSignalCount() const
+{
+  return GetImplementation(*this).GetSignalCount();
+}
+
+std::string TypeInfo::GetSignalName(size_t index)
 {
-  return GetImplementation(*this).GetActions();
+  return GetImplementation(*this).GetSignalName(index);
 }
 
-TypeInfo::NameContainer TypeInfo::GetSignals()
+size_t TypeInfo::GetPropertyCount() const
 {
-  return GetImplementation(*this).GetSignals();
+  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
+  indices.Clear(); // We do not want to clear the container if called internally, so only clear here
   GetImplementation(*this).GetPropertyIndices( indices );
 }