[dali_1.4.32] Merge branch 'devel/master'

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

diff --git a/dali-toolkit/public-api/controls/image-view/image-view.h b/dali-toolkit/public-api/controls/image-view/image-view.h
index ac2befa..c6d0b2a 100644 (file)
--- a/dali-toolkit/public-api/controls/image-view/image-view.h
+++ b/dali-toolkit/public-api/controls/image-view/image-view.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_IMAGE_VIEW_H__
-#define __DALI_TOOLKIT_IMAGE_VIEW_H__
+#ifndef DALI_TOOLKIT_IMAGE_VIEW_H
+#define DALI_TOOLKIT_IMAGE_VIEW_H
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
@@ -48,7 +48,7 @@ class ImageView;
  * ResouceReadySignal is done after the resource is set then signal will be missed.
  *
  * To protect against this, IsResourceReady() can be checked before connecting to ResourceReadySignal,
- * or the signal connection can be done before setting the resource"
+ * or the signal connection can be done before setting the resource.
  *
  * @code
  *    auto myImageView = ImageView::New( resourceUrl );
@@ -73,7 +73,7 @@ class ImageView;
  * @SINCE_1_0.0
  *
  */
-class DALI_IMPORT_API ImageView : public Control
+class DALI_TOOLKIT_API ImageView : public Control
 {
 public:
 
@@ -104,12 +104,7 @@ public:
     {
       // Event side properties
 
-      /**
-       * @DEPRECATED_1_1.16. Use IMAGE instead.
-       * @brief name "resourceUrl", type string.
-       * @SINCE_1_0.0
-       */
-      RESOURCE_URL = PROPERTY_START_INDEX,
+      RESERVED_PROPERTY_01 = PROPERTY_START_INDEX, ///< Reserved index for a removed property.
 
       /**
        * @brief name "image", type string if it is a url, map otherwise.
@@ -310,4 +305,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-#endif // __DALI_TOOLKIT_IMAGE_VIEW_H__
+#endif // DALI_TOOLKIT_IMAGE_VIEW_H