diff -r 4633027730f5 -r e6ad4ef83b23 src/hbcore/feedback/hbfeedbackengine.cpp --- a/src/hbcore/feedback/hbfeedbackengine.cpp Wed Aug 18 10:05:37 2010 +0300 +++ b/src/hbcore/feedback/hbfeedbackengine.cpp Thu Sep 02 20:44:51 2010 +0300 @@ -28,6 +28,7 @@ #include "hbinstantinteractionevent_p.h" #include "hbcontinuousinteractionevent_p.h" +#include // remove with HB_DEPRECATED #include /*! @@ -43,7 +44,7 @@ Instant interaction information is received by methods pressed(), released(), clicked(), keyRepeated(), longPressed(), draggedOver(), flicked(), popupOpened(), popupClosed(), boundaryReached(), rotated90Degrees(), - selectionChanged() and multitouchActivated(). + selectionChanged() and advancedGestureActivated(). Continuous interaction information is received by methods continuousTriggered() and continuousStopped(). @@ -277,15 +278,20 @@ rotated90Degrees(widget); } - break; + break; case Hb::InstantSelectionChanged: { selectionChanged(widget); } break; - case Hb::InstantMultitouchActivated: { - multitouchActivated(widget); + case Hb::InstantMultitouchActivated: { + HB_DEPRECATED("Hb::InstantMultitouchActivated is deprecated."); + multitouchActivated(widget); + } + break; + case Hb::InstantAdvancedGestureActivated: { + advancedGestureActivated(widget); } break; @@ -420,6 +426,9 @@ } /*! + \deprecated HbFeedbackEngine::multitouchActivated(const HbWidget*) + is deprecated. Use HbFeedbackEngine::advancedGestureActivated(const HbWidget*) instead. + Called when the engine receives a touch gesture event with more than one finger from the feedback manager. \param widget the widget being interacted with @@ -430,6 +439,16 @@ } /*! + Called when the engine receives a touch gesture event with more than one finger from the feedback manager. + + \param widget the widget being interacted with +*/ +void HbFeedbackEngine::advancedGestureActivated(const HbWidget *widget) +{ + Q_UNUSED(widget); +} + +/*! Called when the engine receives a continuous interaction event from the feedback manager. \param widget the widget being interacted with