From 2ff593a77519eed19df953f42e47d1272aa9a0ab Mon Sep 17 00:00:00 2001
From: Sunghyun kim <scholb.kim@samsung.com>
Date: Wed, 24 Jul 2019 13:11:47 +0900
Subject: [PATCH] Revert "[Tizen] Add KeyEventGeneratedSignal for Get KeyEvent
 normally"

This reverts commit 5395cfa5d5893fc92943ca52e499fc70ca5037fb.

Change-Id: Id989126e7466ef72b71a3bf01b96768299e0d684
---
 dali/integration-api/scene.cpp                     |  5 -----
 dali/integration-api/scene.h                       |  8 --------
 dali/internal/event/common/scene-impl.cpp          | 11 -----------
 dali/internal/event/common/scene-impl.h            | 13 -------------
 dali/internal/event/events/key-event-processor.cpp |  8 +-------
 5 files changed, 1 insertion(+), 44 deletions(-)

diff --git a/dali/integration-api/scene.cpp b/dali/integration-api/scene.cpp
index 9331a99..b2a4922 100644
--- a/dali/integration-api/scene.cpp
+++ b/dali/integration-api/scene.cpp
@@ -159,11 +159,6 @@ Scene::KeyEventSignalType& Scene::KeyEventSignal()
   return GetImplementation(*this).KeyEventSignal();
 }
 
-Scene::KeyEventGeneratedSignalType& Scene::KeyEventGeneratedSignal()
-{
-  return GetImplementation(*this).KeyEventGeneratedSignal();
-}
-
 Scene::TouchSignalType& Scene::TouchSignal()
 {
   return GetImplementation(*this).TouchSignal();
diff --git a/dali/integration-api/scene.h b/dali/integration-api/scene.h
index 1d82a44..2128b47 100755
--- a/dali/integration-api/scene.h
+++ b/dali/integration-api/scene.h
@@ -55,7 +55,6 @@ class DALI_CORE_API Scene : public BaseHandle
 public:
   typedef Signal< void () > EventProcessingFinishedSignalType; ///< Event Processing finished signal type
   typedef Signal< void (const Dali::KeyEvent&) > KeyEventSignalType; ///< Key event signal type
-  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::WheelEvent&) > WheelEventSignalType; ///< Touched signal type
 
@@ -250,13 +249,6 @@ public:
   KeyEventSignalType& KeyEventSignal();
 
   /**
-   * @brief The user would connect to this signal to get a KeyEvent when KeyEvent is generated.
-   *
-   * @return The return is true if KeyEvent is consumed, otherwise false.
-   */
-  KeyEventGeneratedSignalType& KeyEventGeneratedSignal();
-
-  /**
    * @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/event/common/scene-impl.cpp b/dali/internal/event/common/scene-impl.cpp
index 4b53d79..19be8cc 100644
--- a/dali/internal/event/common/scene-impl.cpp
+++ b/dali/internal/event/common/scene-impl.cpp
@@ -325,12 +325,6 @@ void Scene::EmitKeyEventSignal(const KeyEvent& event)
   }
 }
 
-bool Scene::EmitKeyEventGeneratedSignal(const KeyEvent& event)
-{
-  // Emit the KeyEventGenerated signal when KeyEvent is generated
-  return mKeyEventGeneratedSignal.Emit( event );
-}
-
 void Scene::EmitEventProcessingFinishedSignal()
 {
   if ( !mEventProcessingFinishedSignal.Empty() )
@@ -367,11 +361,6 @@ Integration::Scene::KeyEventSignalType& Scene::KeyEventSignal()
   return mKeyEventSignal;
 }
 
-Integration::Scene::KeyEventGeneratedSignalType& Scene::KeyEventGeneratedSignal()
-{
-  return mKeyEventGeneratedSignal;
-}
-
 Integration::Scene::EventProcessingFinishedSignalType& Scene::EventProcessingFinishedSignal()
 {
   return mEventProcessingFinishedSignal;
diff --git a/dali/internal/event/common/scene-impl.h b/dali/internal/event/common/scene-impl.h
index c524d62..6671fa3 100644
--- a/dali/internal/event/common/scene-impl.h
+++ b/dali/internal/event/common/scene-impl.h
@@ -187,13 +187,6 @@ public:
   void EmitKeyEventSignal(const KeyEvent& event);
 
   /**
-   * Used by the KeyEventProcessor to emit KeyEventGenerated signals.
-   * @param[in] event The key event.
-   * @return The return is true if KeyEvent is consumed, otherwise false.
-   */
-  bool EmitKeyEventGeneratedSignal(const KeyEvent& event);
-
-  /**
    * Emits the event processing finished signal.
    *
    * @see Dali::Scene::SignalEventProcessingFinished()
@@ -218,11 +211,6 @@ public:
    */
   Integration::Scene::KeyEventSignalType& KeyEventSignal();
 
-    /**
-   * @copydoc Integration::Scene::KeyEventGeneratedSignal()
-   */
-  Integration::Scene::KeyEventGeneratedSignalType& KeyEventGeneratedSignal();
-
   /**
    * @copydoc Integration::Scene::SignalEventProcessingFinished()
    */
@@ -306,7 +294,6 @@ private:
 
   // The key event signal
   Integration::Scene::KeyEventSignalType mKeyEventSignal;
-  Integration::Scene::KeyEventGeneratedSignalType   mKeyEventGeneratedSignal;
 
   // The event processing finished signal
   Integration::Scene::EventProcessingFinishedSignalType mEventProcessingFinishedSignal;
diff --git a/dali/internal/event/events/key-event-processor.cpp b/dali/internal/event/events/key-event-processor.cpp
index 3d9ef47..399c209 100755
--- a/dali/internal/event/events/key-event-processor.cpp
+++ b/dali/internal/event/events/key-event-processor.cpp
@@ -25,7 +25,6 @@
 #include <dali/internal/event/common/scene-impl.h>
 #include <dali/integration-api/events/key-event-integ.h>
 
-
 namespace Dali
 {
 
@@ -51,12 +50,7 @@ void KeyEventProcessor::ProcessKeyEvent( const Integration::KeyEvent& event )
   GetImplementation( &keyEvent )->SetDeviceSubclass( event.deviceSubclass );
 
   // Emit the key event signal from the scene.
-  bool consumed = mScene.EmitKeyEventGeneratedSignal( keyEvent );
-  if( !consumed )
-  {
-    mScene.EmitKeyEventSignal(keyEvent);
-  }
-
+  mScene.EmitKeyEventSignal( keyEvent );
 }
 
 } // namespace Internal
-- 
2.7.4