[3.0] (ImageView) Downgrade warning level of Image param APIs to only show with a...

Change-Id: Ib0467d0b310cd695bd950de1993384dd73744ec6

diff --git a/dali-toolkit/public-api/controls/image-view/image-view.cpp b/dali-toolkit/public-api/controls/image-view/image-view.cpp
index 02d3e0d..8d09434 100644 (file)
--- a/dali-toolkit/public-api/controls/image-view/image-view.cpp
+++ b/dali-toolkit/public-api/controls/image-view/image-view.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 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.
@@ -61,7 +61,7 @@ ImageView ImageView::New()
 
 ImageView ImageView::New( Image image )
 {
-  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: New() is deprecated and will be removed from next release. use New( const std::string& ) instead.\n" );
+  DALI_LOG_WARNING("DEPRECATION WARNING: New( Image ) is due to be deprecated in the next release. If simply loading from a URL, then use New( const std::string& ) instead.\n" );
 
   ImageView imageView = Internal::ImageView::New();
   imageView.SetImage( image );
@@ -89,7 +89,7 @@ ImageView ImageView::DownCast( BaseHandle handle )
 
 void ImageView::SetImage( Image image )
 {
-  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: SetImage() is deprecated and will be removed from next release. Use SetImage( const std::string& ) instead.\n" );
+  DALI_LOG_WARNING("DEPRECATION WARNING: SetImage( Image ) is due to be deprecated in the next release. If simply loading from a URL, then use SetImage( const std::string& ) instead.\n" );
 
   Dali::Toolkit::GetImpl( *this ).SetImage( image );
 }
@@ -106,7 +106,7 @@ void ImageView::SetImage( const std::string& url, ImageDimensions size )
 
 Image ImageView::GetImage() const
 {
-  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: GetImage() is deprecated and will be removed from next release.\n" );
+  DALI_LOG_WARNING("DEPRECATION WARNING: GetImage() is due to be deprecated in the next release.\n" );
 
   return Dali::Toolkit::GetImpl( *this ).GetImage();
 }

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 40a19ea..b9b7443 100644 (file)
--- a/dali-toolkit/public-api/controls/image-view/image-view.h
+++ b/dali-toolkit/public-api/controls/image-view/image-view.h
@@ -2,7 +2,7 @@
 #define __DALI_TOOLKIT_IMAGE_VIEW_H__
 
 /*
- * Copyright (c) 2015 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.
@@ -129,8 +129,6 @@ public:
   static ImageView New();
 
   /**
-   * @DEPRECATED_1_2_8, use New( const std::string& ) instead.
-   *
    * @brief Create an initialized ImageView from an Image instance.
    *
    * If the handle is empty, ImageView will not display anything.
@@ -139,7 +137,7 @@ public:
    * @param[in] image The Image instance to display.
    * @return A handle to a newly allocated ImageView.
    */
-  static ImageView New( Image image ) DALI_DEPRECATED_API;
+  static ImageView New( Image image );
 
   /**
    * @brief Create an initialized ImageView from an URL to an image resource.
@@ -210,15 +208,13 @@ public:
   static ImageView DownCast( BaseHandle handle );
 
   /**
-   * @DEPRECATED_1_2_8, use SetImage( const std::string& ) instead.
-   *
    * @brief Sets this ImageView from an Image instance.
    *
    * If the handle is empty, ImageView will display nothing
    * @SINCE_1_0.0
    * @param[in] image The Image instance to display.
    */
-  void SetImage( Image image ) DALI_DEPRECATED_API;
+  void SetImage( Image image );
 
   /**
    * @brief Sets this ImageView from the given URL.
@@ -246,7 +242,6 @@ public:
   void SetImage( const std::string& url, ImageDimensions size );
 
   /**
-   * @DEPRECATED_1_1.4
    * @brief Gets the Image instance handle used by the ImageView.
    *
    * A valid handle will be returned only if this instance was created with New(Image) or SetImage(Image) was called.
@@ -254,7 +249,7 @@ public:
    * @SINCE_1_0.0
    * @return The Image instance currently used by the ImageView.
    */
-  Image GetImage() const DALI_DEPRECATED_API;
+  Image GetImage() const;
 
 public: // Not intended for application developers