Merge "Set label padding in case of ResizePolicy::USE_NATURAL_SIZE - we don't...

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / builder / replacement.h

diff --git a/dali-toolkit/internal/builder/replacement.h b/dali-toolkit/internal/builder/replacement.h
index 879c57c..7edd9d0 100644 (file)
--- a/dali-toolkit/internal/builder/replacement.h
+++ b/dali-toolkit/internal/builder/replacement.h
@@ -1,23 +1,27 @@
 #ifndef __DALI_TOOLKIT_INTERNAL_BUILDER_REPLACEMENT__
 #define __DALI_TOOLKIT_INTERNAL_BUILDER_REPLACEMENT__
 
-//
-// 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.
+ *
+ */
 
+// EXTERNAL INCLUDES
 #include <dali/public-api/object/property-value.h>
+
+// INTERNAL INCLUDES
 #include <dali-toolkit/public-api/builder/builder.h>
 #include <dali-toolkit/internal/builder/builder-get-is.inl.h>
 
@@ -55,7 +59,7 @@ public:
    * @param overrideMap The user overriding map
    * @param defaultMap The default map to use
    */
-  Replacement( const PropertyValueMap& overrideMap, const PropertyValueMap& defaultMap );
+  Replacement( const Property::Map& overrideMap, const Property::Map& defaultMap );
 
   /*
    * Constructor with default map
@@ -63,7 +67,7 @@ public:
    * Make a deep copy of the tree.
    * @param overrideMap The user overriding map
    */
-  Replacement( const PropertyValueMap& defaultMap );
+  Replacement( const Property::Map& defaultMap );
 
   /* @brief Check node for a type
    *
@@ -98,6 +102,13 @@ public:
    * @param node The TreeNode to check
    * @return Optional value
    */
+  OptionalUnsignedInt IsUnsignedInteger( const TreeNode & node ) const;
+
+  /* @brief Check node for a type
+   *
+   * @param node The TreeNode to check
+   * @return Optional value
+   */
   OptionalVector2 IsVector2( const TreeNode & node ) const;
 
   /* @brief Check node for a type
@@ -221,10 +232,10 @@ public:
 
 private:
   // Overriding map (overrides the default map). The map is not owned.
-  const PropertyValueMap* const mOverrideMap;
+  const Property::Map* const mOverrideMap;
 
-  // Defautl map. The map is not owned.
-  const PropertyValueMap* const mDefaultMap;
+  // Default map. The map is not owned.
+  const Property::Map* const mDefaultMap;
 
   // compiler
   // Replacement & operation=( Replacement& replacement );