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
Change RegisterGlCallback function name of GlView
[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
8aa47d0
..
ba60716
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
16
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.
@@
-25,35
+25,27
@@
using namespace Dali;
namespace Dali
{
namespace Dali
{
-
namespace Toolkit
{
namespace Toolkit
{
-
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)
{
}
-Slider::Slider(
Dali::Internal::CustomActor* internal
)
-: Control(
internal
)
+Slider::Slider(
Dali::Internal::CustomActor* internal
)
+: Control(
internal
)
{
VerifyCustomActorPointer<Internal::Slider>(internal);
}
{
VerifyCustomActorPointer<Internal::Slider>(internal);
}
@@
-69,26
+61,24
@@
Slider::~Slider()
Slider::ValueChangedSignalType& Slider::ValueChangedSignal()
{
Slider::ValueChangedSignalType& Slider::ValueChangedSignal()
{
- return GetImpl(
*this
).ValueChangedSignal();
+ return GetImpl(
*this
).ValueChangedSignal();
}
Slider::ValueChangedSignalType& Slider::SlidingFinishedSignal()
{
}
Slider::ValueChangedSignalType& Slider::SlidingFinishedSignal()
{
- return GetImpl(
*this
).SlidingFinishedSignal();
+ return GetImpl(
*this
).SlidingFinishedSignal();
}
Slider::MarkReachedSignalType& Slider::MarkReachedSignal()
{
}
Slider::MarkReachedSignalType& Slider::MarkReachedSignal()
{
- return GetImpl(
*this
).MarkReachedSignal();
+ return GetImpl(
*this
).MarkReachedSignal();
}
}
-Slider Slider::DownCast(
BaseHandle handle
)
+Slider Slider::DownCast(
BaseHandle handle
)
{
return Control::DownCast<Slider, Internal::Slider>(handle);
}
{
return Control::DownCast<Slider, Internal::Slider>(handle);
}
-
-
} // namespace Toolkit
} // namespace Dali
} // namespace Toolkit
} // namespace Dali