diff -r e16d72588c28 -r 8a03a285ab14 omadrm/drmengine/ro/inc/DrmRel1_0StringDict00.h
--- a/omadrm/drmengine/ro/inc/DrmRel1_0StringDict00.h	Fri Mar 12 15:43:46 2010 +0200
+++ b/omadrm/drmengine/ro/inc/DrmRel1_0StringDict00.h	Mon Mar 15 12:41:43 2010 +0200
@@ -24,50 +24,50 @@
 
 #include <e32std.h>
 #include <stringpool.h>
-#include <Xml/Plugins/StringDictionary.h>
+#include <xml/plugins/stringdictionary.h>
 
 
 class CDrmRel1_0StringDict00 : public CBase, public Xml::MStringDictionary
 /**
-The DrmRel1_0StringDict00 class is a derived class defining the API of a single string dictionary. 
+The DrmRel1_0StringDict00 class is a derived class defining the API of a single string dictionary.
 
 Derived classes must add all elements, attributes names, and attribute values that belong
-to this string dictionary as static string tables to the StringPool. WBXML token mappings between 
+to this string dictionary as static string tables to the StringPool. WBXML token mappings between
 strings and WBXML tokens should also be maintained.
 
 @internalTechnology
 @interim This is the first drop of this component.
 */
-	{
+    {
 public:
-	static Xml::MStringDictionary* NewL(TAny* aStringPool);
-	virtual ~CDrmRel1_0StringDict00();
-	void ConstructL();
+    static Xml::MStringDictionary* NewL(TAny* aStringPool);
+    virtual ~CDrmRel1_0StringDict00();
+    void ConstructL();
 
-	void ElementL(TInt aToken, RString& aElement) const;
-	void AttributeL(TInt aToken, RString& aAttribute) const;
-	void AttributeValuePairL(TInt aToken, RString& aAttribute, RString& aValue) const;
-	void AttributeValueL(TInt aToken, RString& aValue) const;
+    void ElementL(TInt aToken, RString& aElement) const;
+    void AttributeL(TInt aToken, RString& aAttribute) const;
+    void AttributeValuePairL(TInt aToken, RString& aAttribute, RString& aValue) const;
+    void AttributeValueL(TInt aToken, RString& aValue) const;
 
-	TBool CompareThisDictionary(const RString& aDictionaryDescription) const;
+    TBool CompareThisDictionary(const RString& aDictionaryDescription) const;
 
-	TInt SwitchCodePage(TInt aCodePage);
-	void PublicIdentifier(RString& aPubId);
-	void NamespaceUri(RString& aUri);
+    TInt SwitchCodePage(TInt aCodePage);
+    void PublicIdentifier(RString& aPubId);
+    void NamespaceUri(RString& aUri);
 
-	void Release();
+    void Release();
 
 public:
 
-	// CodePage tokens.
-	//
-	// Note: There will be correlation between these token values and their
-	// strings via the CDictionaryCodePage using the RStringPool.
+    // CodePage tokens.
+    //
+    // Note: There will be correlation between these token values and their
+    // strings via the CDictionaryCodePage using the RStringPool.
 
-	enum TTagToken
+    enum TTagToken
         {
-		// CodePage 00
-		// -//OMA//DTD DRMREL 1.0//EN
+        // CodePage 00
+        // -//OMA//DTD DRMREL 1.0//EN
         ERights = 0x05,
         EContext = 0x06,
         EVersion = 0x07,
@@ -87,37 +87,37 @@
         EStart = 0x15,
         EEnd = 0x16,
         EInterval = 0x17
-    	};
+        };
 
 
-	enum TAttributeToken
+    enum TAttributeToken
         {
-		// CodePage 00
-		// -//OMA//DTD DRMREL 1.0//EN
+        // CodePage 00
+        // -//OMA//DTD DRMREL 1.0//EN
         EXmlnsOEx = 0x05,
         EXmlnsODd = 0x06,
         EXmlnsDs = 0x07
-    	};
+        };
 
 
 
-	enum TAttributeValueToken
+    enum TAttributeValueToken
         {
-		// CodePage 00
-		// -//OMA//DTD DRMREL 1.0//EN
+        // CodePage 00
+        // -//OMA//DTD DRMREL 1.0//EN
         EValueXmlnsOEx = 0x05,
         EValueXmlnsODd = 0x06,
         EValueXmlnsDs = 0x07,
         EOdrlEx = 0x85,
         EOdrlDd = 0x86,
         EXmlDsig = 0x87
-	    };
+        };
 
 
 
 private:
 
-	CDrmRel1_0StringDict00(RStringPool* aStringPool);
+    CDrmRel1_0StringDict00(RStringPool* aStringPool);
 
 private:
 
@@ -125,17 +125,17 @@
 The StringPool for this string dictionary.
 We don't own this.
 */
-	RStringPool				iStringPool;
+    RStringPool             iStringPool;
 
-	Xml::CDictionaryCodePage*	iCodepage00Table;
+    Xml::CDictionaryCodePage*   iCodepage00Table;
 
-	TInt					iCodePage;
+    TInt                    iCodePage;
 
-	};
+    };
 
 
-const TInt iTagCodePage00[] = 
-	{
+const TInt iTagCodePage00[] =
+    {
     CDrmRel1_0StringDict00::ERights,
     CDrmRel1_0StringDict00::EContext,
     CDrmRel1_0StringDict00::EVersion,
@@ -155,30 +155,30 @@
     CDrmRel1_0StringDict00::EStart,
     CDrmRel1_0StringDict00::EEnd,
     CDrmRel1_0StringDict00::EInterval,
-	0 // ok to end with zero as this is used by a global token
-    }; 
+    0 // ok to end with zero as this is used by a global token
+    };
 
 
-const TInt iAttributeCodePage00[] = 
-	{
+const TInt iAttributeCodePage00[] =
+    {
     CDrmRel1_0StringDict00::EXmlnsOEx,
     CDrmRel1_0StringDict00::EXmlnsODd,
     CDrmRel1_0StringDict00::EXmlnsDs,
-	0  // ok to end with zero as this is used by a global token
+    0  // ok to end with zero as this is used by a global token
     };
 
 
 
-const TInt iAttributeValueCodePage00[] = 
-	{
+const TInt iAttributeValueCodePage00[] =
+    {
     CDrmRel1_0StringDict00::EXmlnsOEx,
     CDrmRel1_0StringDict00::EXmlnsODd,
     CDrmRel1_0StringDict00::EXmlnsDs,
     CDrmRel1_0StringDict00::EOdrlEx,
     CDrmRel1_0StringDict00::EOdrlDd,
     CDrmRel1_0StringDict00::EXmlDsig,
-	0 // ok to end with zero as this is used by a global token
-    }; 
+    0 // ok to end with zero as this is used by a global token
+    };
 
 
 #endif //__SISTRINGDICT00_H__