Remove use of map-wrapper from TypeRegistry

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

diff --git a/dali/internal/event/common/type-registry-impl.h b/dali/internal/event/common/type-registry-impl.h
index 815d0da..47364f3 100644 (file)
--- a/dali/internal/event/common/type-registry-impl.h
+++ b/dali/internal/event/common/type-registry-impl.h
@@ -2,7 +2,7 @@
 #define __DALI_INTERNAL_TYPE_REGISTRY_H__
 
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 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.
@@ -19,7 +19,6 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/common/map-wrapper.h>
 #include <dali/devel-api/object/csharp-type-info.h>
 #include <dali/public-api/object/type-registry.h>
 #include <dali/public-api/object/base-handle.h>
@@ -93,11 +92,10 @@ public:
    * @param [in] name The name type to be registered (must be unique)
    * @param [in] baseTypeInfo Type info for its base class
    * @param [in] createInstance Instance creation function
-   * @param [in] callCreateOnInit If true call createInstance on dali initialisation
    * @return true if the name could be registered.
    */
   bool Register( const std::string& name, const std::type_info& baseTypeInfo,
-                 Dali::CSharpTypeInfo::CreateFunction createInstance, bool callCreateOnInit );
+                 Dali::CSharpTypeInfo::CreateFunction createInstance );
 
   /*
    * Register a signal connector function to a type
@@ -216,16 +214,11 @@ public:
 
 private:
   /*
-   * Map from type name to TypeInfo
+   * Mapping from type name to TypeInfo
    */
-  typedef std::map<std::string, Dali::TypeInfo> RegistryMap;
-  RegistryMap mRegistryLut;
-
-  typedef std::vector<Dali::TypeInfo::CreateFunction> InitFunctions;
-  InitFunctions mInitFunctions;
+  std::vector< Dali::TypeInfo > mRegistryLut;
 
-  typedef std::vector<Dali::CSharpTypeInfo::CreateFunction> CSharpInitFunctions;
-  CSharpInitFunctions mCSharpInitFunctions;
+  std::vector< Dali::TypeInfo::CreateFunction > mInitFunctions;
 
 private:
   TypeRegistry();