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

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

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..980c0a5 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) 2020 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.
@@ -20,7 +20,6 @@
 
 // EXTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
-#include <dali/public-api/images/resource-image.h>
 #include <dali/public-api/object/property-map.h>
 
 // INTERNAL INCLUDES
@@ -36,19 +35,13 @@ ImageView::ImageView()
 {
 }
 
-ImageView::ImageView( const ImageView& imageView )
-: Control( imageView )
-{
-}
+ImageView::ImageView( const ImageView& imageView ) = default;
 
-ImageView& ImageView::operator=( const ImageView& imageView )
-{
-  if( &imageView != this )
-  {
-    Control::operator=( imageView );
-  }
-  return *this;
-}
+ImageView::ImageView( ImageView&& rhs ) = default;
+
+ImageView& ImageView::operator=( const ImageView& imageView ) = default;
+
+ImageView& ImageView::operator=( ImageView&& rhs ) = default;
 
 ImageView::~ImageView()
 {
@@ -59,15 +52,6 @@ ImageView ImageView::New()
   return Internal::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" );
-
-  ImageView imageView = Internal::ImageView::New();
-  imageView.SetImage( image );
-  return imageView;
-}
-
 ImageView ImageView::New( const std::string& url )
 {
   ImageView imageView = Internal::ImageView::New();
@@ -87,13 +71,6 @@ ImageView ImageView::DownCast( BaseHandle handle )
   return Control::DownCast<ImageView, Internal::ImageView>( 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::Toolkit::GetImpl( *this ).SetImage( image );
-}
-
 void ImageView::SetImage( const std::string& url )
 {
   Dali::Toolkit::GetImpl( *this ).SetImage( url, ImageDimensions() );
@@ -104,13 +81,6 @@ void ImageView::SetImage( const std::string& url, ImageDimensions size )
   Dali::Toolkit::GetImpl( *this ).SetImage( url, size );
 }
 
-Image ImageView::GetImage() const
-{
-  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: GetImage() is deprecated and will be removed from next release.\n" );
-
-  return Dali::Toolkit::GetImpl( *this ).GetImage();
-}
-
 ImageView::ImageView( Internal::ImageView& implementation )
  : Control( implementation )
 {