From f5e6f85ec9cb5843ca509a8731aa4e94d2a2c897 Mon Sep 17 00:00:00 2001 From: "Seungho, Baek" Date: Mon, 15 Jul 2019 14:57:56 +0900 Subject: [PATCH] Revert "[Tizen] Add KeyEventGeneratedSignal for Get KeyEvent normally" This reverts commit e58be6a1a7220f7d8db4ddfa998b002d6d249d75. --- dali/devel-api/adaptor-framework/window-devel.cpp | 5 ----- dali/devel-api/adaptor-framework/window-devel.h | 14 -------------- dali/internal/window-system/common/window-impl.h | 5 ----- 3 files changed, 24 deletions(-) diff --git a/dali/devel-api/adaptor-framework/window-devel.cpp b/dali/devel-api/adaptor-framework/window-devel.cpp index dd28579..17a2993 100644 --- a/dali/devel-api/adaptor-framework/window-devel.cpp +++ b/dali/devel-api/adaptor-framework/window-devel.cpp @@ -55,11 +55,6 @@ KeyEventSignalType& KeyEventSignal( Window window ) return GetImplementation( window ).KeyEventSignal(); } -KeyEventGeneratedSignalType& KeyEventGeneratedSignal( Window window ) -{ - return GetImplementation( window ).KeyEventGeneratedSignal(); -} - TouchSignalType& TouchSignal( Window window ) { return GetImplementation( window ).TouchSignal(); diff --git a/dali/devel-api/adaptor-framework/window-devel.h b/dali/devel-api/adaptor-framework/window-devel.h index e61381e..3da549e 100644 --- a/dali/devel-api/adaptor-framework/window-devel.h +++ b/dali/devel-api/adaptor-framework/window-devel.h @@ -35,8 +35,6 @@ typedef Signal< void () > EventProcessingFinishedSignalType; ///< Event Pr typedef Signal< void (const KeyEvent&) > KeyEventSignalType; ///< Key event signal type -typedef Signal< bool (const KeyEvent&) > KeyEventGeneratedSignalType; ///< Key event generated signal type - typedef Signal< void (const TouchData&) > TouchSignalType; ///< Touch signal type typedef Signal< void (const WheelEvent&) > WheelEventSignalType; ///< Touched signal type @@ -86,18 +84,6 @@ DALI_ADAPTOR_API EventProcessingFinishedSignalType& EventProcessingFinishedSigna DALI_ADAPTOR_API KeyEventSignalType& KeyEventSignal( Window window ); /** - * @brief This signal is emitted when key event is received. - * - * A callback of the following type may be connected: - * @code - * bool YourCallbackName(const KeyEvent& event); - * @endcode - * @param[in] window The window instance - * @return The signal to connect to - */ -DALI_ADAPTOR_API KeyEventGeneratedSignalType& KeyEventGeneratedSignal( Window window ); - -/** * @brief This signal is emitted when the screen is touched and when the touch ends * (i.e. the down & up touch events only). * diff --git a/dali/internal/window-system/common/window-impl.h b/dali/internal/window-system/common/window-impl.h index 97fc575..7fd04f9 100644 --- a/dali/internal/window-system/common/window-impl.h +++ b/dali/internal/window-system/common/window-impl.h @@ -464,11 +464,6 @@ public: // Signals */ Dali::DevelWindow::KeyEventSignalType& KeyEventSignal() { return mScene.KeyEventSignal(); }; - /** - * @copydoc Dali::Window::KeyEventGeneratedSignal() - */ - Dali::DevelWindow::KeyEventGeneratedSignalType& KeyEventGeneratedSignal() { return mScene.KeyEventGeneratedSignal(); }; - /** * @copydoc Dali::Window::TouchSignal() */ -- 2.7.4