Update copyright year to 2015 for public api: toolkit

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / public-api / controls / image-view / masked-image-view.h

diff --git a/dali-toolkit/public-api/controls/image-view/masked-image-view.h b/dali-toolkit/public-api/controls/image-view/masked-image-view.h
index f914279..b4e6208 100644 (file)
--- a/dali-toolkit/public-api/controls/image-view/masked-image-view.h
+++ b/dali-toolkit/public-api/controls/image-view/masked-image-view.h
@@ -2,7 +2,7 @@
 #define __DALI_TOOLKIT_MASKED_IMAGE_VIEW_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.
@@ -59,11 +59,11 @@ public:
    */
   enum CustomProperty
   {
-    BACKGROUND_COLOR,    ///< Name "background-color", type VECTOR4
-    SOURCE_SIZE,         ///< Name "source-size",      type VECTOR2
-    SOURCE_OFFSET,       ///< Name "source-offset",    type VECTOR2
-    MASK_SIZE,           ///< Name "mask-size",        type VECTOR2
-    MASK_OFFSET,         ///< Name "mask-offset",      type VECTOR2
+    BACKGROUND_COLOR,    ///< Name "background-color", type Vector4
+    SOURCE_SIZE,         ///< Name "source-size",      type Vector2
+    SOURCE_OFFSET,       ///< Name "source-offset",    type Vector2
+    MASK_SIZE,           ///< Name "mask-size",        type Vector2
+    MASK_OFFSET,         ///< Name "mask-offset",      type Vector2
 
     CUSTOM_PROPERTY_COUNT
   };
@@ -183,7 +183,7 @@ public:
    * @param[in] customProperty A custom property enum defined in this class.
    * @return The property index e.g. for use with Animation::AnimateTo()
    */
-  Property::Index GetPropertyIndex( CustomProperty customProperty ) const;
+  Dali::Property::Index GetPropertyIndex( CustomProperty customProperty ) const;
 
   /**
    * @brief Pause the masking operation to improve performance.