diff -r e16d72588c28 -r 8a03a285ab14 omadrm/drmengine/ro/inc/DRMProtectedRoParser.h
--- a/omadrm/drmengine/ro/inc/DRMProtectedRoParser.h	Fri Mar 12 15:43:46 2010 +0200
+++ b/omadrm/drmengine/ro/inc/DRMProtectedRoParser.h	Mon Mar 15 12:41:43 2010 +0200
@@ -22,11 +22,11 @@
 
 //  INCLUDES
 #include <e32std.h>
-#include <Xml/Parser.h>
-#include <Xml/ContentHandler.h>
-#include <Xml/XmlParserErrors.h>
-#include <Xml/Attribute.h>
-#include "DrmRightsClient.h"
+#include <xml/parser.h>
+#include <xml/contenthandler.h>
+#include <xml/xmlparsererrors.h>
+#include <xml/attribute.h>
+#include "DRMRightsClient.h"
 
 using namespace Xml;
 
@@ -52,24 +52,24 @@
             EXmlParser,
             EWbxmlParser
             };
-            
+
         static const TInt KMaxElementCount = 40;
         static const TInt KMaxElementNesting = 16;
-        
+
     public:  // Constructors and destructor
-        
+
         /**
         * Two-phased constructor.
         */
         IMPORT_C static CDrmProtectedRoParser* NewL();
-        
+
         /**
         * Destructor.
         */
         IMPORT_C ~CDrmProtectedRoParser();
 
     public: // New functions
-        
+
         /**
         * ?member_description.
         * @since Series ?XX ?SeriesXX_version
@@ -83,7 +83,7 @@
         IMPORT_C void ParseAndStoreL(
             const TDesC8& aProtectedRo,
             RPointerArray<CDRMRights>& aResultRights);
-            
+
         IMPORT_C HBufC8* GetRiUrlL(
             const TDesC8& aProtectedRo);
 
@@ -99,7 +99,7 @@
         * From ?base_class ?member_description.
         * @param aDocParam Specifies the various parameters of the document.
         * @arg   aDocParam.iCharacterSetName The character encoding of the document.
-        * @param aErrorCode is the error code. 
+        * @param aErrorCode is the error code.
         *        If this is not KErrNone then special action may be required.
         */
         void OnStartDocumentL(
@@ -108,7 +108,7 @@
 
         /**
         * From ?base_class ?member_description.
-        * @param aErrorCode is the error code. 
+        * @param aErrorCode is the error code.
         *        If this is not KErrNone then special action may be required.
         */
         void OnEndDocumentL(
@@ -123,8 +123,8 @@
         */
         void OnStartElementL(
             const RTagInfo& aElement,
-            const RAttributeArray& aAttributes, 
-			TInt aErrorCode);
+            const RAttributeArray& aAttributes,
+            TInt aErrorCode);
 
         /**
         * From ?base_class ?member_description.
@@ -138,8 +138,8 @@
 
         /**
         * From ?base_class ?member_description.
-        * @param aBytes is the raw content data for the element. 
-        *        The client is responsible for converting the data to the 
+        * @param aBytes is the raw content data for the element.
+        *        The client is responsible for converting the data to the
         *        required character set if necessary.
         *        In some instances the content may be binary and must not be converted.
         * @param aErrorCode is the error code.
@@ -158,8 +158,8 @@
         */
         void OnStartPrefixMappingL(
             const RString& aPrefix,
-            const RString& aUri, 
-			TInt aErrorCode);
+            const RString& aUri,
+            TInt aErrorCode);
 
         /**
         * From ?base_class ?member_description.
@@ -200,8 +200,8 @@
         */
         void OnProcessingInstructionL(
             const TDesC8& aTarget,
-            const TDesC8& aData, 
-			TInt aErrorCode);
+            const TDesC8& aData,
+            TInt aErrorCode);
 
         /**
         * From ?base_class ?member_description.
@@ -218,7 +218,7 @@
 
         /**
         * From ?base_class ?member_description.
-        * @return				0 if no interface matching the uid is found.
+        * @return               0 if no interface matching the uid is found.
                 Otherwise, the this pointer cast to that interface.
         * @param aUid the uid identifying the required interface.
         */
@@ -226,7 +226,7 @@
             const TInt32 aUid);
 
     protected:  // New functions
-        
+
         /**
         * ?member_description.
         * @since Series ?XX ?SeriesXX_version
@@ -260,7 +260,7 @@
             const TDesC8& aData,
             TInt& aStart,
             TInt& aEnd);
-            
+
         /**
         * Handle a parsed domain RO which could not be added to the rights DB
         * because the device is not part of the domain.
@@ -272,13 +272,13 @@
             const TDesC8& aContentId,
             const TDesC8& aDomainRoData,
             CParsedProtectedRo* aDomainRo);
-            
+
         /**
         * Adds ROAP namespace URI to aProtectedRo if not already present
         * @since Series 60 3.0
         * @param aProtectedRo protected RO element
         * @return protected RO element, if namespace was not added NULL
-        */    
+        */
         HBufC8* CDrmProtectedRoParser::AddRoapNamespaceL(
             TDesC8& aProtectedRo ) const;
 
@@ -294,24 +294,24 @@
     private:  // Data
         // The XML parser
         CParser* iParser;
-        
+
         // Result of parsing the protected RO element
         CParsedProtectedRo* iRights;
-        
+
         // Expected element names
         RString iElements[KMaxElementCount];
-        
+
         // Parsing stack
         TInt iElementStack[KMaxElementNesting];
-        
+
         // Depth of the parsing stack
         TInt iElementStackDepth;
-        
+
         // Content between elements
         HBufC8* iContent;
 
     };
 
-#endif      // DRMPROTECTEDROPARSER_H   
-            
+#endif      // DRMPROTECTEDROPARSER_H
+
 // End of File