# HG changeset patch
# User Shabe Razvi <shaber@symbian.org>
# Date 1287497522 -3600
# Node ID 6da0c4c8b8400a7814944eac7662fc2334e15840
# Parent  f9a00adead4a451c7a8f71243051d408879a877e# Parent  9c9c77f57686e478cafe31357c6901f12734fd49
Merge workaround for Bug 3311 - hbfeedback fails to build due to missing enum ETouchFeedbackLongTap

diff -r 9c9c77f57686 -r 6da0c4c8b840 hapticsservices_plat/tacticon_api/inc/tacticon.hrh
--- a/hapticsservices_plat/tacticon_api/inc/tacticon.hrh	Mon Aug 23 14:45:47 2010 +0100
+++ b/hapticsservices_plat/tacticon_api/inc/tacticon.hrh	Tue Oct 19 15:12:02 2010 +0100
@@ -26,7 +26,14 @@
     ENoTacticon = 0,
     EPositiveTacticon,
     ENegativeTacticon,
-    ENeutralTacticon     
+    ENeutralTacticon,
+    EAlertTacticon,
+    EInformationTacticon,
+    ENewMessageTacticon,
+    ENewEmailTacticon,
+    ECalendarTacticon,
+    EClockTacticon,
+    ERingingToneTacticon
     };
 
 #endif // TACTICON_HRH
