FCL/sf/app/phone: comparison phoneapp/phoneuivoipextension/src/cphonecustomizationvoip.cpp

equal deleted inserted replaced

-:c84cf270c54f
+:92ab7f8d0eab
 #include <eikmenup.h>
 #include <spsettings.h>
 #include <spentry.h>
 #include <spproperty.h>
 #include <mpeengineinfo.h>
-#include <bmbubblemanager.h>
+// <-- QT PHONE START -->
-#include <phoneui.rsg>
+//#include <bmbubblemanager.h>
+// <-- QT PHONE END -->
+// <-- QT PHONE START -->
+//#include <phoneui.rsg>
+#include "phoneresourceids.h"
+//#include <phoneui.rsg>
+//#include <phoneuivoip.rsg>
+// <-- QT PHONE END -->
 #include <avkon.rsg>
-#include <phoneuivoip.rsg>
 #include <StringLoader.h>
 #include <featmgr.h>
 #include "cphonecustomizationvoip.h"
 #include "tphonecmdparaminteger.h"
 #include "cphoneviewcustomizationvoip.h"
 #include "cphonestateutilsvoip.h"
 #include "cphoneunattendedtransfercmdhandler.h"
 #include "tphonecmdparampointer.h"
 #include "cphonenewcallcmdhandler.h"
-#include "cphonevcchandler.h"
+// <-- QT PHONE START -->
+//#include "cphonevcchandler.h"
+// <-- QT PHONE END -->
 #include "cphonecallforwardqueryhandler.h"
 #include "cphonekeys.h"
 // CONSTANTS
 const TInt KMaxLengthForSIPURIFirstLine = 15;
 delete iCallForwardHandler;
 delete iExtensionHandler;
 delete iPhoneViewCustomization;
 delete iTransferCmdHandler;
 delete iNewCallCmdHandler;
-	delete iVccHandler;
+// <-- QT PHONE START -->
+//delete iVccHandler;
+// <-- QT PHONE END -->
 }
 // -----------------------------------------------------------
 // CPhoneCustomizationVoip::ConstructL()
 iTransferCmdHandler = CPhoneUnattendedTransferCmdHandler::NewL(
 iStateMachine, iViewCommandHandle );
 iNewCallCmdHandler = CPhoneNewCallCmdHandler::NewL(
 iStateMachine, iViewCommandHandle );
