From 6be1b27d27064f9d757dd2fc8d894227588db746 Mon Sep 17 00:00:00 2001 From: Adeel Kazmi Date: Fri, 14 Aug 2020 15:21:59 +0100 Subject: [PATCH] Changes after TouchData renamed to TouchEvent Change-Id: I6e46835fbb4bc4ce12215cfebd2c7486bde2faac --- .../adaptor-framework/accessibility-action-handler.h | 12 ++++++------ dali/devel-api/adaptor-framework/web-engine-plugin.h | 6 +++--- dali/devel-api/adaptor-framework/web-engine.cpp | 4 ++-- dali/devel-api/adaptor-framework/web-engine.h | 4 ++-- dali/devel-api/adaptor-framework/window-devel.h | 4 ++-- dali/integration-api/adaptor-framework/scene-holder.h | 8 ++++---- .../accessibility/common/accessibility-adaptor-impl.cpp | 12 ++++++------ dali/internal/web-engine/common/web-engine-impl.cpp | 4 ++-- dali/internal/web-engine/common/web-engine-impl.h | 4 ++-- dali/public-api/adaptor-framework/window.h | 6 +++--- 10 files changed, 32 insertions(+), 32 deletions(-) diff --git a/dali/devel-api/adaptor-framework/accessibility-action-handler.h b/dali/devel-api/adaptor-framework/accessibility-action-handler.h index b4eb77f..8bc2ac8 100644 --- a/dali/devel-api/adaptor-framework/accessibility-action-handler.h +++ b/dali/devel-api/adaptor-framework/accessibility-action-handler.h @@ -2,7 +2,7 @@ #define DALI_ACCESSIBILITY_ACTION_HANDLER_H /* - * Copyright (c) 2019 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ // EXTERNAL INCLUDES #include -#include +#include namespace Dali { @@ -47,10 +47,10 @@ public: /** * Perform the accessibility action associated with a scroll event. - * @param touchData The touch point (and time) of the event. + * @param touch The touch point (and time) of the event. * @return whether the focus is cleared or not. */ - virtual bool AccessibilityActionScroll( Dali::TouchData& touchData ) = 0; + virtual bool AccessibilityActionScroll( Dali::TouchEvent& touch ) = 0; /** * Perform the accessibility action to move focus to the previous focusable actor (by one finger flick up). @@ -200,10 +200,10 @@ public: /** * Perform the accessibility action to mouse move (by one finger tap & hold and move). - * @param touchData touch data + * @param touch touch data * @return whether the accessibility action is performed or not. */ - virtual bool AccessibilityActionTouch(const Dali::TouchData& touchData) = 0; + virtual bool AccessibilityActionTouch(const Dali::TouchEvent& touch) = 0; }; // class AccessibilityActionHandler diff --git a/dali/devel-api/adaptor-framework/web-engine-plugin.h b/dali/devel-api/adaptor-framework/web-engine-plugin.h index b8d6379..bfa8016 100644 --- a/dali/devel-api/adaptor-framework/web-engine-plugin.h +++ b/dali/devel-api/adaptor-framework/web-engine-plugin.h @@ -2,7 +2,7 @@ #define DALI_WEB_ENGINE_PLUGIN_H /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,7 +27,7 @@ namespace Dali { class KeyEvent; -class TouchData; +class TouchEvent; /** * @brief WebEnginePlugin is an abstract interface, used by dali-adaptor to access WebEngine plugin. @@ -325,7 +325,7 @@ public: /** * @brief Sends Touch Events. */ - virtual bool SendTouchEvent( const TouchData& touch ) = 0; + virtual bool SendTouchEvent( const TouchEvent& touch ) = 0; /** * @brief Sends Key Events. diff --git a/dali/devel-api/adaptor-framework/web-engine.cpp b/dali/devel-api/adaptor-framework/web-engine.cpp index 04a7368..b0bb39b 100644 --- a/dali/devel-api/adaptor-framework/web-engine.cpp +++ b/dali/devel-api/adaptor-framework/web-engine.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -233,7 +233,7 @@ void WebEngine::SetSize( int width, int height ) return GetImplementation( *this ).SetSize( width, height ); } -bool WebEngine::SendTouchEvent( const TouchData& touch ) +bool WebEngine::SendTouchEvent( const TouchEvent& touch ) { return GetImplementation( *this ).SendTouchEvent( touch ); } diff --git a/dali/devel-api/adaptor-framework/web-engine.h b/dali/devel-api/adaptor-framework/web-engine.h index e9b604e..decb87c 100644 --- a/dali/devel-api/adaptor-framework/web-engine.h +++ b/dali/devel-api/adaptor-framework/web-engine.h @@ -2,7 +2,7 @@ #define DALI_WEB_ENGINE_H /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -309,7 +309,7 @@ public: /** * @brief Sends Touch Events. */ - bool SendTouchEvent( const TouchData& touch ); + bool SendTouchEvent( const TouchEvent& touch ); /** * @brief Sends key Events. diff --git a/dali/devel-api/adaptor-framework/window-devel.h b/dali/devel-api/adaptor-framework/window-devel.h index af4ca19..fd1a95e 100644 --- a/dali/devel-api/adaptor-framework/window-devel.h +++ b/dali/devel-api/adaptor-framework/window-devel.h @@ -28,7 +28,7 @@ namespace Dali { struct KeyEvent; -class TouchData; +class TouchEvent; struct WheelEvent; class RenderTaskList; @@ -58,7 +58,7 @@ typedef Signal< void () > EventProcessingFinishedSignalType; ///< Event Pr typedef Signal< void (const KeyEvent&) > KeyEventSignalType; ///< Key event signal type -typedef Signal< void (const TouchData&) > TouchSignalType; ///< Touch signal type +typedef Signal< void (const TouchEvent&) > TouchSignalType; ///< Touch signal type typedef Signal< void (const WheelEvent&) > WheelEventSignalType; ///< Touched signal type diff --git a/dali/integration-api/adaptor-framework/scene-holder.h b/dali/integration-api/adaptor-framework/scene-holder.h index 905ed6b..ee29a4d 100644 --- a/dali/integration-api/adaptor-framework/scene-holder.h +++ b/dali/integration-api/adaptor-framework/scene-holder.h @@ -2,7 +2,7 @@ #define DALI_INTEGRATION_SCENEHOLDER_H /* - * Copyright (c) 2019 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,7 +30,7 @@ namespace Dali class Actor; class Layer; class Any; -class TouchData; +class TouchEvent; struct TouchPoint; struct WheelEvent; struct KeyEvent; @@ -61,7 +61,7 @@ public: typedef Signal< bool (const Dali::KeyEvent&) > KeyEventGeneratedSignalType; ///< Key event generated signal type - typedef Signal< void (const Dali::TouchData&) > TouchSignalType; ///< Touch signal type + typedef Signal< void (const Dali::TouchEvent&) > TouchSignalType; ///< Touch signal type typedef Signal< void (const Dali::WheelEvent&) > WheelEventSignalType; ///< Touched signal type @@ -199,7 +199,7 @@ public: * An interrupted event will also be emitted (if it occurs). * A callback of the following type may be connected: * @code - * void YourCallbackName( TouchData event ); + * void YourCallbackName( TouchEvent event ); * @endcode * @return The touch signal to connect to * @note Motion events are not emitted. diff --git a/dali/internal/accessibility/common/accessibility-adaptor-impl.cpp b/dali/internal/accessibility/common/accessibility-adaptor-impl.cpp index 4276737..3f877f1 100644 --- a/dali/internal/accessibility/common/accessibility-adaptor-impl.cpp +++ b/dali/internal/accessibility/common/accessibility-adaptor-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include // INTERNAL INCLUDES @@ -250,8 +250,8 @@ bool AccessibilityAdaptor::HandleActionScrollEvent(const TouchPoint& point, uint // so always send the action to the action handler. if( mActionHandler ) { - Dali::TouchData touchData = Integration::NewTouchData( timeStamp, point ); - ret = mActionHandler->AccessibilityActionScroll( touchData ); + Dali::TouchEvent touch = Integration::NewTouchEvent( timeStamp, point ); + ret = mActionHandler->AccessibilityActionScroll( touch ); } Integration::TouchEvent touchEvent; @@ -274,11 +274,11 @@ bool AccessibilityAdaptor::HandleActionTouchEvent(const TouchPoint& point, uint3 { bool ret = false; - Dali::TouchData touchData = Integration::NewTouchData( timeStamp, point ); + Dali::TouchEvent touch = Integration::NewTouchEvent( timeStamp, point ); if( mActionHandler ) { - ret = mActionHandler->AccessibilityActionTouch( touchData ); + ret = mActionHandler->AccessibilityActionTouch( touch ); } return ret; } diff --git a/dali/internal/web-engine/common/web-engine-impl.cpp b/dali/internal/web-engine/common/web-engine-impl.cpp index e467bb4..c058c63 100644 --- a/dali/internal/web-engine/common/web-engine-impl.cpp +++ b/dali/internal/web-engine/common/web-engine-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -333,7 +333,7 @@ void WebEngine::SetSize( int width, int height ) mPlugin->SetSize( width, height ); } -bool WebEngine::SendTouchEvent( const Dali::TouchData& touch ) +bool WebEngine::SendTouchEvent( const Dali::TouchEvent& touch ) { return mPlugin->SendTouchEvent( touch ); } diff --git a/dali/internal/web-engine/common/web-engine-impl.h b/dali/internal/web-engine/common/web-engine-impl.h index bf64b23..19d93f3 100644 --- a/dali/internal/web-engine/common/web-engine-impl.h +++ b/dali/internal/web-engine/common/web-engine-impl.h @@ -2,7 +2,7 @@ #define DALI_WEB_ENGINE_IMPL_H /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -225,7 +225,7 @@ public: /** * @copydoc Dali::WebEngine::SendTouchEvent() */ - bool SendTouchEvent( const Dali::TouchData& touch ); + bool SendTouchEvent( const Dali::TouchEvent& touch ); /** * @copydoc Dali::WebEngine::SendKeyEvent() diff --git a/dali/public-api/adaptor-framework/window.h b/dali/public-api/adaptor-framework/window.h index 8105e5d..ccb484e 100644 --- a/dali/public-api/adaptor-framework/window.h +++ b/dali/public-api/adaptor-framework/window.h @@ -56,7 +56,7 @@ class Orientation; class Actor; class Layer; class RenderTaskList; -class TouchData; +class TouchEvent; struct KeyEvent; /** @@ -77,7 +77,7 @@ public: using FocusChangeSignalType = Signal< void (Window,bool) >; ///< Window focus signal type @SINCE_1_4.35 using ResizeSignalType = Signal< void (Window,WindowSize) >; ///< Window resized signal type @SINCE_1_4.35 using KeyEventSignalType = Signal< void (const KeyEvent&) >; ///< Key event signal type - using TouchSignalType = Signal< void (const TouchData&) >; ///< Touch signal type + using TouchSignalType = Signal< void (const TouchEvent&) >; ///< Touch signal type public: @@ -683,7 +683,7 @@ public: // Signals * An interrupted event will also be emitted (if it occurs). * A callback of the following type may be connected: * @code - * void YourCallbackName(const TouchData& event); + * void YourCallbackName(const TouchEvent& event); * @endcode * * @SINCE_1_9.21 -- 2.7.4