Merge "DALi Version 1.2.27" into devel/master

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

diff --git a/dali/public-api/object/base-object.cpp b/dali/public-api/object/base-object.cpp
index d6f5793..a464952 100644 (file)
--- a/dali/public-api/object/base-object.cpp
+++ b/dali/public-api/object/base-object.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.
@@ -55,7 +55,7 @@ void BaseObject::UnregisterObject()
   }
 }
 
-bool BaseObject::DoAction(const std::string& actionName, const std::vector<Property::Value>& attributes)
+bool BaseObject::DoAction(const std::string& actionName, const Property::Map& attributes)
 {
   Dali::Internal::TypeRegistry* registry = Dali::Internal::TypeRegistry::Get();
 
@@ -82,7 +82,8 @@ const std::string& BaseObject::GetTypeName() const
 
   // Return an empty string if type-name not found.
   DALI_LOG_WARNING( "TypeName Not Found\n" );
-  return String::EMPTY;
+  static std::string empty;
+  return empty;
 }
 
 bool BaseObject::GetTypeInfo(Dali::TypeInfo& typeInfo) const