Remove std::vector from public api

[platform/core/uifw/dali-core.git] / dali / public-api / object / property.h

diff --git a/dali/public-api/object/property.h b/dali/public-api/object/property.h
index f7d562c..3e7d2d3 100644 (file)
--- a/dali/public-api/object/property.h
+++ b/dali/public-api/object/property.h
@@ -2,7 +2,7 @@
 #define __DALI_PROPERTY_H__
 
 /*
- * 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.
@@ -25,8 +25,9 @@
 // INTERNAL INCLUDES
 #include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/common/dali-common.h>
+#include <dali/public-api/common/dali-vector.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 class Handle;
@@ -34,7 +35,7 @@ class Handle;
 /**
  * @brief An object + property pair.
  */
-struct Property
+struct DALI_IMPORT_API Property
 {
   /**
    * @brief A valid property index is zero or greater.
@@ -44,7 +45,7 @@ struct Property
   static const int INVALID_INDEX; ///< -1 is not a valid property index
   static const int INVALID_COMPONENT_INDEX; ///< -1 is not a valid property index
 
-  typedef std::vector< Index > IndexContainer; ///< A vector of property indices
+  typedef Dali::Vector< Index > IndexContainer; ///< A vector of property indices
 
   /**
    * @brief A value-type representing a property value.
@@ -52,11 +53,6 @@ struct Property
   class Value;
 
   /**
-   * @brief A pair of property values.
-   */
-  typedef std::pair<std::string, Value> StringValuePair;
-
-  /**
    * @brief A Map of property values.
    */
   class Map;
@@ -64,7 +60,7 @@ struct Property
   /**
    * @brief An Array of property values.
    */
-  typedef std::vector<Value> Array;
+  class Array;
 
   /**
    * @brief The property types supported.