idlehomescreen/xmluirendering/uiengine/src/xncontroladapterimpl.cpp
changeset 2 08c6ee43b396
parent 1 5315654608de
child 5 c743ef5928ba
--- a/idlehomescreen/xmluirendering/uiengine/src/xncontroladapterimpl.cpp	Thu Jan 07 12:39:41 2010 +0200
+++ b/idlehomescreen/xmluirendering/uiengine/src/xncontroladapterimpl.cpp	Mon Jan 18 20:10:36 2010 +0200
@@ -1152,7 +1152,7 @@
                 TRAP( error, tmpProperty = CXnProperty::NewL(
                     KNullDesC8,
                     tmpValue,
-                    aNode.UiEngine()->ODT()->DomDocument().StringPool() ); );
+                    *aNode.UiEngine()->ODT()->DomDocument().StringPool() ); );
                 if ( error != KErrNone )
                     {
                     delete tmpValue;
@@ -1335,7 +1335,7 @@
                 CXnProperty* tmpProperty = NULL;
                 TRAP( error, tmpProperty = CXnProperty::NewL(
                     KNullDesC8, tmpValue,
-                    aNode.UiEngine()->ODT()->DomDocument().StringPool() ); );
+                    *aNode.UiEngine()->ODT()->DomDocument().StringPool() ); );
                 if ( error != KErrNone )
                     {
                     delete tmpValue;
@@ -3107,7 +3107,7 @@
                 tmpProperty = CXnProperty::NewL(
                     KNullDesC8,
                     tmpValue,
-                    aNode.UiEngine()->ODT()->DomDocument().StringPool() );
+                *aNode.UiEngine()->ODT()->DomDocument().StringPool() );
                 CleanupStack::Pop( tmpValue );
                 TSize imageSize = returnValue->SizeInPixels();
                 CleanupStack::PushL( tmpProperty );
@@ -3206,7 +3206,7 @@
     CleanupStack::PushL( nameValue );
     nameValue->SetStringValueL( CXnDomPropertyValue::EString, aName );
     CXnProperty* name = CXnProperty::NewL( XnPropertyNames::action::KName,
-        nameValue, aUiEngine.ODT()->DomDocument().StringPool() );
+        nameValue, *aUiEngine.ODT()->DomDocument().StringPool() );
     CleanupStack::Pop( nameValue );
     CleanupStack::PushL( name );
     node->SetPropertyL( name );
@@ -3216,7 +3216,7 @@
     CleanupStack::PushL( valueValue );
     valueValue->SetStringValueL( CXnDomPropertyValue::EString, aValue );
     CXnProperty* value = CXnProperty::NewL( XnPropertyNames::action::KValue,
-        valueValue, aUiEngine.ODT()->DomDocument().StringPool() );
+        valueValue, *aUiEngine.ODT()->DomDocument().StringPool() );
     CleanupStack::Pop( valueValue );
     CleanupStack::PushL( value );
     node->SetPropertyL( value );
@@ -3249,7 +3249,7 @@
     CleanupStack::PushL( nameValue );
     nameValue->SetStringValueL( CXnDomPropertyValue::EString, aTriggerName );
     CXnProperty* name = CXnProperty::NewL( XnPropertyNames::action::trigger::KName,
-        nameValue, aUiEngine.ODT()->DomDocument().StringPool() );
+        nameValue, *aUiEngine.ODT()->DomDocument().StringPool() );
     CleanupStack::Pop( nameValue );
     CleanupStack::PushL( name );
     node->SetPropertyL( name );
@@ -3285,7 +3285,7 @@
     CleanupStack::PushL( nameValue );
     nameValue->SetStringValueL( CXnDomPropertyValue::EString, aTriggerName );
     CXnProperty* name = CXnProperty::NewL( XnPropertyNames::action::trigger::KName,
-        nameValue, aUiEngine.ODT()->DomDocument().StringPool() );
+        nameValue, *aUiEngine.ODT()->DomDocument().StringPool() );
     CleanupStack::Pop( nameValue );
     CleanupStack::PushL( name );
     node->SetPropertyL( name );
@@ -3535,7 +3535,7 @@
     CXnUiEngine& aUiEngine,
     const TDesC8& aDirection )
     {
-    CXnDomStringPool& sp( aUiEngine.ODT()->DomDocument().StringPool() );
+    CXnDomStringPool* sp( aUiEngine.ODT()->DomDocument().StringPool() );
 
     CXnNode* node = CXnNode::NewL();
     CleanupStack::PushL( node );
@@ -3558,7 +3558,7 @@
 
     CXnProperty* name = CXnProperty::NewL(
         XnPropertyNames::action::trigger::KName,
-        nameValue, sp );
+        nameValue, *sp );
 
     CleanupStack::Pop( nameValue );
     CleanupStack::PushL( name );
@@ -3573,7 +3573,7 @@
 
     CXnProperty* reason = CXnProperty::NewL(
         XnPropertyNames::action::trigger::name::swipe::KDirection,
-        reasonValue, sp );
+        reasonValue, *sp );
 
     CleanupStack::Pop( reasonValue );
 
@@ -4039,6 +4039,14 @@
                node->IsStateSet( XnPropertyNames::style::common::KFocus ) &&
                node->IsStateSet( XnPropertyNames::style::common::KPressedDown ) ) )
                 {
+#ifdef RD_TACTILE_FEEDBACK            
+                MTouchFeedback* feedback( MTouchFeedback::Instance() );
+                
+                if ( feedback )
+                    {
+                    feedback->InstantFeedback( ETouchFeedbackBasic );
+                    }
+#endif
                 node->SetStateL( XnPropertyNames::style::common::KActive );
                 }                      
             }