Button refactoring: rename properties

[platform/core/uifw/dali-toolkit.git] / base / dali-toolkit / internal / controls / text-input / text-input-popup-impl.cpp

diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-popup-impl.cpp b/base/dali-toolkit/internal/controls/text-input/text-input-popup-impl.cpp
index d82c8db..a133275 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-input/text-input-popup-impl.cpp
+++ b/base/dali-toolkit/internal/controls/text-input/text-input-popup-impl.cpp
@@ -25,7 +25,6 @@
 #include <dali-toolkit/public-api/controls/buttons/push-button.h>
 #include <dali-toolkit/public-api/controls/default-controls/solid-color-actor.h>
 
-using namespace std;
 using namespace Dali;
 
 #define GET_LOCALE_TEXT(string) dgettext("sys_string", string)
@@ -519,7 +518,7 @@ void TextInputPopup::AddOption(const std::string& name, const std::string& capti
   optionPressedBackground.Add( pressedIcon );
 
   // 12. Set the pressed option image
-  option.SetPressedImage( optionPressedContainer );
+  option.SetSelectedImage( optionPressedContainer );
 
   // 13. Add the divider
   if ( !finalOption )
@@ -890,17 +889,17 @@ void TextInputPopup::OnShowFinished(Animation& source)
   mShowFinishedSignal.Emit( *this );
 }
 
-TextInputPopup::PressedSignalV2& TextInputPopup::PressedSignal()
+TextInputPopup::PressedSignalType& TextInputPopup::PressedSignal()
 {
   return mPressedSignal;
 }
 
-TextInputPopup::HideFinishedSignalV2& TextInputPopup::HideFinishedSignal()
+TextInputPopup::HideFinishedSignalType& TextInputPopup::HideFinishedSignal()
 {
   return mHideFinishedSignal;
 }
 
-TextInputPopup::ShowFinishedSignalV2& TextInputPopup::ShowFinishedSignal()
+TextInputPopup::ShowFinishedSignalType& TextInputPopup::ShowFinishedSignal()
 {
   return mShowFinishedSignal;
 }