phoneapp/phoneuicontrol/src/cphoneuicontroller.cpp
changeset 22 6bb1b21d2484
parent 21 92ab7f8d0eab
child 27 2f8f8080a020
--- a/phoneapp/phoneuicontrol/src/cphoneuicontroller.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuicontrol/src/cphoneuicontroller.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -69,11 +69,6 @@
     iSystemEventHandler = CPhoneSystemEventHandler::NewL( iStateMachine );
      // Create the remote control handler
     iRemoteControlHandler = CPhoneRemoteControlHandler::NewL( iStateMachine );
-    // Create the key event forwarder
-// <-- QT PHONE START --> 
-//    iKeyEventForwarder = CPhoneKeyEventForwarder::NewL( 
-//        CEikonEnv::Static()->EikAppUi()->ClientRect(), iStateMachine, aViewCommandHandle );
-// <-- QT PHONE END --> 
 
     TInt leaveCode( 0 );
     TInt retry( 0 );
@@ -159,9 +154,7 @@
     delete iSystemEventHandler;
     delete iEngineHandler;
     delete iKeyEventForwarder;
-// <-- QT PHONE START --> 
     delete iStateHandle;
-// <-- QT PHONE END --> 
     }
 
 // ---------------------------------------------------------
@@ -218,22 +211,22 @@
     const TKeyEvent& aKeyEvent,
     TEventCode aEventCode )
     {
-// <-- QT PHONE START --> 
-//    __ASSERT_DEBUG( iKeyEventForwarder, Panic( EPhoneCtrlInvariant ) );
-//    return iKeyEventForwarder->OfferKeyEventAfterControlStackL( 
-//                aKeyEvent,
-//                aEventCode );
-    if ( EEventKey == aEventCode )
+    if ( aEventCode == EEventKey )
         {
         iStateMachine->State()->HandleKeyMessageL( 
                         MPhoneKeyEvents::EPhoneKeyShortPress, 
                         TKeyCode( aKeyEvent.iCode ) );
         }
+    else if ( aEventCode == EEventLongPress )
+        {
+        iStateMachine->State()->HandleKeyMessageL( 
+                        MPhoneKeyEvents::EPhoneKeyLongPress, 
+                        TKeyCode( aKeyEvent.iCode ) );    
+        }
     
     iStateMachine->State()->HandleDtmfKeyToneL( aKeyEvent, aEventCode );
         
     return EKeyWasNotConsumed;
-// <-- QT PHONE END --> 
     }
 
 // ---------------------------------------------------------