diff -r e16d72588c28 -r 8a03a285ab14 inc/drmserviceapiwrapper.h --- a/inc/drmserviceapiwrapper.h Fri Mar 12 15:43:46 2010 +0200 +++ b/inc/drmserviceapiwrapper.h Mon Mar 15 12:41:43 2010 +0200 @@ -20,7 +20,7 @@ #define CDRMSERVICEAPIWRAPPER_H #include -#include "drmtypes.h" +#include "DRMTypes.h" /** * Environment gate function @@ -37,28 +37,28 @@ * Get the secure time * * @since S60 v3.2 - * @param aTime Output parameter containing the + * @param aTime Output parameter containing the * secure time in UTC. * @param aTimeZone Time zone information including summer/winter time * in +/- 15 minutes * @param aSecurityLevel Output parameter Securiry level. * @return Symbian OS error code if any. */ - virtual TInt GetSecureTime( TTime& aTime, + virtual TInt GetSecureTime( TTime& aTime, TInt& aTimeZone, DRMClock::ESecurityLevel& aSecurityLevel ) const = 0; - + /** * Update the secure time * * Requires DRM Capability * * @since S60 v3.2 - * @param aTime Input parameter containing the + * @param aTime Input parameter containing the * secure time in UTC. - * @param aTimeZone Time zone information including + * @param aTimeZone Time zone information including * summer/winter time - * in +/- 15 minutes + * in +/- 15 minutes * @return Symbian OS error code if any. */ virtual TInt UpdateSecureTime( const TTime& aTime, const TInt& aTimeZone ) = 0; @@ -89,13 +89,13 @@ }; -namespace DRM +namespace DRM { // forward declaration -class CDrmServiceApi; - - +class CDrmServiceApi; + + /** * Class for connecting to the WmDrmServer * @@ -118,28 +118,28 @@ * Get the secure time * * @since S60 v3.2 - * @param aTime Output parameter containing the + * @param aTime Output parameter containing the * secure time in UTC. * @param aTimeZone Time zone information including summer/winter time * in +/- 15 minutes * @param aSecurityLevel Output parameter Securiry level. * @return Symbian OS error code if any. */ - virtual TInt GetSecureTime( TTime& aTime, + virtual TInt GetSecureTime( TTime& aTime, TInt& aTimeZone, DRMClock::ESecurityLevel& aSecurityLevel ) const; - + /** * Update the secure time * * Requires DRM Capability * * @since S60 v3.2 - * @param aTime Input parameter containing the + * @param aTime Input parameter containing the * secure time in UTC. - * @param aTimeZone Time zone information including + * @param aTimeZone Time zone information including * summer/winter time - * in +/- 15 minutes + * in +/- 15 minutes * @return Symbian OS error code if any. */ virtual TInt UpdateSecureTime( const TTime& aTime, const TInt& aTimeZone ); @@ -167,7 +167,7 @@ * @leave Symbian OS error code */ virtual void SignL( const TDesC8& aHash, HBufC8*& aSignature ); - + protected: private: @@ -186,9 +186,9 @@ * Download manager session */ CDrmServiceApi* iServiceApi; - + }; - + } // namespace DRM - + #endif // CDRMSERVICEAPIWRAPPER_H