DALi signals refactor to remove V2 naming

[platform/core/uifw/dali-toolkit.git] / base / dali-toolkit / internal / controls / text-input / text-input-impl.h

diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-impl.h b/base/dali-toolkit/internal/controls/text-input/text-input-impl.h
index 9cd2dba..c60d6bc 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-input/text-input-impl.h
+++ b/base/dali-toolkit/internal/controls/text-input/text-input-impl.h
@@ -18,6 +18,15 @@
  *
  */
 
+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/mesh-actor.h>
+#include <dali/public-api/adaptor-framework/clipboard.h>
+#include <dali/public-api/adaptor-framework/clipboard-event-notifier.h>
+#include <dali/public-api/adaptor-framework/imf-manager.h>
+#include <dali/public-api/adaptor-framework/timer.h>
+#include <dali/public-api/common/dali-vector.h>
+#include <dali/public-api/geometry/mesh.h>
+
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/text-input/text-input.h>
@@ -25,9 +34,6 @@
 #include <dali-toolkit/public-api/controls/buttons/push-button.h>
 #include <dali-toolkit/internal/controls/text-input/text-input-popup-impl.h>
 
-#include <dali/public-api/common/dali-vector.h>
-#include <dali/public-api/geometry/mesh.h>
-
 namespace Dali
 {
 
@@ -119,22 +125,22 @@ public:
   /**
    * @copydoc Toolkit::TextInput::InputStartedSignal()
    */
-  Toolkit::TextInput::InputSignalV2& InputStartedSignal();
+  Toolkit::TextInput::InputSignalType& InputStartedSignal();
 
   /**
    * @copydoc Toolkit::TextInput::InputFinishedSignal()
    */
-  Toolkit::TextInput::InputSignalV2& InputFinishedSignal();
+  Toolkit::TextInput::InputSignalType& InputFinishedSignal();
 
   /**
    * @copydoc Toolkit::TextInput::CutAndPasteToolBarDisplayedSignal()
    */
-  Toolkit::TextInput::InputSignalV2& CutAndPasteToolBarDisplayedSignal();
+  Toolkit::TextInput::InputSignalType& CutAndPasteToolBarDisplayedSignal();
 
   /**
    * @copydoc Toolkit::TextInput::StyleChangedSignal()
    */
-  Toolkit::TextInput::StyleChangedSignalV2& StyleChangedSignal();
+  Toolkit::TextInput::StyleChangedSignalType& StyleChangedSignal();
 
   /**
    * @copydoc Toolkit::TextInput::TextModifiedSignal()
@@ -144,12 +150,12 @@ public:
   /**
    * @copydoc Toolkit::TextInput::MaxInputCharactersReachedSignal()
    */
-  Toolkit::TextInput::MaxInputCharactersReachedSignalV2& MaxInputCharactersReachedSignal();
+  Toolkit::TextInput::MaxInputCharactersReachedSignalType& MaxInputCharactersReachedSignal();
 
   /**
    * @copydoc Toolkit::TextInput::InputTextExceedBoundariesSignal()
    */
-  Toolkit::TextInput::InputTextExceedBoundariesSignalV2& InputTextExceedBoundariesSignal();
+  Toolkit::TextInput::InputTextExceedBoundariesSignalType& InputTextExceedBoundariesSignal();
 
   /**
    * Connects a callback function with the object's signals.
@@ -615,7 +621,7 @@ private:
     * @param actor Handle of the selection or grab handle.
     * @param gesture Data structure with the parameters of the gesture.
     */
-   void OnHandlePan(Actor actor, PanGesture gesture);
+   void OnHandlePan(Actor actor, const PanGesture& gesture);
 
    /**
     * Callback for touch down on Grab handle
@@ -643,21 +649,21 @@ private:
     * @param[in] actor
     * @param[in] tap touch event
     */
-   void OnTextTap(Dali::Actor actor, Dali::TapGesture tap);
+   void OnTextTap(Dali::Actor actor, const Dali::TapGesture& tap);
 
    /**
     * Callback for double tap on TextInput
     * @param[in] actor
     * @param[in] tap touch event
     */
-   void OnDoubleTap(Dali::Actor actor, Dali::TapGesture tap);
+   void OnDoubleTap(Dali::Actor actor, const Dali::TapGesture& tap);
 
     /**
      * Callback for long press on TextInput
      * @param[in] actor
      * @param[in] longPress long press event
      */
-   void OnLongPress(Dali::Actor actor, Dali::LongPressGesture longPress);
+   void OnLongPress(Dali::Actor actor, const Dali::LongPressGesture& longPress);
 
    /**
     * Callback for the ClipboardEventNotifier when text is selected in the clipboard window.
@@ -1532,13 +1538,13 @@ private:
   bool mPlaceHolderSet:1;                ///< Whether the place holder text is set.
   bool mMarkUpEnabled:1;                 ///< enable to scan for mark-up
 
-  Toolkit::TextInput::InputSignalV2                      mInputStartedSignalV2;              ///< Signal emitted when input starts
-  Toolkit::TextInput::InputSignalV2                      mInputFinishedSignalV2;             ///< Signal emitted when input ends
-  Toolkit::TextInput::StyleChangedSignalV2               mStyleChangedSignalV2;              ///< Signal emitted when style changes.
+  Toolkit::TextInput::InputSignalType                      mInputStartedSignal;              ///< Signal emitted when input starts
+  Toolkit::TextInput::InputSignalType                      mInputFinishedSignal;             ///< Signal emitted when input ends
+  Toolkit::TextInput::StyleChangedSignalType               mStyleChangedSignal;              ///< Signal emitted when style changes.
   Toolkit::TextInput::TextModifiedSignalType             mTextModifiedSignal;                ///< Signal emitted when text modified.
-  Toolkit::TextInput::MaxInputCharactersReachedSignalV2  mMaxInputCharactersReachedSignalV2; ///< Signal emitted when max input characters is reached.
-  Toolkit::TextInput::InputSignalV2                      mCutAndPasteToolBarDisplayedV2;     ///< Signal emitted when toolbar displayed
-  Toolkit::TextInput::InputTextExceedBoundariesSignalV2  mInputTextExceedBoundariesSignalV2; ///< Signal emitted when input text exceeds the boundaries of the text-input.
+  Toolkit::TextInput::MaxInputCharactersReachedSignalType  mMaxInputCharactersReachedSignal; ///< Signal emitted when max input characters is reached.
+  Toolkit::TextInput::InputSignalType                      mCutAndPasteToolBarDisplayed;       ///< Signal emitted when toolbar displayed
+  Toolkit::TextInput::InputTextExceedBoundariesSignalType  mInputTextExceedBoundariesSignal; ///< Signal emitted when input text exceeds the boundaries of the text-input.
 };
 
 } // namespace Internal