diff -r e16d72588c28 -r 8a03a285ab14 omadrm/drmengine/roap/src/RegistrationReq.cpp --- a/omadrm/drmengine/roap/src/RegistrationReq.cpp Fri Mar 12 15:43:46 2010 +0200 +++ b/omadrm/drmengine/roap/src/RegistrationReq.cpp Mon Mar 15 12:41:43 2010 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES #include -#include "base64.h" +#include "Base64.h" #include "RegistrationReq.h" using namespace Roap; @@ -107,7 +107,7 @@ CRegistrationReq* CRegistrationReq::NewL() { CRegistrationReq* self = new( ELeave ) CRegistrationReq; - + CleanupStack::PushL( self ); self->ConstructL(); CleanupStack::Pop(); @@ -115,7 +115,7 @@ return self; } - + // Destructor CRegistrationReq::~CRegistrationReq() { @@ -176,7 +176,7 @@ } BufAppendL(b, KReqCertChainEnd); } - + if (iTrustedAuthorities.Count() > 0) { BufAppendL(b, KReqTrustedAuthorities); @@ -186,16 +186,16 @@ BufAppendBase64L(b, *iTrustedAuthorities[i]); BufAppendL(b, KReqTrustedRootEnd); } - BufAppendL(b, KReqTrustedAuthoritiesEnd); + BufAppendL(b, KReqTrustedAuthoritiesEnd); } - + if (iServerInfo) { BufAppendL(b, KReqServerInfo); BufAppendL(b, *iServerInfo); - BufAppendL(b, KReqServerInfoEnd); + BufAppendL(b, KReqServerInfoEnd); } - + if ((iDeviceDetailsManufacturer && iDeviceDetailsModel && iDeviceDetailsVersion) || @@ -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); } - + if (iDeviceDetailsManufacturer != NULL && iDeviceDetailsModel != NULL && iDeviceDetailsVersion != NULL) @@ -237,7 +237,7 @@ BufAppendL(b, *iDeviceDetailsVersion); BufAppendL(b, KReqDevDetailsEnd); } - + if ((iDeviceDetailsManufacturer && iDeviceDetailsModel && iDeviceDetailsVersion) || @@ -256,4 +256,4 @@ return r; } -// End of File +// End of File