diff -r 21d2ab05f085 -r dee179edb159 commsfwtools/preparedefaultcommsdatabase/src/CommsDatValidator.cpp --- a/commsfwtools/preparedefaultcommsdatabase/src/CommsDatValidator.cpp Thu Jan 07 13:34:53 2010 +0200 +++ b/commsfwtools/preparedefaultcommsdatabase/src/CommsDatValidator.cpp Mon Jan 18 21:26:35 2010 +0200 @@ -1233,7 +1233,6 @@ // This might change, so is not included in the check at top of the function, when finding mapped AP records. // //static const TUint KAPToIAPTagMappingThreshold = 255; -static const TUint KAPToIAPRecordIdMappingConstant = 251; // TCleanupOperation function. // @@ -1398,8 +1397,6 @@ static_cast(CCDRecordBase::RecordFactoryL(KCDTIdAccessPointRecord)); CleanupStack::PushL(newAPRecord); - const TInt KBaseAPRecordId = KAPToIAPRecordIdMappingConstant - KThisIAPRecordId; - // ... and finally the link record // The clean up stack handling of 'pBearerType' seems a bit contorted. @@ -1431,7 +1428,7 @@ InitialiseAccessPointRecordL( *newAPRecord, tempName, - KBaseAPRecordId - KThisIAPRecordId, + KCDNewRecordRequest, KLinkAPTag, pBearerType->iTier, pBearerType->iMCpr,