diff -r e16d72588c28 -r 8a03a285ab14 commondrm/drmutility/src/DrmUiHandlingImpl.cpp --- a/commondrm/drmutility/src/DrmUiHandlingImpl.cpp Fri Mar 12 15:43:46 2010 +0200 +++ b/commondrm/drmutility/src/DrmUiHandlingImpl.cpp Mon Mar 15 12:41:43 2010 +0200 @@ -27,7 +27,7 @@ // publish & subscribe #include -#include +#include #include // coeenv @@ -46,8 +46,8 @@ #include // launching embedded details view -#include -#include +#include +#include #include // character conversions @@ -61,11 +61,11 @@ #include // drm -#include +#include #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -77,21 +77,21 @@ #include "drmutilitycommon.h" #include "drmutilityui.h" -#include "drmuihandlingimpl.h" +#include "DrmUiHandlingImpl.h" #include "drmuihandlingdata.h" -#include "drmutilitydownloadmanager.h" +#include "DrmUtilityDownloadManager.h" #include "drmutilityinternaltypes.h" #include "drmuicheckrightsobserver.h" #include "drmutilitywmdrm.h" #include "drmutilitywmdrmwrapper.h" -#include "roapstorageclient.h" -#include "drmtypes.h" +#include "RoapStorageClient.h" +#include "DRMTypes.h" #include "drmsettingsplugininternalcrkeys.h" -#include "drmricontext.h" -#include "drmdomaincontext.h" - -#include "drmutilityinternalcrkeys.h" // Cenrep extension for OmaBased +#include "DRMRIContext.h" +#include "DRMDomainContext.h" + +#include "DrmUtilityInternalcrkeys.h" // Cenrep extension for OmaBased // CONSTANTS const TInt KCommandHandleErrorFile( 1 ); @@ -1612,12 +1612,12 @@ { permission = iOmaClient.GetActiveRightsL( aIntent, *aContentUri, reason ); - + if( !permission ) { User::Leave( KErrCANoPermission); //coverity check } - + CleanupStack::PushL( permission ); toplevel = permission->TopLevelConstraint();