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
Add move semantics to common and base Toolkit classes
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
slider
/
slider.cpp
diff --git
a/dali-toolkit/public-api/controls/slider/slider.cpp
b/dali-toolkit/public-api/controls/slider/slider.cpp
index
f26a05e
..
ed7cda9
100644
(file)
--- a/
dali-toolkit/public-api/controls/slider/slider.cpp
+++ b/
dali-toolkit/public-api/controls/slider/slider.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 20
14
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
20
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-15,7
+15,10
@@
*
*/
*
*/
+// CLASS HEADER
#include <dali-toolkit/public-api/controls/slider/slider.h>
#include <dali-toolkit/public-api/controls/slider/slider.h>
+
+// INTERNAL INCLUDES
#include <dali-toolkit/internal/controls/slider/slider-impl.h>
using namespace Dali;
#include <dali-toolkit/internal/controls/slider/slider-impl.h>
using namespace Dali;
@@
-26,27
+29,17
@@
namespace Dali
namespace Toolkit
{
namespace Toolkit
{
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// Slider
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
Slider::Slider()
{
}
Slider::Slider()
{
}
-Slider::Slider( const Slider& handle )
-: Control( handle )
-{
-}
+Slider::Slider( const Slider& handle ) = default;
-Slider& Slider::operator=( const Slider& handle )
-{
- if( &handle != this )
- {
- Control::operator=( handle );
- }
- return *this;
-}
+Slider::Slider( Slider&& rhs ) = default;
+
+Slider& Slider::operator=( const Slider& handle ) = default;
+
+Slider& Slider::operator=( Slider&& rhs ) = default;
Slider::Slider(Internal::Slider& implementation)
: Control(implementation)
Slider::Slider(Internal::Slider& implementation)
: Control(implementation)
@@
-78,9
+71,9
@@
Slider::ValueChangedSignalType& Slider::SlidingFinishedSignal()
return GetImpl( *this ).SlidingFinishedSignal();
}
return GetImpl( *this ).SlidingFinishedSignal();
}
-Slider::Mark
SignalType& Slider::Mark
Signal()
+Slider::Mark
ReachedSignalType& Slider::MarkReached
Signal()
{
{
- return GetImpl( *this ).MarkSignal();
+ return GetImpl( *this ).Mark
Reached
Signal();
}
Slider Slider::DownCast( BaseHandle handle )
}
Slider Slider::DownCast( BaseHandle handle )