From 24a5be6815007836bdbb820a579d2f0a58a3faff Mon Sep 17 00:00:00 2001 From: Richard Huang Date: Thu, 6 Aug 2020 15:22:32 +0100 Subject: [PATCH] Add move semantics to toolkit Window Change-Id: I055c275ce957dd545ccff40c439467df3f2ef518 --- .../dali-toolkit-test-utils/toolkit-window.cpp | 15 ++++++--------- .../dali-toolkit/dali-toolkit-test-utils/toolkit-window.h | 2 ++ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.cpp index 3c01e99..d4c5807 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.cpp @@ -80,16 +80,13 @@ Window::~Window() { } -Window::Window(const Window& handle) -: BaseHandle( handle ) -{ -} +Window::Window( const Window& copy ) = default; -Window& Window::operator=(const Window& rhs) -{ - BaseHandle::operator=(rhs); - return *this; -} +Window& Window::operator=( const Window& rhs ) = default; + +Window::Window( Window&& rhs ) = default; + +Window& Window::operator=( Window&& rhs ) = default; Dali::Window Window::New( PositionSize windowPosition, const std::string& name, bool isTransparent ) { diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.h index 000923a..b28f305 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.h @@ -61,6 +61,8 @@ public: ~Window(); Window(const Window& handle); Window& operator=(const Window& rhs); + Window( Window&& rhs ); + Window& operator=( Window&& rhs ); Integration::Scene GetScene(); Dali::RenderSurfaceInterface& GetRenderSurface(); -- 2.7.4