diff -r e16d72588c28 -r 8a03a285ab14 omadrm/drmengine/roap/src/RightsReq.cpp --- a/omadrm/drmengine/roap/src/RightsReq.cpp Fri Mar 12 15:43:46 2010 +0200 +++ b/omadrm/drmengine/roap/src/RightsReq.cpp Mon Mar 15 12:41:43 2010 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES #include -#include "base64.h" +#include "Base64.h" #include "RightsReq.h" using namespace Roap; @@ -108,7 +108,7 @@ CRightsReq* CRightsReq::NewL() { CRightsReq* self = new( ELeave ) CRightsReq; - + CleanupStack::PushL( self ); self->ConstructL(); CleanupStack::Pop(); @@ -116,7 +116,7 @@ return self; } - + // Destructor CRightsReq::~CRightsReq() { @@ -197,7 +197,7 @@ } BufAppendL(b, KReqCertChainEnd); } - + if (iTransTrackIDs.Count() || iPeerKeyIdentifier.Length() || iOcspResponderKeyId || @@ -205,26 +205,26 @@ { BufAppendL(b, KReqExtensions); } - + if (iPeerKeyIdentifier.Length()) { BufAppendL(b, KReqPeerKey); BufAppendBase64L(b, iPeerKeyIdentifier); BufAppendL(b, KReqPeerKeyEnd); } - + if (iOcspInfoStored) { BufAppendL(b, KReqNoOcspResponse); } - + if (iOcspResponderKeyId) { BufAppendL(b, KReqOcspResponderKeyId); BufAppendBase64L(b, *iOcspResponderKeyId); BufAppendL(b, KReqOcspResponderKeyIdEnd); } - + for ( TInt i = 0; i < iTransTrackIDs.Count() && i < iContentIDs.Count(); i++ ) { BufAppendL(b, KReqTransactionContentId); @@ -234,7 +234,7 @@ BufAppendL(b, *iTransTrackIDs[i]); BufAppendL(b, KReqTransactionIdEnd); } - + if (iTransTrackIDs.Count() || iPeerKeyIdentifier.Length() || iOcspResponderKeyId || @@ -251,4 +251,4 @@ return r; } -// End of File +// End of File