DALi signals refactor to remove V2 naming

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

diff --git a/base/dali-toolkit/internal/controls/popup/popup-impl.cpp b/base/dali-toolkit/internal/controls/popup/popup-impl.cpp
index 173554b..03c560c 100755 (executable)
--- a/base/dali-toolkit/internal/controls/popup/popup-impl.cpp
+++ b/base/dali-toolkit/internal/controls/popup/popup-impl.cpp
@@ -37,7 +37,6 @@
 #include <dali-toolkit/public-api/focus-manager/focus-manager.h>
 
 using namespace Dali;
-using namespace std;
 
 namespace
 {
@@ -183,7 +182,9 @@ Popup::Popup(PopupStyle& style)
   mShowing(false),
   mState(Toolkit::Popup::POPUP_NONE), // Initially, the popup state should not be set, it's set in OnInitialize
   mAlterAddedChild(false),
-  mPopupStyle(PopupStylePtr(&style))
+  mPopupStyle(PopupStylePtr(&style)),
+  mPropertyTitle(Property::INVALID_INDEX),
+  mPropertyState(Property::INVALID_INDEX)
 {
   SetKeyboardNavigationSupport( true );
 }
@@ -571,18 +572,18 @@ void Popup::HandleStateChangeComplete()
 
     // Guard against destruction during signal emission
     Toolkit::Popup handle( GetOwner() );
-    mHiddenSignalV2.Emit();
+    mHiddenSignal.Emit();
   }
 }
 
-Toolkit::Popup::TouchedOutsideSignalV2& Popup::OutsideTouchedSignal()
+Toolkit::Popup::TouchedOutsideSignalType& Popup::OutsideTouchedSignal()
 {
-  return mTouchedOutsideSignalV2;
+  return mTouchedOutsideSignal;
 }
 
-Toolkit::Popup::HiddenSignalV2& Popup::HiddenSignal()
+Toolkit::Popup::HiddenSignalType& Popup::HiddenSignal()
 {
-  return mHiddenSignalV2;
+  return mHiddenSignal;
 }
 
 bool Popup::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor )
@@ -625,7 +626,7 @@ bool Popup::OnBackingTouched(Actor actor, const TouchEvent& event)
       // Guard against destruction during signal emission
       Toolkit::Popup handle( GetOwner() );
 
-      mTouchedOutsideSignalV2.Emit();
+      mTouchedOutsideSignal.Emit();
     }
   }