Revert "[Tizen] Add KeyEventGeneratedSignal for Get KeyEvent normally"

This reverts commit 08f8b22918b0f7d66d15276a233b470654ae5f44.

Change-Id: If07fd0237f35baa0612e2bd159608de9182821d2

diff --git a/dali/integration-api/scene.cpp b/dali/integration-api/scene.cpp
index da24de8..869bbf0 100644 (file)
--- a/dali/integration-api/scene.cpp
+++ b/dali/integration-api/scene.cpp
@@ -154,11 +154,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 5a9ab41..cf3d71b 100755 (executable)
--- 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
 
@@ -245,13 +244,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 0a065e9..3e09540 100644 (file)
--- a/dali/internal/event/common/scene-impl.cpp
+++ b/dali/internal/event/common/scene-impl.cpp
@@ -301,12 +301,6 @@ void Scene::EmitKeyEventSignal(const KeyEvent& event)
   mKeyEventSignal.Emit( event );
 }
 
-bool Scene::EmitKeyEventGeneratedSignal(const KeyEvent& event)
-{
-  // Emit the KeyEventGenerated signal when KeyEvent is generated
-  return mKeyEventGeneratedSignal.Emit( event );
-}
-
 void Scene::EmitEventProcessingFinishedSignal()
 {
   mEventProcessingFinishedSignal.Emit();
@@ -328,11 +322,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 76ce3b3..4d97e16 100644 (file)
--- a/dali/internal/event/common/scene-impl.h
+++ b/dali/internal/event/common/scene-impl.h
@@ -177,13 +177,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()
@@ -208,11 +201,6 @@ public:
    */
   Integration::Scene::KeyEventSignalType& KeyEventSignal();
 
-    /**
-   * @copydoc Integration::Scene::KeyEventGeneratedSignal()
-   */
-  Integration::Scene::KeyEventGeneratedSignalType& KeyEventGeneratedSignal();
-
   /**
    * @copydoc Integration::Scene::SignalEventProcessingFinished()
    */
@@ -296,7 +284,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 (executable)
--- 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