Changes after TouchedSignal changes

[platform/core/uifw/dali-demo.git] / examples / remote-image-loading / remote-image-loading-example.cpp

diff --git a/examples/remote-image-loading/remote-image-loading-example.cpp b/examples/remote-image-loading/remote-image-loading-example.cpp
index 5bf7e1f..8952d81 100644 (file)
--- a/examples/remote-image-loading/remote-image-loading-example.cpp
+++ b/examples/remote-image-loading/remote-image-loading-example.cpp
@@ -45,7 +45,7 @@ public:
 
   void ConnectEventSignal(Control control)
   {
-    control.TouchSignal().Connect(this, &MyTester::OnControlTouch);
+    control.TouchedSignal().Connect(this, &MyTester::OnControlTouch);
 
     control.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE,true);
     control.KeyEventSignal().Connect(this, &MyTester::OnControlKeyEvent);
@@ -59,7 +59,7 @@ public:
     mWindow = application.GetWindow();
     mWindow.SetBackgroundColor(Color::BLACK);
     mWindow.KeyEventSignal().Connect(this, &MyTester::OnKey);
-    mWindow.TouchSignal().Connect(this, &MyTester::OnTouch);
+    mWindow.TouchedSignal().Connect(this, &MyTester::OnTouch);
 
     TextLabel rubric = TextLabel::New( "You will need a working internet connection to see the images below");
     rubric.SetProperty( TextLabel::Property::MULTI_LINE, true );
@@ -127,7 +127,7 @@ public:
 
   void OnKeyEvent(const KeyEvent& event)
   {
-    if( event.state == KeyEvent::Down )
+    if( event.GetState() == KeyEvent::DOWN )
     {
       if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
       {
@@ -138,13 +138,13 @@ public:
 
   void OnKey(const KeyEvent &event)
   {
-    if (event.state == KeyEvent::Down)
+    if (event.GetState() == KeyEvent::DOWN)
     {
-      std::cout<<"Window key : " << event.keyCode << std::endl;
+      std::cout<<"Window key : " << event.GetKeyCode() << std::endl;
     }
   }
 
-  void OnTouch(const TouchData &touch)
+  void OnTouch(const TouchEvent &touch)
   {
     if (touch.GetState(0) == PointState::DOWN)
     {
@@ -154,18 +154,18 @@ public:
 
   bool OnControlKeyEvent(Toolkit::Control control, const KeyEvent &event)
   {
-    if (event.state == KeyEvent::Down)
+    if (event.GetState() == KeyEvent::DOWN)
     {
-      std::cout<<"Control down key : " << control.GetProperty< std::string >( Dali::Actor::Property::NAME ) << ", keyCode : " << event.keyCode << std::endl;
+      std::cout<<"Control down key : " << control.GetProperty< std::string >( Dali::Actor::Property::NAME ) << ", keyCode : " << event.GetKeyCode() << std::endl;
     }
     else
     {
-      std::cout<<"Control up key : " << control.GetProperty< std::string >( Dali::Actor::Property::NAME ) << ", keyCode : " << event.keyCode << std::endl;
+      std::cout<<"Control up key : " << control.GetProperty< std::string >( Dali::Actor::Property::NAME ) << ", keyCode : " << event.GetKeyCode() << std::endl;
     }
     return false;
   }
 
-  bool OnControlTouch(Actor actor, const TouchData &touch)
+  bool OnControlTouch(Actor actor, const TouchEvent &touch)
   {
     if (touch.GetState(0) == PointState::DOWN)
     {