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
Button refactoring: rename properties
[platform/core/uifw/dali-toolkit.git]
/
base
/
dali-toolkit
/
public-api
/
controls
/
buttons
/
push-button.cpp
diff --git
a/base/dali-toolkit/public-api/controls/buttons/push-button.cpp
b/base/dali-toolkit/public-api/controls/buttons/push-button.cpp
index
24da5ee
..
7133c03
100644
(file)
--- a/
base/dali-toolkit/public-api/controls/buttons/push-button.cpp
+++ b/
base/dali-toolkit/public-api/controls/buttons/push-button.cpp
@@
-29,7
+29,6
@@
namespace Dali
namespace Toolkit
{
namespace Toolkit
{
-const char* const PushButton::SIGNAL_TOGGLED = "toggled";
const char* const PushButton::SIGNAL_PRESSED = "pressed";
const char* const PushButton::SIGNAL_RELEASED = "released";
const char* const PushButton::SIGNAL_PRESSED = "pressed";
const char* const PushButton::SIGNAL_RELEASED = "released";
@@
-159,77
+158,72
@@
Actor PushButton::GetBackgroundImage() const
return Dali::Toolkit::GetImplementation( *this ).GetBackgroundImage();
}
return Dali::Toolkit::GetImplementation( *this ).GetBackgroundImage();
}
-void PushButton::Set
Press
edImage( Image image )
+void PushButton::Set
Select
edImage( Image image )
{
{
- Dali::Toolkit::GetImplementation( *this ).Set
Press
edImage( image );
+ Dali::Toolkit::GetImplementation( *this ).Set
Select
edImage( image );
}
}
-void PushButton::Set
Press
edImage( Actor image )
+void PushButton::Set
Select
edImage( Actor image )
{
{
- Dali::Toolkit::GetImplementation( *this ).Set
Press
edImage( image );
+ Dali::Toolkit::GetImplementation( *this ).Set
Select
edImage( image );
}
}
-Actor PushButton::Get
Press
edImage() const
+Actor PushButton::Get
Select
edImage() const
{
{
- return Dali::Toolkit::GetImplementation( *this ).Get
Press
edImage();
+ return Dali::Toolkit::GetImplementation( *this ).Get
Select
edImage();
}
}
-void PushButton::SetDi
mm
edBackgroundImage( Image image )
+void PushButton::SetDi
sabl
edBackgroundImage( Image image )
{
{
- Dali::Toolkit::GetImplementation( *this ).SetDi
mm
edBackgroundImage( image );
+ Dali::Toolkit::GetImplementation( *this ).SetDi
sabl
edBackgroundImage( image );
}
}
-void PushButton::SetDi
mm
edBackgroundImage( Actor image )
+void PushButton::SetDi
sabl
edBackgroundImage( Actor image )
{
{
- Dali::Toolkit::GetImplementation( *this ).SetDi
mm
edBackgroundImage( image );
+ Dali::Toolkit::GetImplementation( *this ).SetDi
sabl
edBackgroundImage( image );
}
}
-Actor PushButton::GetDi
mm
edBackgroundImage() const
+Actor PushButton::GetDi
sabl
edBackgroundImage() const
{
{
- return Dali::Toolkit::GetImplementation( *this ).GetDi
mm
edBackgroundImage();
+ return Dali::Toolkit::GetImplementation( *this ).GetDi
sabl
edBackgroundImage();
}
}
-void PushButton::SetDi
mm
edImage( Image image )
+void PushButton::SetDi
sabl
edImage( Image image )
{
{
- Dali::Toolkit::GetImplementation( *this ).SetDi
mm
edImage( image );
+ Dali::Toolkit::GetImplementation( *this ).SetDi
sabl
edImage( image );
}
}
-void PushButton::SetDi
mm
edImage( Actor image )
+void PushButton::SetDi
sabl
edImage( Actor image )
{
{
- Dali::Toolkit::GetImplementation( *this ).SetDi
mm
edImage( image );
+ Dali::Toolkit::GetImplementation( *this ).SetDi
sabl
edImage( image );
}
}
-Actor PushButton::GetDi
mm
edImage() const
+Actor PushButton::GetDi
sabl
edImage() const
{
{
- return Dali::Toolkit::GetImplementation( *this ).GetDi
mm
edImage();
+ return Dali::Toolkit::GetImplementation( *this ).GetDi
sabl
edImage();
}
}
-void PushButton::SetLabel
Text( const std::string& text
)
+void PushButton::SetLabel
( const std::string& label
)
{
{
- Dali::Toolkit::GetImplementation( *this ).SetLabel
Text( text
);
+ Dali::Toolkit::GetImplementation( *this ).SetLabel
( label
);
}
}
-void PushButton::SetLabel
Text( Actor text
)
+void PushButton::SetLabel
( Actor label
)
{
{
- Dali::Toolkit::GetImplementation( *this ).SetLabel
Text( text
);
+ Dali::Toolkit::GetImplementation( *this ).SetLabel
( label
);
}
}
-Actor PushButton::GetLabel
Text
() const
+Actor PushButton::GetLabel() const
{
{
- return Dali::Toolkit::GetImplementation( *this ).GetLabel
Text
();
+ return Dali::Toolkit::GetImplementation( *this ).GetLabel();
}
}
-PushButton::ToggledSignalV2& PushButton::ToggledSignal()
-{
- return Dali::Toolkit::GetImplementation( *this ).ToggledSignal();
-}
-
-PushButton::PressedSignalV2& PushButton::PressedSignal()
+PushButton::PressedSignalType& PushButton::PressedSignal()
{
return Dali::Toolkit::GetImplementation( *this ).PressedSignal();
}
{
return Dali::Toolkit::GetImplementation( *this ).PressedSignal();
}
-PushButton::ReleasedSignal
V2
& PushButton::ReleasedSignal()
+PushButton::ReleasedSignal
Type
& PushButton::ReleasedSignal()
{
return Dali::Toolkit::GetImplementation( *this ).ReleasedSignal();
}
{
return Dali::Toolkit::GetImplementation( *this ).ReleasedSignal();
}