projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Updated patch coverage script." into devel/master
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
toolkit-window.cpp
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
..
9e9ca35
100644
(file)
--- 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 )
{
Dali::Window Window::New( PositionSize windowPosition, const std::string& name, bool isTransparent )
{
@@
-168,9
+165,9
@@
Window::KeyEventSignalType& Window::KeyEventSignal()
return GetImplementation( *this ).KeyEventSignal();
}
return GetImplementation( *this ).KeyEventSignal();
}
-Window::Touch
SignalType& Window::Touch
Signal()
+Window::Touch
EventSignalType& Window::Touched
Signal()
{
{
- return GetImplementation( *this ).TouchSignal();
+ return GetImplementation( *this ).Touch
ed
Signal();
}
namespace DevelWindow
}
namespace DevelWindow