FCL/sf/mw/drm: comparison omadrm/drmengine/dcf/src/DcfCommon.cpp

equal deleted inserted replaced

-:79d62d1d7957
+:493788a4a8a4
 // INCLUDE FILES
 #include <e32base.h>
 #include <f32file.h>
 #include "DcfCommon.h"
 #include "Oma1Dcf.h"
-#include "Oma2Dcf.h"
+#include "oma2dcf.h"
 // ============================ MEMBER FUNCTIONS ===============================
 // -----------------------------------------------------------------------------
 // CDcfCommon::CDcfCommon
 //
 // -----------------------------------------------------------------------------
 //
 CDcfCommon::CDcfCommon():
 iData(NULL),
 iMimeType(NULL),
 {
 }
 // -----------------------------------------------------------------------------
 // CDcfCommon::ConstructL
 //
 // -----------------------------------------------------------------------------
 //
 void CDcfCommon::ConstructL(
 const RFile& aFile)
 {
 iFile.Size(iLength);
 }
 // -----------------------------------------------------------------------------
 // CDcfCommon::NewL
 //
 // -----------------------------------------------------------------------------
 //
 EXPORT_C CDcfCommon* CDcfCommon::NewL(
 const RFile& aFile)
 {
 return self;
 }
 // -----------------------------------------------------------------------------
 // CDcfCommon::NewL
 //
 // -----------------------------------------------------------------------------
 //
 EXPORT_C CDcfCommon* CDcfCommon::NewL(
 const TDesC& aFileName,
 RFs* aFs)
 {
 RFs* fs = NULL;
 RFile file;
 TInt r = KErrNone;
 CDcfCommon* self = NULL;
 if (aFs == NULL)
 {
 fs = new RFs();
 User::LeaveIfNull(fs);
 CleanupStack::PushL(fs);
 User::LeaveIfError(fs->Connect());
 }
 else
 {
 fs = aFs;
 }
-	r = file.Open(*fs, aFileName, EFileStream | EFileRead | EFileShareReadersOrWriters );
+r = file.Open(*fs, aFileName, EFileStream | EFileRead | EFileShareReadersOrWriters );
 if( r == KErrInUse )
 {
-	r = file.Open(*fs, aFileName, EFileStream | EFileRead | EFileShareAny);
+r = file.Open(*fs, aFileName, EFileStream | EFileRead | EFileShareAny);
-	    if (r == KErrInUse)
+if (r == KErrInUse)
-	        {
+{
-	    r = file.Open(*fs, aFileName, EFileStream | EFileRead |
+r = file.Open(*fs, aFileName, EFileStream | EFileRead |
-	        EFileShareReadersOnly);
+EFileShareReadersOnly);
-	        }
+}
 }
-	if(r == KErrNone)
+if(r == KErrNone)
-	    {
+{
-	    CleanupClosePushL(file);
+CleanupClosePushL(file);
-	    self = NewL(file);
+self = NewL(file);
-	    CleanupStack::PopAndDestroy();
+CleanupStack::PopAndDestroy();
-	    }
+}
 if (aFs == NULL)
 {
 fs->Close();
 CleanupStack::PopAndDestroy();
 return self;
 }
 // -----------------------------------------------------------------------------
 // CDcfCommon::NewL
 //
 // -----------------------------------------------------------------------------
 //
 EXPORT_C CDcfCommon::~CDcfCommon()
 {
 delete iData;
 }
 }
 // -----------------------------------------------------------------------------
 // CDcfCommon::
 //
 // -----------------------------------------------------------------------------
 //
 TInt CDcfCommon::CheckUniqueId(const TDesC& aUniqueId)
-	{
+{
-	if (aUniqueId.Compare(KDefaultContentObject) == 0)
+if (aUniqueId.Compare(KDefaultContentObject) == 0)
-	    {
+{
-	    return 0;
+return 0;
-	    }
+}
-	else
+else
-	    {
+{
-	    return KErrNotFound;
+return KErrNotFound;
-	    }
+}
-	}
+}
 //  End of File

changeset 23	493788a4a8a4
parent 0	95b198f216e5