diff -r 9c9c77f57686 -r 6da0c4c8b840 sysdef_1_4_0.dtd
--- a/sysdef_1_4_0.dtd	Mon Aug 23 14:45:47 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
- <!ELEMENT SystemDefinition (systemModel?, build?)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (logicalset* | module*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  levels CDATA #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT logicalset (logicalsubset* | module* | unit* | package* | prebuilt*)*>
- <!ATTLIST logicalset name CDATA #REQUIRED>
- <!ELEMENT logicalsubset (module* | unit* | package* | prebuilt*)*>
- <!ATTLIST logicalsubset name CDATA #REQUIRED>
- <!ELEMENT module (component* | unit* | package* | prebuilt*)*>
- <!ATTLIST module
-  name CDATA #REQUIRED
-  level CDATA #IMPLIED>
- <!ELEMENT component (unit* | package* | prebuilt*)*>
- <!ATTLIST component name CDATA #REQUIRED>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  unitID ID #REQUIRED
-  name CDATA #REQUIRED
-  mrp CDATA #REQUIRED
-  filter CDATA #IMPLIED
-  bldFile CDATA #REQUIRED
-  priority CDATA #IMPLIED
-  contract CDATA #IMPLIED>
- <!ELEMENT package EMPTY>
- <!ATTLIST package
-  name CDATA #REQUIRED
-  mrp CDATA #REQUIRED
-  filter CDATA #IMPLIED
-  contract CDATA #IMPLIED>
- <!ELEMENT prebuilt EMPTY>
- <!ATTLIST prebuilt
-  name CDATA #REQUIRED
-  version CDATA #REQUIRED
-  late (Y|N) #IMPLIED
-  filter CDATA #IMPLIED
-  contract CDATA #IMPLIED>
- <!ELEMENT build (option* | target+ | targetList+ | unitList+ | configuration+)*>
- <!ELEMENT unitList (unitRef+)>
- <!ATTLIST unitList
-  name ID #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT unitRef EMPTY>
- <!ATTLIST unitRef unit IDREF #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
-  name ID #REQUIRED
-  abldTarget CDATA #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
-  name ID #REQUIRED
-  abldOption CDATA #REQUIRED
-  description CDATA #REQUIRED
-  enable (Y | N | y | n) #REQUIRED>
- <!ELEMENT configuration (unitListRef+ | layerRef+ | task+)*>
- <!ATTLIST configuration
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  filter CDATA #REQUIRED>
- <!ELEMENT task ( unitListRef* , (buildLayer | specialInstructions))>
- <!ELEMENT unitListRef EMPTY>
- <!ATTLIST unitListRef unitList IDREF #REQUIRED>
- <!ELEMENT layerRef EMPTY>
- <!ATTLIST layerRef layerName CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
-  command CDATA #REQUIRED
-  targetList IDREFS #IMPLIED
-  unitParallel (Y | N | y | n) #REQUIRED
-  targetParallel (Y | N | y | n) #IMPLIED>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
-  name CDATA #REQUIRED
-  cwd CDATA #REQUIRED
-  command CDATA #REQUIRED>  
diff -r 9c9c77f57686 -r 6da0c4c8b840 sysdef_1_5_1.dtd
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sysdef_1_5_1.dtd	Tue Oct 19 15:12:02 2010 +0100
@@ -0,0 +1,88 @@
+ <!ELEMENT SystemDefinition (systemModel?, build?)>
+ <!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED>
+ <!ELEMENT systemModel (layer+)>
+ <!ELEMENT layer (logicalset* | module*)*>
+ <!ATTLIST layer
+  name CDATA #REQUIRED
+  levels CDATA #IMPLIED
+  span CDATA #IMPLIED>
+ <!ELEMENT logicalset (logicalsubset* | module* | unit* | package* | prebuilt*)*>
+ <!ATTLIST logicalset name CDATA #REQUIRED>
+ <!ELEMENT logicalsubset (module* | unit* | package* | prebuilt*)*>
+ <!ATTLIST logicalsubset name CDATA #REQUIRED>
+ <!ELEMENT module (component* | unit* | package* | prebuilt*)*>
+ <!ATTLIST module
+  name CDATA #REQUIRED
+  level CDATA #IMPLIED>
+ <!ELEMENT component (unit* | package* | prebuilt*)*>
+ <!ATTLIST component name CDATA #REQUIRED>
+ <!ELEMENT unit EMPTY>
+ <!ATTLIST unit
+  unitID ID #REQUIRED
+  name CDATA #REQUIRED
+  mrp CDATA #REQUIRED
+  filter CDATA #IMPLIED
+  bldFile CDATA #REQUIRED
+  priority CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  proFile CDATA #IMPLIED
+  qmakeArgs CDATA #IMPLIED>
+ <!ELEMENT package EMPTY>
+ <!ATTLIST package
+  name CDATA #REQUIRED
+  mrp CDATA #REQUIRED
+  filter CDATA #IMPLIED
+  contract CDATA #IMPLIED>
+ <!ELEMENT prebuilt EMPTY>
+ <!ATTLIST prebuilt
+  name CDATA #REQUIRED
+  version CDATA #REQUIRED
+  late (Y|N) #IMPLIED
+  filter CDATA #IMPLIED
+  contract CDATA #IMPLIED>
+ <!ELEMENT build (option* | target+ | targetList+ | unitList+ | configuration+)*>
+ <!ELEMENT unitList (unitRef+)>
+ <!ATTLIST unitList
+  name ID #REQUIRED
+  description CDATA #REQUIRED>
+ <!ELEMENT unitRef EMPTY>
+ <!ATTLIST unitRef unit IDREF #REQUIRED>
+ <!ELEMENT targetList EMPTY>
+ <!ATTLIST targetList
+  name ID #REQUIRED
+  description CDATA #REQUIRED
+  target IDREFS #REQUIRED>
+ <!ELEMENT target EMPTY>
+ <!ATTLIST target
+  name ID #REQUIRED
+  abldTarget CDATA #REQUIRED
+  description CDATA #REQUIRED>
+ <!ELEMENT option EMPTY>
+ <!ATTLIST option
+  name ID #REQUIRED
+  abldOption CDATA #REQUIRED
+  description CDATA #REQUIRED
+  enable (Y | N | y | n) #REQUIRED>
+ <!ELEMENT configuration (unitListRef+ | layerRef+ | task+)*>
+ <!ATTLIST configuration
+  name ID #REQUIRED
+  description CDATA #REQUIRED
+  filter CDATA #REQUIRED>
+ <!ELEMENT task ( unitListRef* , (buildLayer | specialInstructions))>
+ <!ELEMENT unitListRef EMPTY>
+ <!ATTLIST unitListRef unitList IDREF #REQUIRED>
+ <!ELEMENT layerRef EMPTY>
+ <!ATTLIST layerRef layerName CDATA #REQUIRED>
+ <!ELEMENT buildLayer EMPTY>
+ <!ATTLIST buildLayer
+  command CDATA #REQUIRED
+  targetList IDREFS #IMPLIED
+  unitParallel (Y | N | y | n) #REQUIRED
+  targetParallel (Y | N | y | n) #IMPLIED>
+ <!ELEMENT specialInstructions EMPTY>
+ <!ATTLIST specialInstructions
+  name CDATA #REQUIRED
+  cwd CDATA #REQUIRED
+  command CDATA #REQUIRED>  
diff -r 9c9c77f57686 -r 6da0c4c8b840 tacticonserver/server/tacticonpluginfw/tacticonhapticsplugin/src/tacticonhapticsplayer.cpp
--- a/tacticonserver/server/tacticonpluginfw/tacticonhapticsplugin/src/tacticonhapticsplayer.cpp	Mon Aug 23 14:45:47 2010 +0100
+++ b/tacticonserver/server/tacticonpluginfw/tacticonhapticsplugin/src/tacticonhapticsplayer.cpp	Tue Oct 19 15:12:02 2010 +0100
@@ -30,11 +30,29 @@
 
 
 // Tacticons
-_LIT8( KPositiveTacticon,     "PositiveTacticon");
-_LIT8( KNegativeTacticon,     "NegativeTacticon");
+
+_LIT8( KPositiveTacticon,     "PositiveTacticon" );
+_LIT8( KNegativeTacticon,     "NegativeTacticon" );
 _LIT8( KNeutralTacticon,      "NeutralTacticon" );
-
-
+/*
+    _LIT8( KAlertTacticon,        "AlertTacticon" );
+    _LIT8( KInformationTacticon,  "InformationTacticon" );
+    _LIT8( KNewMessageTacticon,   "NewMessageTacticon" );
+    _LIT8( KNewEmailTacticon,     "NewEmailTacticon" );
+    _LIT8( KCalendarTacticon,     "CalendarTacticon" );
+    _LIT8( KClockTacticon,        "ClockTacticon" );
+    _LIT8( KRingingToneTacticon,  "RingingToneTacticon" );
+*/
+//  the tacticon names following are temporary mapped to NeutralTacticon,
+// they will be updated when the IVT files are ready.
+    _LIT8( KAlertTacticon,        "NeutralTacticon" );
+    _LIT8( KInformationTacticon,  "NeutralTacticon" );
+    _LIT8( KNewMessageTacticon,   "NeutralTacticon" );
+    _LIT8( KNewEmailTacticon,     "NeutralTacticon" );
+    _LIT8( KCalendarTacticon,     "NeutralTacticon" );
+    _LIT8( KClockTacticon,        "NeutralTacticon" );
+    _LIT8( KRingingToneTacticon,  "NeutralTacticon" );
+    
 // max length of tacticon names defined above
 const TInt KTacticonNameMaxLen = 128;
 
@@ -233,7 +251,28 @@
             break;
         case ENeutralTacticon:
             name = KNeutralTacticon;
-            break;                      
+            break;
+        case EAlertTacticon:
+            name = KAlertTacticon;
+            break;
+        case EInformationTacticon:
+            name = KInformationTacticon;
+            break;
+        case ENewMessageTacticon:
+            name = KNewMessageTacticon;
+            break;
+        case ENewEmailTacticon:
+            name = KNewEmailTacticon;
+            break;
+        case ECalendarTacticon:
+            name =KCalendarTacticon;
+            break;
+        case EClockTacticon:
+            name = KClockTacticon;
+            break;
+        case ERingingToneTacticon:
+            name = KRingingToneTacticon;
+            break;
         default:
             return;
         }
