phoneapp/phoneuicontrol/src/tphonecallheaderparam.cpp
changeset 22 6bb1b21d2484
parent 21 92ab7f8d0eab
child 51 f39ed5e045e0
equal deleted inserted replaced
21:92ab7f8d0eab 22:6bb1b21d2484
    41 TPhoneCallHeaderParam::TPhoneCallHeaderParam(
    41 TPhoneCallHeaderParam::TPhoneCallHeaderParam(
    42         MPhoneCallHeaderManagerUtility& aManagerUtility,
    42         MPhoneCallHeaderManagerUtility& aManagerUtility,
    43         MPhoneStateMachine& aStateMachine ) 
    43         MPhoneStateMachine& aStateMachine ) 
    44         : iManagerUtility ( aManagerUtility ),
    44         : iManagerUtility ( aManagerUtility ),
    45           iStateMachine ( aStateMachine ),
    45           iStateMachine ( aStateMachine ),
    46 // <-- QT PHONE START --> 
       
    47           iCallHeaderType ( EPECallTypeUninitialized ),
    46           iCallHeaderType ( EPECallTypeUninitialized ),
    48 // <-- QT PHONE END --> 
       
    49           iSetDivertIndication ( EFalse )
    47           iSetDivertIndication ( EFalse )
    50     {
    48     {
    51     }
    49     }
    52 
    50 
    53 // -----------------------------------------------------------
    51 // -----------------------------------------------------------
   155     
   153     
   156     if ( ( iStateMachine.PhoneEngineInfo()->RemotePhoneNumber( aCallId ).Length() ) && 
   154     if ( ( iStateMachine.PhoneEngineInfo()->RemotePhoneNumber( aCallId ).Length() ) && 
   157          ( !ContactInfoAvailable( aCallId ) ) )
   155          ( !ContactInfoAvailable( aCallId ) ) )
   158         {
   156         {
   159         // Set phonenumber/URI as the CLI text for the call header      
   157         // Set phonenumber/URI as the CLI text for the call header      
   160 // <-- QT PHONE START --> 
       
   161        aCallHeaderData->SetCLIText( iStateMachine.PhoneEngineInfo()->RemotePhoneNumber( aCallId ),
   158        aCallHeaderData->SetCLIText( iStateMachine.PhoneEngineInfo()->RemotePhoneNumber( aCallId ),
   162                  TPhoneCmdParamCallHeaderData::ELeft );
   159                  TPhoneCmdParamCallHeaderData::ELeft );
   163 // <-- QT PHONE END --> 
       
   164             
   160             
   165         // No contact name, use phonenumber when available.
   161         // No contact name, use phonenumber when available.
   166         aCallHeaderData->SetParticipantListCLI(
   162         aCallHeaderData->SetParticipantListCLI(
   167                 TPhoneCmdParamCallHeaderData::EPhoneParticipantCNAPText );
   163                 TPhoneCmdParamCallHeaderData::EPhoneParticipantCNAPText );
   168         }
   164         }
   169     else
   165     else
   170         {
   166         {
   171 // <-- QT PHONE START -->
       
   172 //        CBubbleManager::TPhoneClippingDirection cnapClippingDirection = CBubbleManager::ERight;
       
   173         TPhoneCmdParamCallHeaderData::TPhoneTextClippingDirection cnapClippingDirection = TPhoneCmdParamCallHeaderData::ERight;
   167         TPhoneCmdParamCallHeaderData::TPhoneTextClippingDirection cnapClippingDirection = TPhoneCmdParamCallHeaderData::ERight;
   174 // <-- QT PHONE END -->
       
   175         TBuf<KCntMaxTextFieldLength> remoteInfoText( KNullDesC );
   168         TBuf<KCntMaxTextFieldLength> remoteInfoText( KNullDesC );
   176  
   169  
   177         /*If call is Private/PayPhone call then IsCallPrivateOrPayPhone
   170         /*If call is Private/PayPhone call then IsCallPrivateOrPayPhone
   178         * will set SetIdentitySpecificCallHeaderData parameters therefore
   171         * will set SetIdentitySpecificCallHeaderData parameters therefore
   179         * there is no need to call GetRemoteInfoDataL.*/  
   172         * there is no need to call GetRemoteInfoDataL.*/  
   180         if ( !IsCallPrivateOrPayPhone( aCallId, remoteInfoText ) )
   173         if ( !IsCallPrivateOrPayPhone( aCallId, remoteInfoText ) )
   181             {
   174             {
   182             GetRemoteInfoDataL( aCallId, remoteInfoText );
   175             GetRemoteInfoDataL( aCallId, remoteInfoText );
   183 // <-- QT PHONE START -->
       
   184 //            cnapClippingDirection = CBubbleManager::ELeft;
       
   185             cnapClippingDirection = TPhoneCmdParamCallHeaderData::ELeft;
   176             cnapClippingDirection = TPhoneCmdParamCallHeaderData::ELeft;
   186 // <-- QT PHONE END -->
   177             }
   187             }
       
   188 // <-- QT PHONE START --> 
       
   189         aCallHeaderData->SetCLIText( remoteInfoText,  TPhoneCmdParamCallHeaderData::ERight );
   178         aCallHeaderData->SetCLIText( remoteInfoText,  TPhoneCmdParamCallHeaderData::ERight );
   190 // <-- QT PHONE END --> 
       
   191         aCallHeaderData->SetCNAPText( iStateMachine.PhoneEngineInfo()->RemotePhoneNumber( aCallId ), 
   179         aCallHeaderData->SetCNAPText( iStateMachine.PhoneEngineInfo()->RemotePhoneNumber( aCallId ), 
   192                 cnapClippingDirection );
   180                 cnapClippingDirection );
   193         }
   181         }
   194     
   182     
   195     SetCallerImage( aCallId, aCallHeaderData );
   183     SetCallerImage( aCallId, aCallHeaderData );
   242     aCallHeaderData->SetCallState( 
   230     aCallHeaderData->SetCallState( 
   243         iStateMachine.PhoneEngineInfo()->CallState( aCallId ) );
   231         iStateMachine.PhoneEngineInfo()->CallState( aCallId ) );
   244 
   232 
   245     // Set call header type            
   233     // Set call header type            
   246     aCallHeaderData->SetCallType( GetCallType( aCallId, aCallHeaderData ) );
   234     aCallHeaderData->SetCallType( GetCallType( aCallId, aCallHeaderData ) );
   247 // <-- QT PHONE START --> 
       
   248 //    aCallHeaderData->SetCallFlag( CallHeaderType() );
       
   249 // <-- QT PHONE END --> 
       
   250     
   235     
   251     // Set call header voice privacy status
   236     // Set call header voice privacy status
   252     aCallHeaderData->SetCiphering( 
   237     aCallHeaderData->SetCiphering( 
   253         iStateMachine.PhoneEngineInfo()->IsSecureCall( aCallId ) );
   238         iStateMachine.PhoneEngineInfo()->IsSecureCall( aCallId ) );
   254     aCallHeaderData->SetCipheringIndicatorAllowed( 
   239     aCallHeaderData->SetCipheringIndicatorAllowed( 
   273 
   258 
   274 // ---------------------------------------------------------------------------
   259 // ---------------------------------------------------------------------------
   275 //  TPhoneCallHeaderParam::GetCallType
   260 //  TPhoneCallHeaderParam::GetCallType
   276 // ---------------------------------------------------------------------------
   261 // ---------------------------------------------------------------------------
   277 //
   262 //
   278 // <-- QT PHONE START --> 
       
   279 TPECallType TPhoneCallHeaderParam::GetCallType( 
   263 TPECallType TPhoneCallHeaderParam::GetCallType( 
   280         const TInt aCallId,
   264         const TInt aCallId,
   281         TPhoneCmdParamCallHeaderData* aCallHeaderData )
   265         TPhoneCmdParamCallHeaderData* aCallHeaderData )
   282     {
   266     {
   283     __LOGMETHODSTARTEND(EPhoneControl, "TPhoneCallHeaderParam::GetCallType( ) ");
   267     __LOGMETHODSTARTEND(EPhoneControl, "TPhoneCallHeaderParam::GetCallType( ) ");
   295     __PHONELOG1( EBasic, EPhoneControl, 
   279     __PHONELOG1( EBasic, EPhoneControl, 
   296                 "TPhoneCallHeaderParam::GetCallType() - callType: %d ", 
   280                 "TPhoneCallHeaderParam::GetCallType() - callType: %d ", 
   297                 callType )
   281                 callType )
   298     return callType;
   282     return callType;
   299     }
   283     }
   300 // <-- QT PHONE END --> 
       
   301 
   284 
   302 // ---------------------------------------------------------------------------
   285 // ---------------------------------------------------------------------------
   303 //  TPhoneCallHeaderParam::SetCallHeaderType
   286 //  TPhoneCallHeaderParam::SetCallHeaderType
   304 // ---------------------------------------------------------------------------
   287 // ---------------------------------------------------------------------------
   305 //
   288 //
   306 // <-- QT PHONE START --> 
       
   307 void TPhoneCallHeaderParam::SetCallHeaderType( 
   289 void TPhoneCallHeaderParam::SetCallHeaderType( 
   308     TInt aCallHeaderType )
   290     TInt aCallHeaderType )
   309     {
   291     {
   310 // <-- QT PHONE END --> 
       
   311     __LOGMETHODSTARTEND(EPhoneControl, "TPhoneCallHeaderParam::SetCallHeaderType( ) ");
   292     __LOGMETHODSTARTEND(EPhoneControl, "TPhoneCallHeaderParam::SetCallHeaderType( ) ");
   312     iCallHeaderType = aCallHeaderType;
   293     iCallHeaderType = aCallHeaderType;
   313     __PHONELOG1( EBasic, EPhoneControl, 
   294     __PHONELOG1( EBasic, EPhoneControl, 
   314                     "TPhoneCallHeaderParam::SetCallHeaderType() - iCallHeaderType: %d ", 
   295                     "TPhoneCallHeaderParam::SetCallHeaderType() - iCallHeaderType: %d ", 
   315                     iCallHeaderType )
   296                     iCallHeaderType )
   317 
   298 
   318 // ---------------------------------------------------------------------------
   299 // ---------------------------------------------------------------------------
   319 //  TPhoneCallHeaderParam::CallHeaderType
   300 //  TPhoneCallHeaderParam::CallHeaderType
   320 // ---------------------------------------------------------------------------
   301 // ---------------------------------------------------------------------------
   321 //
   302 //
   322 // <-- QT PHONE START --> 
       
   323 TInt TPhoneCallHeaderParam::CallHeaderType() const
   303 TInt TPhoneCallHeaderParam::CallHeaderType() const
   324     {
   304     {
   325 // <-- QT PHONE END --> 
       
   326     __LOGMETHODSTARTEND(EPhoneControl, "TPhoneCallHeaderParam::CallHeaderType( ) ");
   305     __LOGMETHODSTARTEND(EPhoneControl, "TPhoneCallHeaderParam::CallHeaderType( ) ");
   327     __PHONELOG1( EBasic, EPhoneControl, 
   306     __PHONELOG1( EBasic, EPhoneControl, 
   328                         "TPhoneCallHeaderParam::CallHeaderType() - iCallHeaderType: %d ", 
   307                         "TPhoneCallHeaderParam::CallHeaderType() - iCallHeaderType: %d ", 
   329                         iCallHeaderType )
   308                         iCallHeaderType )
   330     return iCallHeaderType;            
   309     return iCallHeaderType;            
   366     if ( ( iStateMachine.PhoneEngineInfo()->RemotePhoneNumber( aCallId ).Length() ) && 
   345     if ( ( iStateMachine.PhoneEngineInfo()->RemotePhoneNumber( aCallId ).Length() ) && 
   367          ( !ContactInfoAvailable( aCallId ) ) && 
   346          ( !ContactInfoAvailable( aCallId ) ) && 
   368          ( !info.ShowNumber() ) )
   347          ( !info.ShowNumber() ) )
   369         {
   348         {
   370         // No contact info data available; use the phone number
   349         // No contact info data available; use the phone number
   371 // <-- QT PHONE START --> 
       
   372         aCallHeaderData->SetCLIText(
   350         aCallHeaderData->SetCLIText(
   373                 iStateMachine.PhoneEngineInfo()->RemotePhoneNumber( aCallId ),
   351                 iStateMachine.PhoneEngineInfo()->RemotePhoneNumber( aCallId ),
   374                 TPhoneCmdParamCallHeaderData::ELeft);
   352                 TPhoneCmdParamCallHeaderData::ELeft);
   375 // <-- QT PHONE END --> 
       
   376         
   353         
   377         // No contact name, use phonenumber when available.
   354         // No contact name, use phonenumber when available.
   378         aCallHeaderData->SetParticipantListCLI( 
   355         aCallHeaderData->SetParticipantListCLI( 
   379                 TPhoneCmdParamCallHeaderData::EPhoneParticipantCNAPText );
   356                 TPhoneCmdParamCallHeaderData::EPhoneParticipantCNAPText );
   380         }
   357         }
   387         * there is no need to call GetRemoteInfoDataL.*/        
   364         * there is no need to call GetRemoteInfoDataL.*/        
   388         if ( !IsCallPrivateOrPayPhone( aCallId, remoteInfoText ) )
   365         if ( !IsCallPrivateOrPayPhone( aCallId, remoteInfoText ) )
   389             {
   366             {
   390             GetRemoteInfoDataL( aCallId, remoteInfoText );
   367             GetRemoteInfoDataL( aCallId, remoteInfoText );
   391             }
   368             }
   392 // <-- QT PHONE START --> 
       
   393         aCallHeaderData->SetCLIText( remoteInfoText, TPhoneCmdParamCallHeaderData::ERight );
   369         aCallHeaderData->SetCLIText( remoteInfoText, TPhoneCmdParamCallHeaderData::ERight );
   394 // <-- QT PHONE END --> 
       
   395         }
   370         }
   396 
   371 
   397     // Fetch CNAP text and clipping direction
   372     // Fetch CNAP text and clipping direction
   398 // <-- QT PHONE START -->
       
   399 //    CBubbleManager::TPhoneClippingDirection cnapClippingDirection;
       
   400     TPhoneCmdParamCallHeaderData::TPhoneTextClippingDirection cnapClippingDirection;
   373     TPhoneCmdParamCallHeaderData::TPhoneTextClippingDirection cnapClippingDirection;
   401 //    GetCNAPText( aCallId, cnapText, &cnapClippingDirection );
       
   402     GetCNAPText( aCallId, cnapText, cnapClippingDirection );
   374     GetCNAPText( aCallId, cnapText, cnapClippingDirection );
   403 // <-- QT PHONE END -->
       
   404     
   375     
   405     // Set CNAP data 
   376     // Set CNAP data 
   406     aCallHeaderData->SetCNAPText( cnapText, cnapClippingDirection );
   377     aCallHeaderData->SetCNAPText( cnapText, cnapClippingDirection );
   407     
   378     
   408     // Set caller image 
   379     // Set caller image 
   416     
   387     
   417     // Set the call header CNAP data ( Contains possible CNAP name or received skype identification ).
   388     // Set the call header CNAP data ( Contains possible CNAP name or received skype identification ).
   418     if ( IsFeatureSupported( KTelephonyLVFlagUUS, aCallId ) )
   389     if ( IsFeatureSupported( KTelephonyLVFlagUUS, aCallId ) )
   419         {
   390         {
   420         aCallHeaderData->SetCNAPText( iStateMachine.PhoneEngineInfo()->RemotePartyName( aCallId ), 
   391         aCallHeaderData->SetCNAPText( iStateMachine.PhoneEngineInfo()->RemotePartyName( aCallId ), 
   421 // <-- QT PHONE START -->
       
   422 //                CBubbleManager::ERight );
       
   423                 TPhoneCmdParamCallHeaderData::ERight );
   392                 TPhoneCmdParamCallHeaderData::ERight );
   424 // <-- QT PHONE END -->
       
   425         }
   393         }
   426     }
   394     }
   427 
   395 
   428 // ---------------------------------------------------------------------------
   396 // ---------------------------------------------------------------------------
   429 //  TPhoneCallHeaderParam::GetCNAPText
   397 //  TPhoneCallHeaderParam::GetCNAPText
   430 // ---------------------------------------------------------------------------
   398 // ---------------------------------------------------------------------------
   431 //
   399 //
   432 void TPhoneCallHeaderParam::GetCNAPText( 
   400 void TPhoneCallHeaderParam::GetCNAPText( 
   433     const TInt aCallId,
   401     const TInt aCallId,
   434        TDes& aData, 
   402        TDes& aData, 
   435 // <-- QT PHONE START -->
       
   436 //       CBubbleManager::TPhoneClippingDirection& aDirection ) const
       
   437        TPhoneCmdParamCallHeaderData::TPhoneTextClippingDirection& aDirection ) const
   403        TPhoneCmdParamCallHeaderData::TPhoneTextClippingDirection& aDirection ) const
   438 // <-- QT PHONE START -->
       
   439     {
   404     {
   440     __LOGMETHODSTARTEND(EPhoneControl, "TPhoneCallHeaderParam::GetCNAPText( ) ");
   405     __LOGMETHODSTARTEND(EPhoneControl, "TPhoneCallHeaderParam::GetCNAPText( ) ");
   441     
   406     
   442     // Set clipping direction  
   407     // Set clipping direction  
   443 // <-- QT PHONE START -->
       
   444 //    aDirection = CBubbleManager::ERight;
       
   445     aDirection = TPhoneCmdParamCallHeaderData::ERight;
   408     aDirection = TPhoneCmdParamCallHeaderData::ERight;
   446 // <-- QT PHONE END -->
       
   447     
   409     
   448     // If it's not a private number show further info
   410     // If it's not a private number show further info
   449     if ( iStateMachine.PhoneEngineInfo()->RemotePhoneNumberType( aCallId ) != 
   411     if ( iStateMachine.PhoneEngineInfo()->RemotePhoneNumberType( aCallId ) != 
   450         EPEPrivateNumber )
   412         EPEPrivateNumber )
   451         {
   413         {
   456             {
   418             {
   457             // Use the phone number for the CNAP display
   419             // Use the phone number for the CNAP display
   458             aData.Copy( iStateMachine.PhoneEngineInfo()->RemotePhoneNumber( aCallId ) );
   420             aData.Copy( iStateMachine.PhoneEngineInfo()->RemotePhoneNumber( aCallId ) );
   459             
   421             
   460             // Clipping direction for non-private number
   422             // Clipping direction for non-private number
   461 // <-- QT PHONE START -->
       
   462 //            aDirection = CBubbleManager::ELeft;
       
   463             aDirection = TPhoneCmdParamCallHeaderData::ELeft;
   423             aDirection = TPhoneCmdParamCallHeaderData::ELeft;
   464 // <-- QT PHONE END -->
       
   465             }
   424             }
   466         }
   425         }
   467     }
   426     }
   468 
   427 
   469 // ---------------------------------------------------------------------------
   428 // ---------------------------------------------------------------------------
   507     TPhoneCmdParamCallHeaderData* aCallHeaderData )
   466     TPhoneCmdParamCallHeaderData* aCallHeaderData )
   508     {
   467     {
   509     __LOGMETHODSTARTEND(EPhoneControl, "TPhoneCallHeaderParam::SetDivertIndicatorToCallHeader( ) ");
   468     __LOGMETHODSTARTEND(EPhoneControl, "TPhoneCallHeaderParam::SetDivertIndicatorToCallHeader( ) ");
   510     if( iSetDivertIndication )
   469     if( iSetDivertIndication )
   511         {
   470         {
   512 // <-- QT PHONE START --> 
       
   513 //        aCallHeaderData->SetCallFlag( CBubbleManager::EDiverted );            
       
   514         aCallHeaderData->SetDiverted( ETrue );
   471         aCallHeaderData->SetDiverted( ETrue );
   515 // <-- QT PHONE END --> 
       
   516         }
   472         }
   517     
   473     
   518     if ( iStateMachine.PhoneEngineInfo()->CallALSLine( aCallId ) == CCCECallParameters::ECCELineTypeAux )
   474     if ( iStateMachine.PhoneEngineInfo()->CallALSLine( aCallId ) == CCCECallParameters::ECCELineTypeAux )
   519         {
   475         {
   520         __PHONELOG( EBasic, EPhoneControl, 
   476         __PHONELOG( EBasic, EPhoneControl, 
   608     __ASSERT_DEBUG( iStateMachine.PhoneEngineInfo(), Panic( EPhoneCtrlInvariant ) );
   564     __ASSERT_DEBUG( iStateMachine.PhoneEngineInfo(), Panic( EPhoneCtrlInvariant ) );
   609     TBuf<KCntMaxTextFieldLength> remoteInfoText( KNullDesC );
   565     TBuf<KCntMaxTextFieldLength> remoteInfoText( KNullDesC );
   610     
   566     
   611     // Set call header type
   567     // Set call header type
   612     GetCallType( aCallId, aCallHeaderData );
   568     GetCallType( aCallId, aCallHeaderData );
   613 // <-- QT PHONE START -->
       
   614     //aCallHeaderData->SetCallFlag( CallHeaderType() );
       
   615 // <-- QT PHONE END -->
       
   616     
   569     
   617     // Set CLI text for the call header
   570     // Set CLI text for the call header
   618     GetRemoteInfoDataL( aCallId, remoteInfoText );
   571     GetRemoteInfoDataL( aCallId, remoteInfoText );
   619     if ( remoteInfoText != KNullDesC )
   572     if ( remoteInfoText != KNullDesC )
   620         {
   573         {
   621 // <-- QT PHONE START --> 
       
   622         aCallHeaderData->SetCLIText( remoteInfoText, TPhoneCmdParamCallHeaderData::ERight );
   574         aCallHeaderData->SetCLIText( remoteInfoText, TPhoneCmdParamCallHeaderData::ERight );
   623 // <-- QT PHONE END --> 
       
   624         if ( IsCallPrivateOrPayPhone( aCallId, remoteInfoText ) )
   575         if ( IsCallPrivateOrPayPhone( aCallId, remoteInfoText ) )
   625             {
   576             {
   626 // <-- QT PHONE START --> 
       
   627 //            aCallHeaderData->SetCNAPText( remoteInfoText, CBubbleManager::ERight );
       
   628             aCallHeaderData->SetCNAPText( remoteInfoText, TPhoneCmdParamCallHeaderData::ERight );
   577             aCallHeaderData->SetCNAPText( remoteInfoText, TPhoneCmdParamCallHeaderData::ERight );
   629 // <-- QT PHONE END --> 
       
   630             }
   578             }
   631         else
   579         else
   632             {
   580             {
   633             aCallHeaderData->SetCNAPText( iStateMachine.PhoneEngineInfo()->
   581             aCallHeaderData->SetCNAPText( iStateMachine.PhoneEngineInfo()->
   634 // <-- QT PHONE START -->
       
   635 //                RemotePhoneNumber( aCallId ), CBubbleManager::ELeft );       
       
   636                 RemotePhoneNumber( aCallId ), TPhoneCmdParamCallHeaderData::ELeft );       
   582                 RemotePhoneNumber( aCallId ), TPhoneCmdParamCallHeaderData::ELeft );       
   637 // <-- QT PHONE END --> 
       
   638             }
   583             }
   639         }
   584         }
   640     else
   585     else
   641         {
   586         {
   642 // <-- QT PHONE START --> 
       
   643         aCallHeaderData->SetCLIText( 
   587         aCallHeaderData->SetCLIText( 
   644             iStateMachine.PhoneEngineInfo()->RemotePhoneNumber( aCallId ),
   588             iStateMachine.PhoneEngineInfo()->RemotePhoneNumber( aCallId ),
   645             TPhoneCmdParamCallHeaderData::ERight );
   589             TPhoneCmdParamCallHeaderData::ERight );
   646 // <-- QT PHONE END --> 
       
   647         }
   590         }
   648 
   591 
   649     // If KTelephonyLVFlagUUS is enabled it will over write RemotePartyName setting.
   592     // If KTelephonyLVFlagUUS is enabled it will over write RemotePartyName setting.
   650     // Contains possible CNAP name or received skype identification
   593     // Contains possible CNAP name or received skype identification
   651     if ( IsFeatureSupported( KTelephonyLVFlagUUS, aCallId ) )
   594     if ( IsFeatureSupported( KTelephonyLVFlagUUS, aCallId ) )
   654         remotePartyName.Copy( iStateMachine.PhoneEngineInfo()->RemotePartyName( aCallId ) );
   597         remotePartyName.Copy( iStateMachine.PhoneEngineInfo()->RemotePartyName( aCallId ) );
   655        
   598        
   656         if ( iStateMachine.PhoneEngineInfo()->CallState( aCallId ) == EPEStateRinging )
   599         if ( iStateMachine.PhoneEngineInfo()->CallState( aCallId ) == EPEStateRinging )
   657             {
   600             {
   658             // Set CNAP text  
   601             // Set CNAP text  
   659 // <-- QT PHONE START -->
       
   660 //            aCallHeaderData->SetCNAPText( remotePartyName, CBubbleManager::ERight );
       
   661             aCallHeaderData->SetCNAPText( remotePartyName, TPhoneCmdParamCallHeaderData::ERight );
   602             aCallHeaderData->SetCNAPText( remotePartyName, TPhoneCmdParamCallHeaderData::ERight );
   662 // <-- QT PHONE END -->
       
   663             }
   603             }
   664         else
   604         else
   665             {
   605             {
   666 // <-- QT PHONE START --> 
       
   667             aCallHeaderData->SetCLIText( remotePartyName, TPhoneCmdParamCallHeaderData::ERight );
   606             aCallHeaderData->SetCLIText( remotePartyName, TPhoneCmdParamCallHeaderData::ERight );
   668 // <-- QT PHONE END --> 
       
   669             }
   607             }
   670         }   
   608         }   
   671    
       
   672 // <-- QT PHONE START --> 
       
   673 //    aCallHeaderData->SetCallFlag( CallHeaderType() );
       
   674 // <-- QT PHONE END --> 
       
   675     
   609     
   676     // Set call header labels
   610     // Set call header labels
   677     SetCallHeaderTexts( 
   611     SetCallHeaderTexts( 
   678             aCallId, 
   612             aCallId, 
   679             aWaitingCall, 
   613             aWaitingCall, 
   783             }
   717             }
   784     else if ( idType == EPEPrivateNumber )
   718     else if ( idType == EPEPrivateNumber )
   785         {
   719         {
   786         // If call header has customized items and callheadertype is voip
   720         // If call header has customized items and callheadertype is voip
   787         // then load customized text.
   721         // then load customized text.
   788 // <-- QT PHONE START -->
       
   789         if ( ( iManagerUtility.Customization() ) && ( CallHeaderType() == EPECallTypeVoIP ) )
   722         if ( ( iManagerUtility.Customization() ) && ( CallHeaderType() == EPECallTypeVoIP ) )
   790 // <-- QT PHONE END -->
       
   791             {
   723             {
   792             // Display private address
   724             // Display private address
   793             iManagerUtility.LoadResource( aData, iManagerUtility.Customization()->CustomizeCallHeaderText() );
   725             iManagerUtility.LoadResource( aData, iManagerUtility.Customization()->CustomizeCallHeaderText() );
   794             }
   726             }
   795         else
   727         else