From: minho.sun <minho.sun@samsung.com>
Date: Tue, 10 Oct 2017 02:40:39 +0000 (+0900)
Subject: Fix build error.
X-Git-Tag: submit/tizen_4.0/20171012.085532~1^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6fbcfc1293db8dd36dcde396f008df24b5ea1ab2;p=platform%2Fcore%2Fuifw%2Fwidget-viewer-dali.git

Fix build error.

Some devel apis in dali were moved to public.
This change made build error in widget-viewer-dali.

Change-Id: If8421c1b8acd856c92cee16122ab0c7b75287489
Signed-off-by: minho.sun <minho.sun@samsung.com>
---

diff --git a/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp b/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp
index 422fb16..b052d87 100644
--- a/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp
+++ b/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp
@@ -31,8 +31,6 @@
 #include <dali-toolkit/public-api/visuals/visual-properties.h>
 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
 #include <dali/integration-api/debug.h>
-#include <dali/devel-api/events/touch-event-devel.h>
-#include <dali/devel-api/events/key-event-devel.h>
 #include <string.h>
 #include <Ecore_Wayland.h>
 #include <Ecore_Input.h>
@@ -1027,12 +1025,12 @@ bool WidgetView::OnTouch( Dali::Actor actor, const Dali::TouchData& event )
     return false;
   }
 
-  DevelDevice::Class::Type deviceType = DevelTouchData::GetDeviceClass( event, 0 );
-  if( deviceType == DevelDevice::Class::MOUSE )
+  Device::Class::Type deviceType = event.GetDeviceClass( 0 );
+  if( deviceType == Device::Class::MOUSE )
   {
     return MouseEvent( event );
   }
-  else if( deviceType == DevelDevice::Class::TOUCH )
+  else if( deviceType == Device::Class::TOUCH )
   {
     return TouchEvent( event );
   }
@@ -1098,8 +1096,8 @@ bool WidgetView::OnKeyEvent( const Dali::KeyEvent& event )
   tizen_remote_surface_transfer_key_event( mRemoteSurface,
                                            type,
                                            keyCode,
-                                           Dali::DevelKeyEvent::GetDeviceClass( event ),
-                                           Dali::DevelKeyEvent::GetDeviceSubclass( event ),
+                                           event.GetDeviceClass(),
+                                           event.GetDeviceSubclass(),
                                            "",
                                            static_cast< uint32_t >( event.time )
                                          );
@@ -1313,7 +1311,7 @@ void WidgetView::MouseIn( const Dali::TouchData& event )
                                              0,
                                              0,
                                              TIZEN_INPUT_DEVICE_CLAS_MOUSE,
-                                             DevelTouchData::GetDeviceSubclass( event, 0 ),
+                                             event.GetDeviceSubclass( 0 ),
                                              "",
                                              event.GetTime()
                                            );
@@ -1332,7 +1330,7 @@ void WidgetView::MouseOut( const Dali::TouchData& event )
                                              0,
                                              0,
                                              TIZEN_INPUT_DEVICE_CLAS_MOUSE,
-                                             DevelTouchData::GetDeviceSubclass( event, 0 ),
+                                             event.GetDeviceSubclass( 0 ),
                                              "",
                                              event.GetTime()
                                            );
@@ -1389,7 +1387,7 @@ bool WidgetView::MouseEvent( const Dali::TouchData& event )
                                              wl_fixed_from_double( event.GetPressure( 0 ) ),
                                              wl_fixed_from_double( event.GetAngle( 0 ).degree ),
                                              TIZEN_INPUT_DEVICE_CLAS_MOUSE,
-                                             DevelTouchData::GetDeviceSubclass( event, 0 ),
+                                             event.GetDeviceSubclass( 0 ),
                                              "",
                                              event.GetTime()
                                            );
@@ -1452,7 +1450,7 @@ bool WidgetView::TouchEvent( const Dali::TouchData& event )
                                              wl_fixed_from_double( event.GetPressure( 0 ) ),
                                              wl_fixed_from_double( event.GetAngle( 0 ).degree ),
                                              TIZEN_INPUT_DEVICE_CLAS_TOUCHSCREEN,
-                                             DevelTouchData::GetDeviceSubclass( event, 0 ),
+                                             event.GetDeviceSubclass( 0 ),
                                              "",
                                              event.GetTime()
                                            );