[dali_1.0.1] Merge branch 'tizen'

[platform/core/uifw/dali-core.git] / dali / internal / event / common / type-registry-impl.cpp

diff --git a/dali/internal/event/common/type-registry-impl.cpp b/dali/internal/event/common/type-registry-impl.cpp
index 58d4731..afa0fa9 100644 (file)
--- a/dali/internal/event/common/type-registry-impl.cpp
+++ b/dali/internal/event/common/type-registry-impl.cpp
@@ -1,25 +1,24 @@
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+/*
+ * Copyright (c) 2014 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 // CLASS HEADER
 #include <dali/internal/event/common/type-registry-impl.h>
 
 // EXTERNAL INCLUDES
-#include <execinfo.h>
-#include <cxxabi.h>
 #include <string.h>
 #include <sstream>
 
@@ -28,6 +27,7 @@
 #include <dali/public-api/object/type-registry.h>
 #include <dali/public-api/object/base-handle.h>
 #include <dali/internal/event/actors/custom-actor-internal.h>
+#include <dali/internal/event/common/demangler.h>
 
 #include <dali/integration-api/debug.h>
 
@@ -38,51 +38,6 @@ namespace
 Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_TYPE_REGISTRY");
 #endif
 
-std::vector<std::string> SplitString(const std::string &s, char delim, std::vector<std::string> &elems)
-{
-  std::stringstream ss(s);
-  std::string item;
-  while(std::getline(ss, item, delim))
-  {
-    elems.push_back(item);
-  }
-  return elems;
-}
-
-const int Demangle(const char* symbol, std::vector<std::string> &resolved)
-{
-  int status = -4;
-
-  char* res = abi::__cxa_demangle(symbol, NULL, NULL, &status);
-
-  const char* const demangled_name = (status==0)?res:symbol;
-
-  std::string sDemangled(demangled_name);
-
-  free(res);
-
-  SplitString(sDemangled, ':', resolved);
-
-  return resolved.size();
-}
-
-const std::string DemangleShortName(const char *symbol)
-{
-  std::vector<std::string> resolved;
-
-  Demangle(symbol, resolved);
-
-  if(resolved.size() > 0)
-  {
-    return resolved[ resolved.size() - 1 ];
-  }
-  else
-  {
-    return std::string(symbol);
-  }
-
-}
-
 } // namespace anon
 
 namespace Dali
@@ -132,7 +87,7 @@ Dali::TypeInfo TypeRegistry::GetTypeInfo( const std::type_info& registerType )
 {
   Dali::TypeInfo ret;
 
-  std::string typeName = DemangleShortName(registerType.name());
+  std::string typeName = DemangleClassName(registerType.name());
 
   RegistryMap::iterator iter = mRegistryLut.find(typeName);
 
@@ -161,9 +116,9 @@ Dali::TypeRegistry::NameContainer TypeRegistry::GetTypeNames() const
 }
 
 bool TypeRegistry::Register( const std::type_info& theTypeInfo, const std::type_info& baseTypeInfo,
-                               Dali::TypeInfo::CreateFunction createInstance, bool callCreateOnInit )
+                             Dali::TypeInfo::CreateFunction createInstance, bool callCreateOnInit )
 {
-  std::string uniqueTypeName  = DemangleShortName(theTypeInfo.name());
+  std::string uniqueTypeName  = DemangleClassName(theTypeInfo.name());
 
   return Register( uniqueTypeName, baseTypeInfo, createInstance, callCreateOnInit );
 }
@@ -173,7 +128,7 @@ bool TypeRegistry::Register( const std::string& uniqueTypeName, const std::type_
 {
   bool ret = false;
 
-  std::string baseTypeName    = DemangleShortName(baseTypeInfo.name());
+  std::string baseTypeName    = DemangleClassName(baseTypeInfo.name());
 
   RegistryMap::iterator iter = mRegistryLut.find(uniqueTypeName);
 
@@ -207,7 +162,7 @@ void TypeRegistry::CallInitFunctions(void) const
 
 std::string TypeRegistry::RegistrationName( const std::type_info& registerType )
 {
-  return DemangleShortName( registerType.name() );
+  return DemangleClassName( registerType.name() );
 }
 
 void TypeRegistry::RegisterSignal( TypeRegistration& typeRegistration, const std::string& name, Dali::TypeInfo::SignalConnectorFunctionV2 func )
@@ -240,6 +195,22 @@ bool TypeRegistry::RegisterAction( TypeRegistration &registered, const std::stri
   }
 }
 
+bool TypeRegistry::RegisterProperty( TypeRegistration& registered, const std::string& name, Property::Index index, Property::Type type, Dali::TypeInfo::SetPropertyFunction setFunc, Dali::TypeInfo::GetPropertyFunction getFunc )
+{
+  RegistryMap::iterator iter = mRegistryLut.find( registered.RegisteredName() );
+
+  if( iter != mRegistryLut.end() )
+  {
+    DALI_ASSERT_DEBUG(iter->second);
+
+    GetImplementation(iter->second).AddProperty( name, index, type, setFunc, getFunc );
+
+    return true;
+  }
+
+  return false;
+}
+
 bool TypeRegistry::DoActionTo( BaseObject * const object, const std::string &actionName, const std::vector<Property::Value> &properties)
 {
   bool done = false;
@@ -284,12 +255,12 @@ bool TypeRegistry::ConnectSignal( BaseObject* object, ConnectionTrackerInterface
   return connected;
 }
 
-Dali::TypeInfo TypeRegistry::GetTypeInfo(Dali::BaseObject * const pBaseObject)
+Dali::TypeInfo TypeRegistry::GetTypeInfo(const Dali::BaseObject * const pBaseObject)
 {
   Dali::TypeInfo type;
 
   // test for custom actor which has another indirection to get to the type hiearchy we're after
-  Dali::Internal::CustomActor * const pCustom = dynamic_cast<Dali::Internal::CustomActor*>(pBaseObject);
+  const Dali::Internal::CustomActor * const pCustom = dynamic_cast<const Dali::Internal::CustomActor*>(pBaseObject);
 
   if(pCustom)
   {