diff -r e16d72588c28 -r 8a03a285ab14 omadrm/drmengine/drmserviceapi/src/drmserviceapi.cpp --- a/omadrm/drmengine/drmserviceapi/src/drmserviceapi.cpp Fri Mar 12 15:43:46 2010 +0200 +++ b/omadrm/drmengine/drmserviceapi/src/drmserviceapi.cpp Mon Mar 15 12:41:43 2010 +0200 @@ -19,8 +19,8 @@ #include -#include "roapstorageclient.h" -#include "drmclockclient.h" +#include "RoapStorageClient.h" +#include "DRMClockClient.h" // ======== LOCAL FUNCTIONS ======== @@ -65,7 +65,7 @@ delete iClockClient; iClockClient = NULL; } - + // Roap storage client if( iRoapStorageClient ) { @@ -79,14 +79,14 @@ // CDrmServiceApi::GetSecureTime // --------------------------------------------------------------------------- // -EXPORT_C TInt DRM::CDrmServiceApi::GetSecureTime( - TTime& aTime, +EXPORT_C TInt DRM::CDrmServiceApi::GetSecureTime( + TTime& aTime, TInt& aTimeZone, DRMClock::ESecurityLevel& aSecurityLevel ) const { - return iClockClient->GetSecureTime( aTime, aTimeZone, aSecurityLevel); + return iClockClient->GetSecureTime( aTime, aTimeZone, aSecurityLevel); }; - + // --------------------------------------------------------------------------- // CDrmServiceApi::UpdateSecureTime // --------------------------------------------------------------------------- @@ -132,10 +132,10 @@ { // Create an instance of the clock client iClockClient = new (ELeave) RDRMClockClient; - + // Connect to the server User::LeaveIfError( iClockClient->Connect() ); - + // Create and instance of the roap storage client iRoapStorageClient = new (ELeave) Roap::RRoapStorageClient;