Revert "[Tizen] Revert "Use touch consumed return to set whether we process a gesture...

[platform/core/uifw/dali-core.git] / dali / internal / event / events / event-processor.h

diff --git a/dali/internal/event/events/event-processor.h b/dali/internal/event/events/event-processor.h
index bc5300e..c9734d3 100644 (file)
--- a/dali/internal/event/events/event-processor.h
+++ b/dali/internal/event/events/event-processor.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_EVENT_PROCESSOR_H__
-#define __DALI_INTERNAL_EVENT_PROCESSOR_H__
+#ifndef DALI_INTERNAL_EVENT_PROCESSOR_H
+#define DALI_INTERNAL_EVENT_PROCESSOR_H
 
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
@@ -31,13 +31,12 @@ namespace Dali
 namespace Integration
 {
 struct Event;
-struct GestureEvent;
 }
 
 namespace Internal
 {
 
-class Stage;
+class Scene;
 class GestureEventProcessor;
 class NotificationManager;
 
@@ -54,11 +53,10 @@ public:
 
   /**
    * Constructor
-   * @param[in] stage                  The stage.
-   * @param[in] notificationManager    The Notification Manager.
+   * @param[in] scene                  The scene.
    * @param[in] gestureEventProcessor  The gesture event processor.
    */
-  EventProcessor(Stage& stage, NotificationManager& notificationManager, GestureEventProcessor& gestureEventProcessor);
+  EventProcessor( Scene& scene, GestureEventProcessor& gestureEventProcessor );
 
   /**
    * Destructor
@@ -68,25 +66,19 @@ public:
 public:
 
   /**
-   * This function is called by Core when an event is queued.
+   * This function is called when an event is queued.
    * @param[in] event A event to queue.
    */
   void QueueEvent( const Integration::Event& event );
 
   /**
-   * This function is called by Core when events are processed.
+   * This function is called when events are processed.
    */
   void ProcessEvents();
 
 private:
 
-  /**
-   * Helper for QueueEvent()
-   */
-  void QueueGestureEvent(const Integration::GestureEvent& event);
-
-private:
-
+  Scene& mScene;                                        ///< The Scene events are processed for.
   TouchEventProcessor      mTouchEventProcessor;        ///< Processes touch events.
   HoverEventProcessor      mHoverEventProcessor;        ///< Processes hover events.
   GestureEventProcessor&   mGestureEventProcessor;      ///< Processes gesture events.
@@ -103,5 +95,5 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_EVENT_PROCESSOR_H__
+#endif // DALI_INTERNAL_EVENT_PROCESSOR_H