diff -r 39d4c97df8cb -r 09b094b73eb8 tactilefeedback/tactilefeedbackresolver/plugins/tactilehapticsplugin/src/tactilehapticsplayer.cpp
--- a/tactilefeedback/tactilefeedbackresolver/plugins/tactilehapticsplugin/src/tactilehapticsplayer.cpp	Tue Aug 31 15:30:39 2010 +0300
+++ b/tactilefeedback/tactilefeedbackresolver/plugins/tactilehapticsplugin/src/tactilehapticsplayer.cpp	Wed Sep 01 12:23:25 2010 +0100
@@ -46,39 +46,36 @@
 _LIT8( KTFSensitive,            "TFSensitive");
 _LIT8( KTFBasicButton,          "TFBasicButton");
 _LIT8( KTFSensitiveButton,      "TFSensitiveButton");
-_LIT8( KTFBasicItem,            "TFBasicItem");             // Mapped to IVT file version 9.2
-_LIT8( KTFSensitiveItem,        "TFSensitiveItem");         // Mapped to IVT file version 9.2
-_LIT8( KTFBounceEffect,         "TFBounceEffect");          // Mapped to IVT file version 9.2
-_LIT8( KTFBasicSlider,          "TFBasicSlider");           // Mapped to IVT file version 9.2
-_LIT8( KTFEditor,               "TFEditor");                // Mapped to IVT file version 9.2
+_LIT8( KTFList,                 "TFList");
+_LIT8( KTFSensitiveList,        "TFSensitiveList");
+_LIT8( KTFBoundaryList,         "TFBoundaryList");
+_LIT8( KTFSlider,               "TFSlider");
+_LIT8( KTFEdit,                 "TFEdit");
 _LIT8( KTFLineSelection,        "TFLineSelection");
 _LIT8( KTFBlankSelection,       "TFBlankSelection");
 _LIT8( KTFTextSelection,        "TFTextSelection");
 _LIT8( KTFEmptyLineSelection,   "TFEmptyLineSelection");
+_LIT8( KTFTab,                  "TFTab");
 _LIT8( KTFPopUp,                "TFPopUp");
-_LIT8( KTFPopupOpen,            "TFPopupOpen");             // Mapped to IVT file version 9.2
-_LIT8( KTFPopupClose,           "TFPopupClose");            // Mapped to IVT file version 9.2
-_LIT8( KTFItemScroll,           "TFItemScroll");            // Mapped to IVT file version 9.2
+_LIT8( KTFIncreasingPopUp,      "TFIncreasingPopUp");
+_LIT8( KTFDecreasingPopUp,      "TFDecreasingPopUp");
+_LIT8( KTFFlick,                "TFFlick");
 _LIT8( KTFCheckbox,             "TFCheckbox");
-_LIT8( KTFBasicKeypad,          "TFBasicKeypad");           // Mapped to IVT file version 10.1
-_LIT8( KTFSensitiveKeypad,      "TFSensitiveKeypad");       // Mapped to IVT file version 9.2
-_LIT8( KTFMultitouchActivate,   "TFMultitouchActivate");    // Mapped to IVT file version 9.2
-_LIT8( KTFFlick,                "TFFlick");                 // Mapped to IVT file version 10.1
-_LIT8( KTFItemDrop,             "TFItemDrop");              // Mapped to IVT file version 10.1
-_LIT8( KTFItemMoveOver,         "TFItemMoveOver");          // Mapped to IVT file version 10.1
-_LIT8( KTFItemPick,             "TFItemPick");              // Mapped to IVT file version 10.1
-_LIT8( KTFMultipleCheckbox,     "TFMultipleCheckbox");      // Mapped to IVT file version 10.1
-_LIT8( KTFRotateStep,           "TFRotateStep");            // Mapped to IVT file version 10.1
-_LIT8( KTFSensitiveSlider,      "TFSensitiveSlider");       // Mapped to IVT file version 10.1
-_LIT8( KTFStopFlick,            "TFStopFlick");             // Mapped to IVT file version 10.1
-_LIT8( KTFLongPress,              "TFLongPress");               // Mapped to IVT file version 10.1
+_LIT8( KTFSensitiveInput,       "TFSensitiveInput");
+_LIT8( KTFCharacterInputButton, "TFCharacterInputButton");
+_LIT8( KTFOptionsMenuOpened,    "TFOptionsMenuOpened");
+_LIT8( KTFOptionsMenuClosed,    "TFOptionsMenuClosed");
+_LIT8( KTFSubMenuOpened,        "TFSubMenuOpened");
+_LIT8( KTFSubMenuClosed,        "TFSubMenuClosed");
+_LIT8( KTFLongTap,              "TFLongTap");
+_LIT8( KTFMultiTouchRecognized, "TFMultiTouchRecognized");
 
 // Continuous feedback's names
 _LIT8( KTFContinuousSmooth,     "TFContinuousSmooth");
 _LIT8( KTFContinuousSlider,     "TFContinuousSlider");
 _LIT8( KTFContinuousInput,      "TFContinuousInput");
-_LIT8( KTFContinuousPopup,      "TFContinuousPopup");       // Mapped to IVT file version 10.1
-_LIT8( KTFContinuousPinch,      "TFContinuousPinch");       // Mapped to IVT file version 10.1
+_LIT8( KTFContinuousFlick,      "TFContinuousFlick");
+_LIT8( KTFDynamicSlider,        "TFDynamicSlider");
 // ---------------------------------------------------------------------------
 // Constructor.
 // ---------------------------------------------------------------------------
@@ -124,7 +121,7 @@
     // profiles engine
     InitializeProfilesEngineL();
     
