X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fpopup%2Fpopup-impl.cpp;h=0d7b93c6f7972b9df01e38c1d0b1f403881ca3c1;hb=ef15505c94dffeb0639c91d9d3cd374918c21c4f;hp=7d4c2e3d022ddba45f89659b1df9f763bd9a96ec;hpb=9808ae4c46337178721866e7ec163eebe0d1c85a;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/controls/popup/popup-impl.cpp b/dali-toolkit/internal/controls/popup/popup-impl.cpp
index 7d4c2e3..0d7b93c 100644
--- a/dali-toolkit/internal/controls/popup/popup-impl.cpp
+++ b/dali-toolkit/internal/controls/popup/popup-impl.cpp
@@ -28,7 +28,7 @@
 #include <dali/public-api/animation/constraints.h>
 #include <dali/devel-api/common/stage.h>
 #include <dali/public-api/events/key-event.h>
-#include <dali/public-api/events/touch-data.h>
+#include <dali/public-api/events/touch-event.h>
 #include <dali/public-api/object/type-registry.h>
 #include <dali/devel-api/scripting/scripting.h>
 #include <dali/devel-api/actors/actor-devel.h>
@@ -1532,7 +1532,7 @@ bool Popup::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tra
   return connected;
 }
 
-bool Popup::OnBackingTouched( Actor actor, const TouchData& touch )
+bool Popup::OnBackingTouched( Actor actor, const TouchEvent& touch )
 {
   // Allow events to pass through if the backing isn't the hit-actor
   if( (touch.GetHitActor(0) == actor) &&
@@ -1559,18 +1559,18 @@ bool Popup::OnBackingWheelEvent( Actor actor, const WheelEvent& event )
   return true;
 }
 
-bool Popup::OnDialogTouched( Actor actor, const TouchData& touch )
+bool Popup::OnDialogTouched( Actor actor, const TouchEvent& touch )
 {
   // Only connecting this so the backing does not become the default hit-actor and inadvertently closes the popup
   return false;
 }
 
-void Popup::OnStageConnection( int depth )
+void Popup::OnSceneConnection( int depth )
 {
   mLayoutDirty = true;
   RelayoutRequest();
 
-  Control::OnStageConnection( depth );
+  Control::OnSceneConnection( depth );
 }
 
 void Popup::OnChildAdd( Actor& child )