-if ( FeatureManager::FeatureSupported( KFeatureIdFfVoiceCallContinuity ) )
+// <-- QT PHONE START -->
+/*if ( FeatureManager::FeatureSupported( KFeatureIdFfVoiceCallContinuity ) )
 {
 iVccHandler = CPhoneVccHandler::NewL( iStateMachine, iViewCommandHandle );
-}
+}*/
+// <-- QT PHONE END -->
 iCallForwardHandler = CPhoneCallForwardQueryHandler::NewL(
 iStateMachine, iViewCommandHandle );
 }
 CleanupStack::PopAndDestroy( &menuItemArray );
 // Added HO menu items if needed
 AddHandoverMenuItemIfNeededL( aResourceId, *aMenuPane );
 if ( iViewCommandHandle.HandleCommandL(
 EPhoneViewGetNumberEntryIsVisibleStatus ) !=
 EPhoneViewResponseSuccess )
 {
 // Handle call menu without dialer/number entry
 // placed as a first line and CNAP-field is placed as a second line.
 // -----------------------------------------------------------
 //
 void CPhoneCustomizationVoip::ModifyCallHeaderTexts( TInt aCallId,
 TPhoneCmdParamCallHeaderData* aCommandParam,
-const TDesC& /*aInCallNumberText*/ )
+const TDesC& aInCallNumberText )
 {
 __LOGMETHODSTARTEND( PhoneUIVoIPExtension,
 "CPhoneCustomizationVoip::ModifyCallHeaderTexts" );
 MPEEngineInfo& engineInfo = *iStateMachine.PhoneEngineInfo();
 {
 const TBool contactInfoAvailable =
 engineInfo.RemoteName( aCallId ).Length() ||
 engineInfo.RemoteCompanyName( aCallId ).Length();
-if ( EPEStateRinging == aCommandParam->CallState() &&
+if ( !contactInfoAvailable )
-!contactInfoAvailable )
+{
-{
+if ( EPEStateRinging == aCommandParam->CallState() )
-if ( KNullDesC() != engineInfo.RemotePartyName( aCallId ) )
 {
-// Telephone UI specification, 4.2.1 Call identification:
+if ( KNullDesC() != engineInfo.RemotePartyName( aCallId ) )
-// display name is used as the CLI if available.
+{
-aCommandParam->SetCLIText(
+// Telephone UI specification, 4.2.1 Call identification:
-engineInfo.RemotePartyName( aCallId ),
+// display name is used as the CLI if available.
-CBubbleManager::ERight );
+// <-- QT PHONE START -->
-// use line reserved for CNAP to show SIP URI
+aCommandParam->SetCLIText(
-aCommandParam->SetCNAPText(
+engineInfo.RemotePartyName( aCallId ),
-engineInfo.RemotePhoneNumber( aCallId ),
+TPhoneCmdParamCallHeaderData::ERight );
-CBubbleManager::ERight );
+// <-- QT PHONE END -->
-}
+// use line reserved for CNAP to show SIP URI
-else if( KNullDesC() != engineInfo.RemotePhoneNumber( aCallId ) )
+aCommandParam->SetCNAPText(
-{
+engineInfo.RemotePhoneNumber( aCallId ),
-// Fit address to two rows if it doesnt fit to one
+// <-- QT PHONE START -->
-TBuf<KMaxLengthForSIPURI> sipURI;
+//                        CBubbleManager::ERight
-TBuf<KMaxLengthForSIPURI> sipURIDomainPart;
+TPhoneCmdParamCallHeaderData::ERight
-HandleURIFittingToCallBubble(
+// <-- QT PHONE END -->
-aCommandParam->CLIText(),
+);
-sipURI,
+}
-sipURIDomainPart );
+else
+{
-aCommandParam->SetCLIText( sipURI, CBubbleManager::ERight );
+TBuf<KMaxLengthForSIPURI> sipURI;
-aCommandParam->SetCNAPText(
+TBuf<KMaxLengthForSIPURI> sipURIDomainPart;
-sipURIDomainPart,
+HandleURIFittingToCallBubble(
-CBubbleManager::ERight );
+aCommandParam->CLIText(),
+sipURI,
+sipURIDomainPart );
+// <-- QT PHONE START -->
+aCommandParam->SetCLIText( sipURI, TPhoneCmdParamCallHeaderData::ERight );
+// <-- QT PHONE END -->
+aCommandParam->SetCNAPText( sipURIDomainPart,
+// <-- QT PHONE START -->
+//                        CBubbleManager::ERight );
+TPhoneCmdParamCallHeaderData::ERight );
+// <-- QT PHONE END -->
+}
 }
 else
 {
-// No address or display name specified
+if ( KNullDesC() == engineInfo.RemotePartyName( aCallId ) )
-// Do nothing
+{
+// Display name not available, set incall number text as a
+// CLI text. Text could be 'Call 1', 'Call 2', ...
+// <-- QT PHONE START -->
+aCommandParam->SetCLIText( aInCallNumberText,
+TPhoneCmdParamCallHeaderData::ERight );
+// <-- QT PHONE END -->
+// change clipping direction of CNAP text
+aCommandParam->SetCNAPText(
+aCommandParam->CNAPText(),
+// <-- QT PHONE START -->
+//                        CBubbleManager::ERight );
+TPhoneCmdParamCallHeaderData::ERight );
+// <-- QT PHONE END -->
+}
 }
-}
-else
-{
-// Change clipping direction
-aCommandParam->SetCLIText(
-aCommandParam->CLIText(),
-CBubbleManager::ERight );
-// Change clipping direction
-aCommandParam->SetCNAPText(
-aCommandParam->CNAPText(),
-CBubbleManager::ERight );
 }
 }
 }
 handled = ETrue;
 }
 break;
 case EPhoneCmdHandoverToGsm:
