Merge "Event handling refactoring to support EvasPlugin" into devel/master

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

diff --git a/dali/internal/adaptor/common/adaptor-impl.h b/dali/internal/adaptor/common/adaptor-impl.h
index 32df0ed..edd2e40 100755 (executable)
--- a/dali/internal/adaptor/common/adaptor-impl.h
+++ b/dali/internal/adaptor/common/adaptor-impl.h
@@ -332,14 +332,6 @@ public:
   void DestroyTtsPlayer(Dali::TtsPlayer::Mode mode);
 
   /**
-   * @brief Sets minimum distance in pixels that the fingers must move towards/away from each other in order to
-   * trigger a pinch gesture
-   *
-   * @param[in] distance The minimum pinch distance in pixels
-   */
-  void SetMinimumPinchDistance(float distance);
-
-  /**
    * Gets native window handle
    *
    * @return native window handle
@@ -511,14 +503,12 @@ public: // Signals
     return mLanguageChangedSignal;
   }
 
+public: // From Dali::Internal::Adaptor::CoreEventInterface
+
   /**
-   * Gets the gesture manager.
-   * @return The GestureManager
+   * @copydoc Dali::Internal::Adaptor:CoreEventInterface:::ProcessCoreEvents()
    */
-  GestureManager* GetGestureManager() const
-  {
-    return mGestureManager;
-  }
+  virtual void ProcessCoreEvents();
 
 private: // From Dali::Internal::Adaptor::CoreEventInterface
 
@@ -527,11 +517,6 @@ private: // From Dali::Internal::Adaptor::CoreEventInterface
    */
   virtual void QueueCoreEvent(const Dali::Integration::Event& event);
 
-  /**
-   * @copydoc Dali::Internal::Adaptor:CoreEventInterface:::ProcessCoreEvents()
-   */
-  virtual void ProcessCoreEvents();
-
 private: // From Dali::Integration::RenderController
 
   /**
@@ -662,7 +647,6 @@ private: // Data
   CallbackManager*                      mCallbackManager;             ///< Used to install callbacks
   bool                                  mNotificationOnIdleInstalled; ///< whether the idle handler is installed to send an notification event
   TriggerEventInterface*                mNotificationTrigger;         ///< Notification event trigger
-  GestureManager*                       mGestureManager;              ///< Gesture manager
   FeedbackPluginProxy*                  mDaliFeedbackPlugin;          ///< Used to access feedback support
   FeedbackController*                   mFeedbackController;          ///< Plays feedback effects for Dali-Toolkit UI Controls.
   Dali::TtsPlayer                       mTtsPlayers[Dali::TtsPlayer::MODE_NUM];                   ///< Provides TTS support