From 5c7e16531bdda2b385a4a149999f5a9a9e0fd6c1 Mon Sep 17 00:00:00 2001 From: Adeel Kazmi Date: Wed, 2 Sep 2020 14:47:03 +0100 Subject: [PATCH 1/1] Renamed TouchSignal to TouchedSignal Change-Id: I7e230727e8e2b86363e87ec0518d62db6ad6729c --- dali/devel-api/adaptor-framework/window-devel.h | 2 +- dali/integration-api/adaptor-framework/scene-holder-impl.h | 4 ++-- dali/integration-api/adaptor-framework/scene-holder.cpp | 4 ++-- dali/integration-api/adaptor-framework/scene-holder.h | 4 ++-- dali/public-api/adaptor-framework/window.cpp | 4 ++-- dali/public-api/adaptor-framework/window.h | 12 ++++++------ 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dali/devel-api/adaptor-framework/window-devel.h b/dali/devel-api/adaptor-framework/window-devel.h index 42de53c..5803d32 100644 --- a/dali/devel-api/adaptor-framework/window-devel.h +++ b/dali/devel-api/adaptor-framework/window-devel.h @@ -58,7 +58,7 @@ typedef Signal< void () > EventProcessingFinishedSignalType; ///< Event Pr typedef Signal< void (const KeyEvent&) > KeyEventSignalType; ///< Key event signal type -typedef Signal< void (const TouchEvent&) > TouchSignalType; ///< Touch signal type +typedef Signal< void (const TouchEvent&) > TouchEventSignalType; ///< Touch signal type typedef Signal< void (const WheelEvent&) > WheelEventSignalType; ///< Touched signal type diff --git a/dali/integration-api/adaptor-framework/scene-holder-impl.h b/dali/integration-api/adaptor-framework/scene-holder-impl.h index baf0a57..2628526 100644 --- a/dali/integration-api/adaptor-framework/scene-holder-impl.h +++ b/dali/integration-api/adaptor-framework/scene-holder-impl.h @@ -225,9 +225,9 @@ public: Dali::Integration::SceneHolder::KeyEventGeneratedSignalType& KeyEventGeneratedSignal() { return mScene.KeyEventGeneratedSignal(); } /** - * @copydoc Dali::Integration::SceneHolder::TouchSignal() + * @copydoc Dali::Integration::SceneHolder::TouchedSignal() */ - Dali::Integration::SceneHolder::TouchSignalType& TouchSignal() { return mScene.TouchSignal(); } + Dali::Integration::SceneHolder::TouchEventSignalType& TouchedSignal() { return mScene.TouchedSignal(); } /** * @copydoc Dali::Integration::SceneHolder::WheelEventSignal() diff --git a/dali/integration-api/adaptor-framework/scene-holder.cpp b/dali/integration-api/adaptor-framework/scene-holder.cpp index f9c1965..7cb0772 100644 --- a/dali/integration-api/adaptor-framework/scene-holder.cpp +++ b/dali/integration-api/adaptor-framework/scene-holder.cpp @@ -121,9 +121,9 @@ SceneHolder::KeyEventGeneratedSignalType& SceneHolder::KeyEventGeneratedSignal() return GetImplementation(*this).KeyEventGeneratedSignal(); } -SceneHolder::TouchSignalType& SceneHolder::TouchSignal() +SceneHolder::TouchEventSignalType& SceneHolder::TouchedSignal() { - return GetImplementation(*this).TouchSignal(); + return GetImplementation(*this).TouchedSignal(); } SceneHolder::WheelEventSignalType& SceneHolder::WheelEventSignal() diff --git a/dali/integration-api/adaptor-framework/scene-holder.h b/dali/integration-api/adaptor-framework/scene-holder.h index fe80572..425f27f 100644 --- a/dali/integration-api/adaptor-framework/scene-holder.h +++ b/dali/integration-api/adaptor-framework/scene-holder.h @@ -61,7 +61,7 @@ public: typedef Signal< bool (const Dali::KeyEvent&) > KeyEventGeneratedSignalType; ///< Key event generated signal type - typedef Signal< void (const Dali::TouchEvent&) > TouchSignalType; ///< Touch signal type + typedef Signal< void (const Dali::TouchEvent&) > TouchEventSignalType; ///< Touch signal type typedef Signal< void (const Dali::WheelEvent&) > WheelEventSignalType; ///< Touched signal type @@ -204,7 +204,7 @@ public: * @return The touch signal to connect to * @note Motion events are not emitted. */ - TouchSignalType& TouchSignal(); + TouchEventSignalType& TouchedSignal(); /** * @brief This signal is emitted when wheel event is received. diff --git a/dali/public-api/adaptor-framework/window.cpp b/dali/public-api/adaptor-framework/window.cpp index ca734c2..9452630 100644 --- a/dali/public-api/adaptor-framework/window.cpp +++ b/dali/public-api/adaptor-framework/window.cpp @@ -329,9 +329,9 @@ Window::KeyEventSignalType& Window::KeyEventSignal() return GetImplementation(*this).KeyEventSignal(); } -Window::TouchSignalType& Window::TouchSignal() +Window::TouchEventSignalType& Window::TouchedSignal() { - return GetImplementation(*this).TouchSignal(); + return GetImplementation(*this).TouchedSignal(); } Window::Window( Internal::Adaptor::Window* window ) diff --git a/dali/public-api/adaptor-framework/window.h b/dali/public-api/adaptor-framework/window.h index f53e6d0..ec618fb 100644 --- a/dali/public-api/adaptor-framework/window.h +++ b/dali/public-api/adaptor-framework/window.h @@ -73,10 +73,10 @@ public: using WindowSize = Uint16Pair ; ///< Window size type @SINCE_1_2.60 using WindowPosition = Uint16Pair; ///< Window position type @SINCE_1_2.60 - 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 TouchEvent&) >; ///< Touch signal type + 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 @SINCE_1_9.21 + using TouchEventSignalType = Signal< void (const TouchEvent&) >; ///< Touch signal type @SINCE_1_9.28 public: @@ -671,12 +671,12 @@ public: // Signals * void YourCallbackName(const TouchEvent& event); * @endcode * - * @SINCE_1_9.21 + * @SINCE_1_9.28 * @return The touch signal to connect to * * @note Motion events are not emitted. */ - TouchSignalType& TouchSignal(); + TouchEventSignalType& TouchedSignal(); public: // Not intended for application developers /// @cond internal -- 2.7.4