-iVccHandler->StartManualHandoverL( EPhoneVoIPWaitHandoverFromWlan );
+// <-- QT PHONE START -->
+//iVccHandler->StartManualHandoverL( EPhoneVoIPWaitHandoverFromWlan );
+// <-- QT PHONE END -->
 handled = ETrue;
 break;
 case EPhoneCmdHandoverToWlan:
-iVccHandler->StartManualHandoverL( EPhoneVoIPWaitHandoverFromGsm );
+// <-- QT PHONE START -->
+//iVccHandler->StartManualHandoverL( EPhoneVoIPWaitHandoverFromGsm );
+// <-- QT PHONE END -->
 handled = ETrue;
 break;
 default:
 {
 //
 TInt CPhoneCustomizationVoip::CustomizeSoftKeys()
 {
 __LOGMETHODSTARTEND( PhoneUIVoIPExtension,
 "CPhoneCustomizationVoip::CustomizeSoftKeys" );
 return CPhoneMainResourceResolver::Instance()->
 ResolveResourceID( EPhoneVoIPNumberAcqInternetSoftkey );
 }
 //
 TInt CPhoneCustomizationVoip::CustomizeCallHeaderText()
 {
 __LOGMETHODSTARTEND( PhoneUIVoIPExtension,
 "CPhoneCustomizationVoip::CustomizeCallHeaderText" );
 return EPhoneVoIPPrivateAddress;
 }
 // -----------------------------------------------------------
 // -----------------------------------------------------------
 // From class MPhoneButtonCustomization.
 // CPhoneCustomizationVoip::CustomizeTouchPaneButtons
 // -----------------------------------------------------------
 //
+// <-- QT PHONE START -->
 void CPhoneCustomizationVoip::CustomizeTouchPaneButtons(
-MBubbleTouchPaneInterface& aTouchPane )
+/*MBubbleTouchPaneInterface& aTouchPane*/ )
 {
 __LOGMETHODSTARTEND( PhoneUIVoIPExtension,
 "CPhoneCustomizationVoip::CustomizeTouchPaneButtons" );
-TRAPD( err, CustomizeTouchPaneUsingExtensionL( aTouchPane ) );
+/*TRAPD( err, CustomizeTouchPaneUsingExtensionL( aTouchPane ) );
 if ( KErrNone != err )
 {
 // Extension plugin didn't handle touch pane dimming.
 TInt buttonCount = aTouchPane.NumberOfButtonsInPane();
 }
 default:
 break;
 } // switch
 } // for
-}
+}*/
 }
+// <-- QT PHONE END -->
 // -----------------------------------------------------------
 // CPhoneCustomizationVoip::VoIPSupportedL
 // -----------------------------------------------------------
 //
 // -----------------------------------------------------------
 // CPhoneCustomizationVoip::CustomizeTouchPaneUsingExtensionL
 // -----------------------------------------------------------
 //
-void CPhoneCustomizationVoip::CustomizeTouchPaneUsingExtensionL(
+// <-- QT PHONE START -->
+/*void CPhoneCustomizationVoip::CustomizeTouchPaneUsingExtensionL(
 MBubbleTouchPaneInterface& aTouchPane )
 {
 __LOGMETHODSTARTEND( PhoneUIVoIPExtension,
 "CPhoneCustomizationVoip::CustomizeTouchPaneUsingExtensionL" );
 __PHONELOG( EBasic, PhoneUIVoIPExtension,
 "CPhoneCustomizationVoip::ModifyInCallMenuL() plugin exists" );
 CleanupStack::PopAndDestroy( &array );
-}
+}*/
+// <-- QT PHONE END -->
 // -----------------------------------------------------------
 // CPhoneCustomizationVoip::LaunchEnablingServiceNoteL
 // -----------------------------------------------------------
 //
 EPhoneVoIPEnablingServiceWaitNoteText ), serviceName ) );
 queryParam.SetDataText( &noteText );
 queryParam.SetDefaultCba( R_AVKON_SOFTKEYS_CANCEL );
