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 f5179d7..03c560c 100755 (executable)
--- a/base/dali-toolkit/internal/controls/popup/popup-impl.cpp
+++ b/base/dali-toolkit/internal/controls/popup/popup-impl.cpp
@@ -572,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 )
@@ -626,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();
     }
   }