X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fimage-view%2Fimage-view.cpp;h=d65bef01da4bb51a3cae91c02265610c5df40e19;hb=1d82abb8a1a514ce0af63004706135fb7883f89b;hp=2726af507bdbe1738a0229f922c45b785d7b0d56;hpb=a80b01449dd3c91d092b56e16e0cea06b32584e7;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

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 2726af5..d65bef0 100644
--- 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.
@@ -19,7 +19,7 @@
 #include <dali-toolkit/public-api/controls/image-view/image-view.h>
 
 // EXTERNAL INCLUDES
-#include <dali/public-api/images/resource-image.h>
+#include <dali/integration-api/debug.h>
 #include <dali/public-api/object/property-map.h>
 
 // INTERNAL INCLUDES
@@ -27,27 +27,19 @@
 
 namespace Dali
 {
-
 namespace Toolkit
 {
-
 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()
 {
@@ -58,61 +50,44 @@ ImageView ImageView::New()
   return Internal::ImageView::New();
 }
 
-ImageView ImageView::New( Image image )
+ImageView ImageView::New(const std::string& url)
 {
   ImageView imageView = Internal::ImageView::New();
-  imageView.SetImage( image );
+  imageView.SetImage(url, ImageDimensions());
   return imageView;
 }
 
-ImageView ImageView::New( const std::string& url )
+ImageView ImageView::New(const std::string& url, ImageDimensions size)
 {
   ImageView imageView = Internal::ImageView::New();
-  imageView.SetImage( url, ImageDimensions() );
+  imageView.SetImage(url, size);
   return imageView;
 }
 
-ImageView ImageView::New( const std::string& url, ImageDimensions size )
-{
-  ImageView imageView = Internal::ImageView::New();
-  imageView.SetImage( url, size );
-  return imageView;
-}
-
-ImageView ImageView::DownCast( BaseHandle handle )
-{
-  return Control::DownCast<ImageView, Internal::ImageView>( handle );
-}
-
-void ImageView::SetImage( Image image )
-{
-  Dali::Toolkit::GetImpl( *this ).SetImage( image );
-}
-
-void ImageView::SetImage( const std::string& url )
+ImageView ImageView::DownCast(BaseHandle handle)
 {
-  Dali::Toolkit::GetImpl( *this ).SetImage( url, ImageDimensions() );
+  return Control::DownCast<ImageView, Internal::ImageView>(handle);
 }
 
-void ImageView::SetImage( const std::string& url, ImageDimensions size )
+void ImageView::SetImage(const std::string& url)
 {
-  Dali::Toolkit::GetImpl( *this ).SetImage( url, size );
+  Dali::Toolkit::GetImpl(*this).SetImage(url, ImageDimensions());
 }
 
-Image ImageView::GetImage() const
+void ImageView::SetImage(const std::string& url, ImageDimensions size)
 {
-  return Dali::Toolkit::GetImpl( *this ).GetImage();
+  Dali::Toolkit::GetImpl(*this).SetImage(url, size);
 }
 
-ImageView::ImageView( Internal::ImageView& implementation )
- : Control( implementation )
+ImageView::ImageView(Internal::ImageView& implementation)
+: Control(implementation)
 {
 }
 
-ImageView::ImageView( Dali::Internal::CustomActor* internal )
- : Control( internal )
+ImageView::ImageView(Dali::Internal::CustomActor* internal)
+: Control(internal)
 {
-  VerifyCustomActorPointer<Internal::ImageView>( internal );
+  VerifyCustomActorPointer<Internal::ImageView>(internal);
 }
 
 } // namespace Toolkit