-const TInt KEnableServiceTimeOutInSecs = 60;
+// <-- QT PHONE START -->
-queryParam.SetTimeOut( KEnableServiceTimeOutInSecs );
+const TInt KEnableServiceTimeOutInMilliSecs = 60000;
+queryParam.SetTimeOut( KEnableServiceTimeOutInMilliSecs );
+// <-- QT PHONE END -->
 // configure custom command mappings for user responses
 queryParam.SetCbaCommandMapping(
 EAknSoftkeyCancel, EPhoneCmdCancelServiceEnabling );
 queryParam.SetCbaCommandMapping(
 KErrCancel, EPhoneCmdCancelServiceEnabling );
 __LOGMETHODSTARTEND( PhoneUIVoIPExtension,
 "CPhoneCustomizationVoip::SendGlobalErrorNoteL" );
 __ASSERT_DEBUG( aResourceId, Panic( EPhoneCtrlParameterNotInitialized ) );
-	CPhoneState* phoneState =
+CPhoneState* phoneState =
 static_cast< CPhoneState* >( iStateMachine.State() );
 phoneState->SendGlobalErrorNoteL( aResourceId );
 }
 // ---------------------------------------------------------
 //  CPhoneCustomizationVoip::SendGlobalInfoNoteL
 // -----------------------------------------------------------
 // CPhoneCustomizationVoip::AddHandoverMenuItemIfNeededL
 // -----------------------------------------------------------
 //
-void CPhoneCustomizationVoip::AddHandoverMenuItemIfNeededL( TInt aResourceId,
+void CPhoneCustomizationVoip::AddHandoverMenuItemIfNeededL( TInt /*aResourceId*/,
-CEikMenuPane& aMenuPane )
+CEikMenuPane& /*aMenuPane*/ )
 {
 __LOGMETHODSTARTEND( PhoneUIVoIPExtension,
 "CPhoneCustomizationVoip::AddHandoverMenuItemIfNeededL" );
 // Menu items to be added
-if ( iVccHandler && AllowAlphaNumericMode() &&
+// <-- QT PHONE START -->
+/*if ( iVccHandler && AllowAlphaNumericMode() &&
 ( aResourceId == R_PHONEUI_CALLHANDLING_INCALL_OPTIONS_MENU ||
 aResourceId == R_PHONEUI_CALLWAITING_OPTIONS_MENU ||
 aResourceId == R_PHONEUI_ACTIVEANDHELDCALL_OPTIONS_MENU ||
 aResourceId == R_PHONEUI_ACTIVEANDHELDCONFCALL_OPTIONS_MENU ||
 aResourceId == R_PHONEUI_CALLACTIVEHELDANDWAITING_OPTIONS_MENU
 CleanupClosePushL( array );
 GetActiveCallArrayL( array );
 iVccHandler->AddHandoverMenuItemL( array, aResourceId, aMenuPane );
 CleanupStack::PopAndDestroy( &array );
-}
+}*/
-}
+// <-- QT PHONE END -->
+}
 // -----------------------------------------------------------
 // CPhoneCustomizationVoip::GetVoIPServiceIdsL
 // -----------------------------------------------------------
 //
 void CPhoneCustomizationVoip::GetVoIPServiceIdsL( RIdArray& aVoipServiceIds ) const
 property->GetValue( aServiceName );
 CleanupStack::PopAndDestroy( 2, settingsApi );
 }
 // -----------------------------------------------------------
 // CPhoneCustomizationVoip::PhoneNumberFromEntryLC
 // -----------------------------------------------------------
 //
 HBufC* CPhoneCustomizationVoip::PhoneNumberFromEntryLC() const

changeset 21	92ab7f8d0eab
parent 0	5f000ab63145
child 22	6bb1b21d2484