-    if ( iVibraLevel > EProfileTactileFeedbackLevel5 )
+    if ( iVibraLevel > EProfileTactileFeedbackLevel3 )
         {
         User::Leave( KErrGeneral );
         }
@@ -235,23 +232,20 @@
         case ETouchFeedbackSensitiveButton:
             name = KTFSensitiveButton;
             break;
-        case ETouchFeedbackBasicItem:
-            name = KTFBasicItem;
+        case ETouchFeedbackList:
+            name = KTFList;
             break;
-        case ETouchFeedbackSensitiveItem:
-            name = KTFSensitiveItem;
-            break;
-        case ETouchFeedbackBasicSlider:
-            name = KTFBasicSlider;
+        case ETouchFeedbackSensitiveList:
+            name = KTFSensitiveList;
             break;
-        case ETouchFeedbackSensitiveSlider:
-            name = KTFSensitiveSlider;
+        case ETouchFeedbackBoundaryList:
+            name = KTFBoundaryList;
             break;
-        case ETouchFeedbackBounceEffect:
-            name = KTFBounceEffect;
+        case ETouchFeedbackSlider:
+            name = KTFSlider;
             break;
-        case ETouchFeedbackEditor:
-            name = KTFEditor;
+        case ETouchFeedbackEdit:
+            name = KTFEdit;
             break;
         case ETouchFeedbackLineSelection:
             name = KTFLineSelection;
@@ -265,53 +259,47 @@
         case ETouchFeedbackEmptyLineSelection:
             name = KTFEmptyLineSelection;
             break;                        
+        case ETouchFeedbackTab:
+            name = KTFTab;
+            break;
         case ETouchFeedbackPopUp:  
             name = KTFPopUp;
             break; 
-       case ETouchFeedbackPopupOpen:
-            name = KTFPopupOpen;
+       case ETouchFeedbackIncreasingPopUp:
+            name = KTFIncreasingPopUp;
             break;     
-        case ETouchFeedbackPopupClose:
-            name = KTFPopupClose;
+        case ETouchFeedbackDecreasingPopUp:
+            name = KTFDecreasingPopUp;
             break;
-        case ETouchFeedbackItemScroll:
-            name = KTFItemScroll;
+        case ETouchFeedbackFlick:
+            name = KTFFlick;
             break;
         case ETouchFeedbackCheckbox:
             name = KTFCheckbox;
             break;
-        case ETouchFeedbackBasicKeypad:
-            name = KTFBasicKeypad;
+        case ETouchFeedbackSensitiveInput:
+            name = KTFSensitiveInput;
             break;
-        case ETouchFeedbackSensitiveKeypad:
-            name = KTFSensitiveKeypad;
+        case ETouchFeedbackCharacterInputButton:
+            name = KTFCharacterInputButton;
             break;
-        case ETouchFeedbackMultitouchActivate:
-            name = KTFMultitouchActivate;
+        case ETouchFeedbackOptionsMenuOpened:
+            name = KTFOptionsMenuOpened;
             break;
-        case ETouchFeedbackFlick:
-            name = KTFFlick;
-            break;
-        case ETouchFeedbackItemDrop:
-            name = KTFItemDrop;
+        case ETouchFeedbackOptionsMenuClosed:
+            name = KTFOptionsMenuClosed;
             break;
-        case ETouchFeedbackItemMoveOver:
-            name = KTFItemMoveOver;
+        case ETouchFeedbackSubMenuOpened:
+            name = KTFSubMenuOpened;
             break;
-        case ETouchFeedbackItemPick:
-            name = KTFItemPick;
-            break;
-        case ETouchFeedbackMultipleCheckbox:
-            name = KTFMultipleCheckbox;
+        case ETouchFeedbackSubMenuClosed:
+            name = KTFSubMenuClosed;
             break;
-        case ETouchFeedbackRotateStep:
-            name = KTFRotateStep;
+        case ETouchFeedbackLongTap:
+            name = KTFLongTap;
             break;
-        case ETouchFeedbackStopFlick:
-            name = KTFStopFlick;
-            break;
-        case ETouchFeedbackLongPress:
-            name = KTFLongPress;
+        case ETouchFeedbackMultiTouchRecognized:
+            name = KTFMultiTouchRecognized;
             break;
         default:
             User::Leave( KErrArgument );
@@ -347,12 +335,6 @@
         case EProfileTactileFeedbackLevel3:
             fileId = KTactileHapticsLevel3IVTFile;
             break;
-        case EProfileTactileFeedbackLevel4:
-            fileId = KTactileHapticsLevel4IVTFile;
-            break;
-        case EProfileTactileFeedbackLevel5:
-            fileId = KTactileHapticsLevel5IVTFile;
-            break;
         }
     return fileId;
     }
@@ -416,12 +398,12 @@
         case ETouchContinuousInput:
             name = KTFContinuousInput;
             break;
-        case ETouchContinuousPopup:
-            name = KTFContinuousPopup;
+        case ETouchContinuousFlick:
+            name = KTFContinuousFlick;
+            break;    
+        case ETouchDynamicSlider:
+            name = KTFDynamicSlider;
             break;
-        case ETouchContinuousPinch:
-            name = KTFContinuousPinch;
-            break;    
         default:
             ret = KErrArgument;
             break;
@@ -599,8 +581,6 @@
         case KTactileHapticsLevel1IVTFile:
         case KTactileHapticsLevel2IVTFile:
         case KTactileHapticsLevel3IVTFile:
-        case KTactileHapticsLevel4IVTFile:
-        case KTactileHapticsLevel5IVTFile:
             {
             TFileName ivtFile;
             iRepository.Get( aId, ivtFile );