Merge "Moved (DEFAULT|DEBUG)_BACKGROUND_COLOR out of Stage and over to constants...

[platform/core/uifw/dali-core.git] / dali / internal / event / common / stage-impl.h

diff --git a/dali/internal/event/common/stage-impl.h b/dali/internal/event/common/stage-impl.h
index f8299a8..4ce80b0 100644 (file)
--- a/dali/internal/event/common/stage-impl.h
+++ b/dali/internal/event/common/stage-impl.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_STAGE_H
 
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -19,7 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali/public-api/common/stage.h>
+#include <dali/devel-api/common/stage.h>
 #include <dali/public-api/object/ref-object.h>
 #include <dali/public-api/object/base-object.h>
 #include <dali/public-api/math/vector2.h>
@@ -206,14 +206,9 @@ public:
   void OnKeyEvent( const Dali::KeyEvent& event );
 
   /**
-   * Callback for Internal::Scene TouchedEventSignal signal
-   */
-  void OnTouchedEvent( const Dali::TouchEvent& touch );
-
-  /**
    * Callback for Internal::Scene TouchSignal signal
    */
-  void OnTouchEvent( const Dali::TouchData& touch );
+  void OnTouchEvent( const Dali::TouchEvent& touch );
 
   /**
    * Callback for Internal::Scene WheelEventSignal signal
@@ -242,10 +237,9 @@ public:
 
   /**
    * Emits the touched signal.
-   * @param[in] touchEvent The touch event details (Old API).
    * @param[in] touch The touch event details.
    */
-  void EmitTouchedSignal( const TouchEvent& touchEvent, const Dali::TouchData& touch );
+  void EmitTouchedSignal( const Dali::TouchEvent& touch );
 
   /**
    * Used by the EventProcessor to emit wheel event signals.
@@ -269,11 +263,6 @@ public:
   Dali::Stage::EventProcessingFinishedSignalType& EventProcessingFinishedSignal();
 
   /**
-    * @copydoc Dali::Stage::TouchedSignal()
-    */
-  Dali::Stage::TouchedSignalType& TouchedSignal();
-
-  /**
     * @copydoc Dali::Stage::TouchSignal()
     */
   Dali::Stage::TouchSignalType& TouchSignal();
@@ -361,8 +350,7 @@ private:
   // The event processing finished signal
   Dali::Stage::EventProcessingFinishedSignalType  mEventProcessingFinishedSignal;
 
-  // The touched signals
-  Dali::Stage::TouchedSignalType                  mTouchedSignal;
+  // The touched signal
   Dali::Stage::TouchSignalType                    mTouchSignal;
 
   // The wheel event signal