diff -r e16d72588c28 -r 8a03a285ab14 omadrm/drmhelper/src/ConsumeData.cpp --- a/omadrm/drmhelper/src/ConsumeData.cpp Fri Mar 12 15:43:46 2010 +0200 +++ b/omadrm/drmhelper/src/ConsumeData.cpp Mon Mar 15 12:41:43 2010 +0200 @@ -18,7 +18,7 @@ // INCLUDE FILES #include -#include "consumedata.h" +#include "ConsumeData.h" // LOCAL CONSTANTS AND MACROS @@ -32,34 +32,34 @@ CConsumeData::CConsumeData() : CBase() { } - + // ----------------------------------------------------------------------------- // CConsumeData::~ConsumeData // C++ default destructor // ----------------------------------------------------------------------------- -// +// CConsumeData::~CConsumeData() { // If the connection is still open call finish - if( iConnectionStatus && iContentURI8 ) + if( iConnectionStatus && iContentURI8 ) { - iRdb.Consume( ContentAccess::EStop, *iContentURI8 ); + iRdb.Consume( ContentAccess::EStop, *iContentURI8 ); } - + // Close the connection to the server: iRdb.Close(); - + // Reset the connection status iConnectionStatus = EFalse; - + // Delete the content id if( iContentURI8 ) { delete iContentURI8; - iContentURI8 = NULL; + iContentURI8 = NULL; } } - + // ----------------------------------------------------------------------------- // CConsumeData::NewLC @@ -73,7 +73,7 @@ self->ConstructL( aUri ); return self; } - + // ----------------------------------------------------------------------------- // CConsumeData::NewL // 2-phase constructor @@ -83,8 +83,8 @@ { CConsumeData* self = NewLC( aUri ); CleanupStack::Pop( self ); - return self; - } + return self; + } // ----------------------------------------------------------------------------- // CConsumeData::Consume @@ -93,21 +93,21 @@ TInt CConsumeData::Consume( const ContentAccess::TIntent& aIntent ) { TInt retVal = KErrNone; - + if( !iConnectionStatus ) { - return KErrNotReady; + return KErrNotReady; } - + retVal = iRdb.Consume( aIntent, *iContentURI8 ); if( aIntent == ContentAccess::EStop ) { iRdb.Close(); - iConnectionStatus = EFalse; + iConnectionStatus = EFalse; } - - return retVal; + + return retVal; } // ----------------------------------------------------------------------------- // CConsumeData::CompareUri @@ -117,9 +117,9 @@ { if( !iContentURI8 ) { - return KErrNotReady; + return KErrNotReady; } - + return iContentURI8->Des().Compare( aUri ); } @@ -135,9 +135,9 @@ // Set the connection status iConnectionStatus = ETrue; - + // copy the url for internal use - iContentURI8 = aUri.AllocL(); + iContentURI8 = aUri.AllocL(); } // ========================== OTHER EXPORTED FUNCTIONS =========================