diff -r 9c9c77f57686 -r 6da0c4c8b840 tacticonserver/tacticonactionplugin/data/tacticon.rul
--- a/tacticonserver/tacticonactionplugin/data/tacticon.rul	Mon Aug 23 14:45:47 2010 +0100
+++ b/tacticonserver/tacticonactionplugin/data/tacticon.rul	Tue Oct 19 15:12:02 2010 +0100
@@ -1,59 +1,59 @@
-<script xmlns="http://www.nokia.com/ns/cep/script/1.0/"
-xmlns:cep="http://www.nokia.com/ns/cep/1.0/">
-    <if>
-        <equals>
-            <contextRef source='Sensor' type='Event.Proximity'/>
-            <string>Discernible</string>
-        </equals>
-        <actions>
-            <!-- Proximity notify  -->
-            <Tacticon Mode='PROXIMITY_ON'/>	
-        </actions>
-    </if>
-    <elseIf>
-        <equals>
-            <contextRef source='Sensor' type='Event.Proximity'/>
-            <string>Indiscernible</string>
-        </equals>
-        <actions>
-            <!-- Proximity notify  -->
-            <Tacticon Mode='PROXIMITY_OFF'/>	
-        </actions>
-    </elseIf>
-    <elseIf>
-        <equals>
-            <contextRef source='Call' type='State'/>
-            <string>Dialling</string>
-        </equals>
-        <actions>
-            <!-- Disable Tacticons -->
-            <Tacticon Mode='CALL_DIALLING'/>	
-        </actions>
-    </elseIf>
-    <elseIf>
-        <equals>
-            <contextRef source='Call' type='State'/>
-            <string>Connected</string>
-        </equals>
-        <actions>
-            <!-- Disable Tacticons -->
-            <Tacticon Mode='CALL_CONNECTED'/>	
-        </actions>
-    </elseIf>
-    <elseIf>
-        <or>
-            <equals>
-                <contextRef source='Call' type='State'/>
-                <string>None</string>
-            </equals>
-            <equals>
-                <contextRef source='Call' type='State'/>
-                <string>Disconnecting</string>
-            </equals>
-        </or>
-        <actions>
-            <!-- Enable Tacticons -->
-            <Tacticon Mode='CALL_DISCONNECTED'/>	
-        </actions>
-    </elseIf>
+<script xmlns="http://www.nokia.com/ns/cep/script/1.0/"
+xmlns:cep="http://www.nokia.com/ns/cep/1.0/">
+    <if>
+        <equals>
+            <contextRef source='Sensor' type='Event.Proximity'/>
+            <string>Discernible</string>
+        </equals>
+        <actions>
+            <!-- Proximity notify  -->
+            <Tacticon Mode='PROXIMITY_ON'/>	
+        </actions>
+    </if>
+    <elseIf>
+        <equals>
+            <contextRef source='Sensor' type='Event.Proximity'/>
+            <string>Indiscernible</string>
+        </equals>
+        <actions>
+            <!-- Proximity notify  -->
+            <Tacticon Mode='PROXIMITY_OFF'/>	
+        </actions>
+    </elseIf>
+    <elseIf>
+        <equals>
+            <contextRef source='Call' type='State'/>
+            <string>Dialling</string>
+        </equals>
+        <actions>
+            <!-- Disable Tacticons -->
+            <Tacticon Mode='CALL_DIALLING'/>	
+        </actions>
+    </elseIf>
+    <elseIf>
+        <equals>
+            <contextRef source='Call' type='State'/>
+            <string>Connected</string>
+        </equals>
+        <actions>
+            <!-- Disable Tacticons -->
+            <Tacticon Mode='CALL_CONNECTED'/>	
+        </actions>
+    </elseIf>
+    <elseIf>
+        <or>
+            <equals>
+                <contextRef source='Call' type='State'/>
+                <string>None</string>
+            </equals>
+            <equals>
+                <contextRef source='Call' type='State'/>
+                <string>Disconnecting</string>
+            </equals>
+        </or>
+        <actions>
+            <!-- Enable Tacticons -->
+            <Tacticon Mode='CALL_DISCONNECTED'/>	
+        </actions>
+    </elseIf>
 </script>
