diff -r 603911b3f166 -r 8c57b70b4bf3 tactilefeedback/tactilefeedbackresolver/plugins/tactilevibraplugin/src/tactilevibraplayer.cpp --- a/tactilefeedback/tactilefeedbackresolver/plugins/tactilevibraplugin/src/tactilevibraplayer.cpp Fri Mar 19 09:35:13 2010 +0200 +++ b/tactilefeedback/tactilefeedbackresolver/plugins/tactilevibraplugin/src/tactilevibraplayer.cpp Fri Apr 16 15:15:56 2010 +0300 @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include "tactilefeedbackprivatecrkeys.h" #include "tactilefeedbacktrace.h" @@ -114,28 +114,26 @@ { case ETouchFeedbackBasic: // flow through case ETouchFeedbackBasicButton: // flow through - case ETouchFeedbackList: // flow through - case ETouchFeedbackBoundaryList: // flow through - case ETouchFeedbackSlider: // flow through - case ETouchFeedbackEdit: // flow through - case ETouchFeedbackSensitiveInput: + case ETouchFeedbackBasicItem: // flow through + case ETouchFeedbackBounceEffect: // flow through + case ETouchFeedbackBasicSlider: // flow through + case ETouchFeedbackEditor: // flow through + case ETouchFeedbackSensitiveKeypad: case ETouchFeedbackLineSelection: // flow through case ETouchFeedbackBlankSelection: // flow through case ETouchFeedbackTextSelection: // flow through case ETouchFeedbackEmptyLineSelection: // flow through - case ETouchFeedbackTab: // flow through case ETouchFeedbackPopUp: // flow through - case ETouchFeedbackIncreasingPopUp: // flow through - case ETouchFeedbackDecreasingPopUp: // flow through - case ETouchFeedbackFlick: // flow through + case ETouchFeedbackPopupOpen: // flow through + case ETouchFeedbackPopupClose: // flow through + case ETouchFeedbackItemScroll: // flow through case ETouchFeedbackCheckbox: // flow through - case ETouchFeedbackCharacterInputButton: - case ETouchFeedbackMultiTouchRecognized: + case ETouchFeedbackMultitouchActivate: effectIndex = 0; break; case ETouchFeedbackSensitive: // flow through case ETouchFeedbackSensitiveButton: // flow through - case ETouchFeedbackSensitiveList: + case ETouchFeedbackSensitiveItem: effectIndex = 1; break; default: