--- a/adaptationlayer/tsy/nokiatsy_dll/src/cmmphonebookstoreoperationbase.cpp Wed Feb 17 13:58:55 2010 +0200
+++ b/adaptationlayer/tsy/nokiatsy_dll/src/cmmphonebookstoreoperationbase.cpp Wed Apr 21 14:29:55 2010 +0300
@@ -26,10 +26,6 @@
#include "cmmuiccmesshandler.h"
#include "cmmstaticutility.h"
-#ifdef INTERNAL_RD_USIM_PHONEBOOK_GAS_AND_AAS
-#include "cmmphonebookalphastring.h"
-#endif // INTERNAL_RD_USIM_PHONEBOOK_GAS_AND_AAS
-
#include "OstTraceDefinitions.h"
#ifdef OST_TRACE_COMPILER_IN_USE
#include "cmmphonebookstoreoperationbaseTraces.h"
@@ -101,45 +97,6 @@
}
// ---------------------------------------------------------------------------
-// CMmPhoneBookStoreOperationBase::PrepareReq
-// Prepares the operation (makes it ready to be launched).
-// ---------------------------------------------------------------------------
-//
-TInt CMmPhoneBookStoreOperationBase::PrepareReq(
- TInt /*aIpc*/,
- const CMmDataPackage* /*aDataPackage*/
- )
- {
-TFLOGSTRING("TSY: CMmPhoneBookStoreOperationBase::PrepareReq - not supported");
-OstTrace0( TRACE_NORMAL, DUP3_CMMPHONEBOOKSTOREOPERATIONBASE_PREPAREREQ, "CMmPhoneBookStoreOperationBase::PrepareReq - not supported" );
- return KErrNotSupported;
- }
-
-// ---------------------------------------------------------------------------
-// CMmPhoneBookStoreOperationBase::IsPrepared
-// Checks if operation is ready to be launched.
-// ---------------------------------------------------------------------------
-//
-TBool CMmPhoneBookStoreOperationBase::IsPrepared() const
- {
-TFLOGSTRING("TSY: CMmPhoneBookStoreOperationBase::IsPrepared");
-OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREOPERATIONBASE_ISPREPARED, "CMmPhoneBookStoreOperationBase::IsPrepared" );
- return EFalse;
- }
-
-// ---------------------------------------------------------------------------
-// CMmPhoneBookStoreOperationBase::LaunchReq
-// Launches activated operation.
-// ---------------------------------------------------------------------------
-//
-TInt CMmPhoneBookStoreOperationBase::LaunchReq()
- {
-TFLOGSTRING("TSY: CMmPhoneBookStoreOperationBase::LaunchReq - not supported");
-OstTrace0( TRACE_NORMAL, DUP3_CMMPHONEBOOKSTOREOPERATIONBASE_LAUNCHREQ, "CMmPhoneBookStoreOperationBase::LaunchReq - not supported" );
- return KErrNotSupported;
- }
-
-// ---------------------------------------------------------------------------
// CMmPhoneBookStoreOperationBase::CompleteReq
// Completes the request.
// ---------------------------------------------------------------------------
@@ -408,221 +365,6 @@
return index;
}
-
-// ---------------------------------------------------------------------------
-// CMmPhoneBookStoreOperationBase::GetTransId
-// Converts client phonebook type to internal phonebook mask
-// needds to be remove after dynamis transaction ID allocation
-// ---------------------------------------------------------------------------
-//
-TUint8 CMmPhoneBookStoreOperationBase::GetTransId(
- const TName& aPBType, const TUint8 aOperation )
- {
-TFLOGSTRING("TSY: CMmPhoneBookStoreOperationBase::GetTransId");
-OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREOPERATIONBASE_GETTRANSID, "CMmPhoneBookStoreOperationBase::GetTransId" );
-
-
- TUint8 transId( 0 );
-
- if ( 0 == aPBType.CompareF( KETelIccAdnPhoneBook ) )
- {
- switch( aOperation)
- {
- case KOperationRead:
- {
- transId = ETrIdPbReadAdn;
- break;
- }
- case KOperationWrite:
- {
- //transId = ETrIdPbWriteAdn;
- break;
- }
- case KOperationDelete:
- {
- //transId = ETrIdPbDeleteAdn;
- break;
- }
- case KOperationDeleteAll:
- {
- //transId = ETrIdPbDeleteAllAdn;
- break;
- }
- case KOperationDeleteWrite:
- {
- //transId = ETrIdPbDeleteWriteAdn;
- break;
- }
- default:
- {
-TFLOGSTRING("TSY: CMmPhoneBookStoreOperationBase::GetTransId - NO operation supported for ADN PhoneBook");
-OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKSTOREOPERATIONBASE_GETTRANSID, "CMmPhoneBookStoreOperationBase::GetTransId - No Operation supported for ADN PhoneBook" );
- break;
- }
- }
- }
- else if ( 0 == aPBType.CompareF( KETelIccBdnPhoneBook ) )
- {
- }
- else if ( 0 == aPBType.CompareF( KETelIccSdnPhoneBook ) )
- {
- switch( aOperation)
- {
- case KOperationRead:
- {
- transId = ETrIdPbReadSdn;
- break;
- }
- case KOperationWrite:
- {
- //transId = ETrIdPbWriteSdn;
- break;
- }
- case KOperationDelete:
- {
- //transId = ETrIdPbDeleteSdn;
- break;
- }
- case KOperationDeleteAll:
- {
- //transId = ETrIdPbDeleteAllSdn;
- break;
- }
- case KOperationDeleteWrite:
- {
- //transId = ETrIdPbDeleteWriteSdn;
- break;
- }
- default:
- {
-TFLOGSTRING("TSY: CMmPhoneBookStoreOperationBase::GetTransId - NO operation supported for SDN PhoneBook ");
-OstTrace0( TRACE_NORMAL, DUP2_CMMPHONEBOOKSTOREOPERATIONBASE_GETTRANSID, "CMmPhoneBookStoreOperationBase::GetTransId - No operation supported for SDN PhoneBook" );
-
- }
- break;
- }
- }
- else if ( 0 == aPBType.CompareF( KETelIccFdnPhoneBook ) )
- {
- switch( aOperation)
- {
- case KOperationRead:
- {
- transId = ETrIdPbReadFdn;
- break;
- }
- case KOperationWrite:
- {
- //transId = ETrIdPbWriteFdn;
- break;
- }
- case KOperationDelete:
- {
- //transId = ETrIdPbDeleteFdn;
- break;
- }
- case KOperationDeleteAll:
- {
- //transId = ETrIdPbDeleteAllFdn;
- break;
- }
- case KOperationDeleteWrite:
- {
- //transId = ETrIdPbDeleteWriteFdn;
- break;
- }
- default:
- {
-TFLOGSTRING("TSY: CMmPhoneBookStoreOperationBase::GetTransId - NO operation supported for FDN PhoneBook ");
-OstTrace0( TRACE_NORMAL, DUP3_CMMPHONEBOOKSTOREOPERATIONBASE_GETTRANSID, "CMmPhoneBookStoreOperationBase::GetTransId - NO operation supported for FDN PhoneBook" );
-
- break;
- }
- }
- }
- else if ( 0 == aPBType.CompareF( KETelIccVoiceMailBox ) )
- {
- switch( aOperation)
- {
- case KOperationRead:
- {
- transId = ETrIdPbReadVmbx;
- break;
- }
- case KOperationWrite:
- {
- //transId = ETrIdPbWriteVmbx;
- break;
- }
- case KOperationDelete:
- {
- //transId = ETrIdPbDeleteVmbx;
- }
- break;
- case KOperationDeleteAll:
- {
- //transId = ETrIdPbDeleteAllVmbx;
- break;
- }
- case KOperationDeleteWrite:
- {
- //transId = ETrIdPbDeleteWriteVmbx;
- break;
- }
- default:
- {
-TFLOGSTRING("TSY: CMmPhoneBookStoreOperationBase::GetTransId - NO operation supported for VMBX PhoneBook ");
-OstTrace0( TRACE_NORMAL, DUP5_CMMPHONEBOOKSTOREOPERATIONBASE_GETTRANSID, "CMmPhoneBookStoreOperationBase::GetTransId - NO operation supported for VMBX Phonebook" );
- break;
- }
- }
- }
- else if ( 0 == aPBType.CompareF( KETelIccMbdnPhoneBook ) )
- {
- switch( aOperation)
- {
- case KOperationRead:
- {
- transId = ETrIdPbReadMbdn;
- break;
- }
- case KOperationWrite:
- {
- //transId = ETrIdPbWriteMbdn;
- break;
- }
- case KOperationDelete:
- {
- //transId = ETrIdPbDeleteMbdn;
- break;
- }
- case KOperationDeleteAll:
- {
- //transId = ETrIdPbDeleteAllMbdn;
- break;
- }
- case KOperationDeleteWrite:
- {
- //transId = ETrIdPbDeleteWriteMbdn;
- break;
- }
- default:
- {
-TFLOGSTRING("TSY: CMmPhoneBookStoreOperationBase::GetTransId - NO operation supported for MBDN PhoneBook ");
-OstTrace0( TRACE_NORMAL, DUP6_CMMPHONEBOOKSTOREOPERATIONBASE_GETTRANSID, "CMmPhoneBookStoreOperationBase::GetTransId - No operation supported for MBDN Phoenbook" );
- break;
- }
- }
- }
-
-TFLOGSTRING2("TSY: CMmPhoneBookStoreOperationBase::GetTransId : Get transaction id: %d", transId);
-OstTraceExt1( TRACE_NORMAL, DUP4_CMMPHONEBOOKSTOREOPERATIONBASE_GETTRANSID, "CMmPhoneBookStoreOperationBase::GetTransId;transId=%hhu", transId );
-
- return transId;
- }
-
-
-
// ---------------------------------------------------------------------------
// CMmPhoneBookStoreOperationBase::ConvertToPBname
// Converts internal phonebook mask to client phonebook type
@@ -683,71 +425,6 @@
}
-
-
-// ---------------------------------------------------------------------------
-// CMmPhoneBookStoreOperationBase::ConvertOperationToClientIPCType
-// Converts internal request mask to client ipc request.
-// ---------------------------------------------------------------------------
-//
-void CMmPhoneBookStoreOperationBase::ConvertOperationToClientIPCType(
- TInt& aDestination,
- const TUint8 aSource )
- {
-TFLOGSTRING2("TSY: CMmPhoneBookStoreOperationBase::ConvertOperationToClientIPCType - source: %d", aSource );
-OstTraceExt1( TRACE_NORMAL, CMMPHONEBOOKSTOREOPERATIONBASE_CONVERTOPERATIONTOCLIENTIPCTYPE, "CMmPhoneBookStoreOperationBase::ConvertOperationToClientIPCType;aSource=%hhu", aSource );
-
- switch( aSource )
- {
- case KOperationInit:
- {
- aDestination = EMmTsyPhoneBookStoreInitIPC;
- break;
- }
- case KOperationCache:
- {
- aDestination = EMmTsyPhoneBookStoreCacheIPC;
- break;
- }
- case KOperationRead:
- {
- aDestination = EMmTsyPhoneBookStoreReadIPC;
- break;
- }
- case KOperationWrite:
- case KOperationReWrite:
- {
- aDestination = EMmTsyPhoneBookStoreWriteIPC;
- break;
- }
- case KOperationDelete:
- case KOperationDeleteWrite:
- {
- aDestination = EMmTsyPhoneBookStoreDeleteIPC;
- break;
- }
- case KOperationDeleteAll:
- {
- aDestination = EMmTsyPhoneBookStoreDeleteAllIPC;
- break;
- }
- case KOperationGetMailBoxNumber:
- {
- aDestination = EMobilePhoneGetMailboxNumbers;
- break;
- }
- default: //KOperationUnknown
- {
-TFLOGSTRING("TSY: CMmPhoneBookStoreOperationBase::ConvertOperationToClientIPCType - Default case" );
-OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKSTOREOPERATIONBASE_CONVERTOPERATIONTOCLIENTIPCTYPE, "CMmPhoneBookStoreOperationBase::ConvertOperationToClientIPCType, Default case" );
- aDestination = KErrNotFound;
- break;
- }
- }
- }
-
-
-
// -----------------------------------------------------------------------------
// CMmPhoneBookOperationRead::EmptyEntryCheck
// Check for Entry is Empty or not