\ No newline at end of file
diff -r 9c9c77f57686 -r 6da0c4c8b840 tactilefeedback/tactilearearegistry/traces/tracebuilder.cache
--- a/tactilefeedback/tactilearearegistry/traces/tracebuilder.cache	Mon Aug 23 14:45:47 2010 +0100
+++ b/tactilefeedback/tactilearearegistry/traces/tracebuilder.cache	Tue Oct 19 15:12:02 2010 +0100
@@ -1,30 +1,30 @@
-<model>
-  <id>536917138</id>
-  <name>tactilearearegistry</name>
-  <group>
-    <id>64</id>
-    <name>TACTILE_PERFORMANCE</name>
-    <trace>
-      <text>e_TACTILE_REGISTRY_HIT_TEST 1</text>
-      <id>1</id>
-      <name>TACTILE_REGISTRY_HIT_TEST_1</name>
-      <location>
-        <file>../src/tactilearearegistry.cpp</file>
-        <line>238</line>
-        <class>CTactileAreaRegistry</class>
-        <function>HitTestPointerEvent</function>
-      </location>
-    </trace>
-    <trace>
-      <text>e_TACTILE_REGISTRY_HIT_TEST 0</text>
-      <id>2</id>
-      <name>TACTILE_REGISTRY_HIT_TEST_0</name>
-      <location>
-        <file>../src/tactilearearegistry.cpp</file>
-        <line>263</line>
-        <class>CTactileAreaRegistry</class>
-        <function>HitTestPointerEvent</function>
-      </location>
-    </trace>
-  </group>
-</model>
+<model>
+  <id>536917138</id>
+  <name>tactilearearegistry</name>
+  <group>
+    <id>64</id>
+    <name>TACTILE_PERFORMANCE</name>
+    <trace>
+      <text>e_TACTILE_REGISTRY_HIT_TEST 1</text>
+      <id>1</id>
+      <name>TACTILE_REGISTRY_HIT_TEST_1</name>
+      <location>
+        <file>../src/tactilearearegistry.cpp</file>
+        <line>238</line>
+        <class>CTactileAreaRegistry</class>
+        <function>HitTestPointerEvent</function>
+      </location>
+    </trace>
+    <trace>
+      <text>e_TACTILE_REGISTRY_HIT_TEST 0</text>
+      <id>2</id>
+      <name>TACTILE_REGISTRY_HIT_TEST_0</name>
+      <location>
+        <file>../src/tactilearearegistry.cpp</file>
+        <line>263</line>
+        <class>CTactileAreaRegistry</class>
+        <function>HitTestPointerEvent</function>
+      </location>
+    </trace>
+  </group>
+</model>
diff -r 9c9c77f57686 -r 6da0c4c8b840 tactilefeedback/tactileclickplugin/traces/tracebuilder.cache
--- a/tactilefeedback/tactileclickplugin/traces/tracebuilder.cache	Mon Aug 23 14:45:47 2010 +0100
+++ b/tactilefeedback/tactileclickplugin/traces/tracebuilder.cache	Tue Oct 19 15:12:02 2010 +0100
@@ -1,74 +1,74 @@
-<model>
-  <id>536917139</id>
-  <name>tactileclickplugin</name>
-  <group>
-    <id>64</id>
-    <name>TACTILE_PERFORMANCE</name>
-    <trace>
-      <text>e_TACTILE_CLICK_PLUGIN_PEN_EVENT 1</text>
-      <id>1</id>
-      <name>TACTILE_CLICK_PLUGIN_PEN_EVENT_1</name>
-      <location>
-        <file>../src/tactileclickplugin.cpp</file>
-        <line>134</line>
-        <class>CTactileClickPlugin</class>
-        <function>OtherEvent</function>
-      </location>
-    </trace>
-    <trace>
-      <text>e_TACTILE_CLICK_PLUGIN_PEN_EVENT 0</text>
-      <id>2</id>
-      <name>TACTILE_CLICK_PLUGIN_PEN_EVENT_0</name>
-      <location>
-        <file>../src/tactileclickplugin.cpp</file>
-        <line>161</line>
-        <class>CTactileClickPlugin</class>
-        <function>OtherEvent</function>
-      </location>
-    </trace>
-    <trace>
-      <text>e_TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_SERVER_API 1</text>
-      <id>3</id>
-      <name>TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_SERVER_API_1</name>
-      <location>
-        <file>../src/tactileclickplugin.cpp</file>
-        <line>242</line>
-        <class>CTactileClickPlugin</class>
-        <function>InstantFeedback</function>
-      </location>
-    </trace>
-    <trace>
-      <text>e_TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_SERVER_API 0</text>
-      <id>4</id>
-      <name>TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_SERVER_API_0</name>
-      <location>
-        <file>../src/tactileclickplugin.cpp</file>
-        <line>246</line>
-        <class>CTactileClickPlugin</class>
-        <function>InstantFeedback</function>
-      </location>
-    </trace>
-    <trace>
-      <text>e_TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_CLIENT_API 1</text>
-      <id>5</id>
-      <name>TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_CLIENT_API_1</name>
-      <location>
-        <file>../src/tactileclickplugin.cpp</file>
-        <line>343</line>
-        <class>CTactileClickPlugin</class>
-        <function>HandleImmediateFeedback</function>
-      </location>
-    </trace>
-    <trace>
-      <text>e_TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_CLIENT_API 0</text>
-      <id>6</id>
-      <name>TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_CLIENT_API_0</name>
-      <location>
-        <file>../src/tactileclickplugin.cpp</file>
-        <line>349</line>
-        <class>CTactileClickPlugin</class>
-        <function>HandleImmediateFeedback</function>
-      </location>
-    </trace>
-  </group>
-</model>
+<model>
+  <id>536917139</id>
+  <name>tactileclickplugin</name>
+  <group>
+    <id>64</id>
+    <name>TACTILE_PERFORMANCE</name>
+    <trace>
+      <text>e_TACTILE_CLICK_PLUGIN_PEN_EVENT 1</text>
+      <id>1</id>
+      <name>TACTILE_CLICK_PLUGIN_PEN_EVENT_1</name>
+      <location>
+        <file>../src/tactileclickplugin.cpp</file>
+        <line>134</line>
+        <class>CTactileClickPlugin</class>
+        <function>OtherEvent</function>
+      </location>
+    </trace>
+    <trace>
+      <text>e_TACTILE_CLICK_PLUGIN_PEN_EVENT 0</text>
+      <id>2</id>
+      <name>TACTILE_CLICK_PLUGIN_PEN_EVENT_0</name>
+      <location>
+        <file>../src/tactileclickplugin.cpp</file>
+        <line>161</line>
+        <class>CTactileClickPlugin</class>
+        <function>OtherEvent</function>
+      </location>
+    </trace>
+    <trace>
+      <text>e_TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_SERVER_API 1</text>
+      <id>3</id>
+      <name>TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_SERVER_API_1</name>
+      <location>
+        <file>../src/tactileclickplugin.cpp</file>
+        <line>242</line>
+        <class>CTactileClickPlugin</class>
+        <function>InstantFeedback</function>
+      </location>
+    </trace>
+    <trace>
+      <text>e_TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_SERVER_API 0</text>
+      <id>4</id>
+      <name>TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_SERVER_API_0</name>
+      <location>
+        <file>../src/tactileclickplugin.cpp</file>
+        <line>246</line>
+        <class>CTactileClickPlugin</class>
+        <function>InstantFeedback</function>
+      </location>
+    </trace>
+    <trace>
+      <text>e_TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_CLIENT_API 1</text>
+      <id>5</id>
+      <name>TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_CLIENT_API_1</name>
+      <location>
+        <file>../src/tactileclickplugin.cpp</file>
+        <line>343</line>
+        <class>CTactileClickPlugin</class>
+        <function>HandleImmediateFeedback</function>
+      </location>
+    </trace>
+    <trace>
+      <text>e_TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_CLIENT_API 0</text>
+      <id>6</id>
+      <name>TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_CLIENT_API_0</name>
+      <location>
+        <file>../src/tactileclickplugin.cpp</file>
+        <line>349</line>
+        <class>CTactileClickPlugin</class>
+        <function>HandleImmediateFeedback</function>
+      </location>
+    </trace>
+  </group>
+</model>
diff -r 9c9c77f57686 -r 6da0c4c8b840 tactilefeedback/tactilefeedbackclient/src/touchfeedbackimpl.cpp
--- a/tactilefeedback/tactilefeedbackclient/src/touchfeedbackimpl.cpp	Mon Aug 23 14:45:47 2010 +0100
+++ b/tactilefeedback/tactilefeedbackclient/src/touchfeedbackimpl.cpp	Tue Oct 19 15:12:02 2010 +0100
@@ -973,7 +973,8 @@
             
         if ( vibraEnabled || audioEnabled )
             {
-            TRACE4("CTouchFeedbackImpl::StartFeedback, type:=%d intensity:%d, timeout:%d", aType, aIntensity, aTimeout);
+            TRACE4("CTouchFeedbackImpl::StartFeedback, type:=%d intensity:%d, timeout:%d",
+                    aType, aIntensity, aTimeout.Int());
             TUint32 clientHandle = ClientHandle( aControl );
             iClient->StartFeedback( clientHandle, 
                                     aType, 
diff -r 9c9c77f57686 -r 6da0c4c8b840 tactilefeedback/tactilefeedbackclient/traces/tracebuilder.cache
--- a/tactilefeedback/tactilefeedbackclient/traces/tracebuilder.cache	Mon Aug 23 14:45:47 2010 +0100
+++ b/tactilefeedback/tactilefeedbackclient/traces/tracebuilder.cache	Tue Oct 19 15:12:02 2010 +0100
@@ -1,30 +1,30 @@
-<model>
-  <id>536917137</id>
-  <name>touchfeedback</name>
-  <group>
-    <id>64</id>
-    <name>TACTILE_PERFORMANCE</name>
-    <trace>
-      <text>e_TACTILE_CLIENT_INSTANT_FEEDBACK 1</text>
-      <id>1</id>
-      <name>TACTILE_CLIENT_INSTANT_FEEDBACK_1</name>
-      <location>
-        <file>../src/touchfeedbackclient.cpp</file>
-        <line>502</line>
-        <class>CTouchFeedbackClient</class>
-        <function>ImmediateFeedback</function>
-      </location>
-    </trace>
-    <trace>
-      <text>e_TACTILE_CLIENT_INSTANT_FEEDBACK 0</text>
-      <id>2</id>
-      <name>TACTILE_CLIENT_INSTANT_FEEDBACK_0</name>
-      <location>
-        <file>../src/touchfeedbackclient.cpp</file>
-        <line>509</line>
-        <class>CTouchFeedbackClient</class>
-        <function>ImmediateFeedback</function>
-      </location>
-    </trace>
-  </group>
-</model>
+<model>
+  <id>536917137</id>
+  <name>touchfeedback</name>
+  <group>
+    <id>64</id>
+    <name>TACTILE_PERFORMANCE</name>
+    <trace>
+      <text>e_TACTILE_CLIENT_INSTANT_FEEDBACK 1</text>
+      <id>1</id>
+      <name>TACTILE_CLIENT_INSTANT_FEEDBACK_1</name>
+      <location>
+        <file>../src/touchfeedbackclient.cpp</file>
+        <line>502</line>
+        <class>CTouchFeedbackClient</class>
+        <function>ImmediateFeedback</function>
+      </location>
+    </trace>
+    <trace>
+      <text>e_TACTILE_CLIENT_INSTANT_FEEDBACK 0</text>
+      <id>2</id>
+      <name>TACTILE_CLIENT_INSTANT_FEEDBACK_0</name>
+      <location>
+        <file>../src/touchfeedbackclient.cpp</file>
+        <line>509</line>
+        <class>CTouchFeedbackClient</class>
+        <function>ImmediateFeedback</function>
+      </location>
+    </trace>
+  </group>
+</model>
diff -r 9c9c77f57686 -r 6da0c4c8b840 tactilefeedback/tactilefeedbackresolver/data/10.1_TactileFeedbackLevel1_A.ivt
Binary file tactilefeedback/tactilefeedbackresolver/data/10.1_TactileFeedbackLevel1_A.ivt has changed
diff -r 9c9c77f57686 -r 6da0c4c8b840 tactilefeedback/tactilefeedbackresolver/data/10.1_TactileFeedbackLevel2_A.ivt
Binary file tactilefeedback/tactilefeedbackresolver/data/10.1_TactileFeedbackLevel2_A.ivt has changed
diff -r 9c9c77f57686 -r 6da0c4c8b840 tactilefeedback/tactilefeedbackresolver/data/10.1_TactileFeedbackLevel3_A.ivt
Binary file tactilefeedback/tactilefeedbackresolver/data/10.1_TactileFeedbackLevel3_A.ivt has changed
diff -r 9c9c77f57686 -r 6da0c4c8b840 tactilefeedback/tactilefeedbackresolver/data/10.1_TactileFeedbackLevel4_A.ivt
Binary file tactilefeedback/tactilefeedbackresolver/data/10.1_TactileFeedbackLevel4_A.ivt has changed
diff -r 9c9c77f57686 -r 6da0c4c8b840 tactilefeedback/tactilefeedbackresolver/data/10.1_TactileFeedbackLevel5_A.ivt
Binary file tactilefeedback/tactilefeedbackresolver/data/10.1_TactileFeedbackLevel5_A.ivt has changed
diff -r 9c9c77f57686 -r 6da0c4c8b840 tactilefeedback/tactilefeedbackresolver/src/tactilefeedbackresolver.cpp
diff -r 9c9c77f57686 -r 6da0c4c8b840 tactilefeedback/tactilefeedbackresolver/traces/tracebuilder.cache
--- a/tactilefeedback/tactilefeedbackresolver/traces/tracebuilder.cache	Mon Aug 23 14:45:47 2010 +0100
+++ b/tactilefeedback/tactilefeedbackresolver/traces/tracebuilder.cache	Tue Oct 19 15:12:02 2010 +0100
@@ -1,30 +1,30 @@
-<model>
-  <id>536917140</id>
-  <name>tactilefeedbackresolver</name>
-  <group>
-    <id>64</id>
-    <name>TACTILE_PERFORMANCE</name>
-    <trace>
-      <text>e_TACTILE_RESOLVER_PLAY_FEEDBACK 1</text>
-      <id>1</id>
-      <name>TACTILE_RESOLVER_PLAY_FEEDBACK_1</name>
-      <location>
-        <file>../src/tactilefeedbackresolver.cpp</file>
-        <line>158</line>
-        <class>CTactileFeedbackResolver</class>
-        <function>PlayFeedback</function>
-      </location>
-    </trace>
-    <trace>
-      <text>e_TACTILE_RESOLVER_PLAY_FEEDBACK 0</text>
-      <id>2</id>
-      <name>TACTILE_RESOLVER_PLAY_FEEDBACK_0</name>
-      <location>
-        <file>../src/tactilefeedbackresolver.cpp</file>
-        <line>183</line>
-        <class>CTactileFeedbackResolver</class>
-        <function>PlayFeedback</function>
-      </location>
-    </trace>
-  </group>
-</model>
+<model>
+  <id>536917140</id>
+  <name>tactilefeedbackresolver</name>
+  <group>
+    <id>64</id>
+    <name>TACTILE_PERFORMANCE</name>
+    <trace>
+      <text>e_TACTILE_RESOLVER_PLAY_FEEDBACK 1</text>
+      <id>1</id>
+      <name>TACTILE_RESOLVER_PLAY_FEEDBACK_1</name>
+      <location>
+        <file>../src/tactilefeedbackresolver.cpp</file>
+        <line>158</line>
+        <class>CTactileFeedbackResolver</class>
+        <function>PlayFeedback</function>
+      </location>
+    </trace>
+    <trace>
+      <text>e_TACTILE_RESOLVER_PLAY_FEEDBACK 0</text>
+      <id>2</id>
+      <name>TACTILE_RESOLVER_PLAY_FEEDBACK_0</name>
+      <location>
+        <file>../src/tactilefeedbackresolver.cpp</file>
+        <line>183</line>
+        <class>CTactileFeedbackResolver</class>
+        <function>PlayFeedback</function>
+      </location>
+    </trace>
+  </group>
+</model>