--- a/omadrm/drmengine/agentv2/inc/Oma2AgentAttributes.h	Tue Feb 02 00:21:44 2010 +0200
+++ b/omadrm/drmengine/agentv2/inc/Oma2AgentAttributes.h	Fri Apr 16 15:14:55 2010 +0300
@@ -22,10 +22,10 @@
 
 #include <caf/caftypes.h>
 #include <caf/virtualpathptr.h>
-#include <caf/AttributeSet.h>
-#include <caf/StringAttributeSet.h>
+#include <caf/attributeset.h>
+#include <caf/stringattributeset.h>
 #include "Oma2Agent.h"
-#include "Oma2Dcf.h"
+#include "oma2dcf.h"
 
 using namespace ContentAccess;
 
@@ -38,32 +38,32 @@
 */
 
 class TOma2AgentAttributes
-	{
+    {
 public:
-	static TInt GetAttribute(
-	    CDcfCommon& aDcfFile,
-	    TInt aAttribute, 
-	    const TVirtualPathPtr& aVirtualPath,
-	    RDRMRightsClient* aRightsClient = NULL);
-	    
-	static TInt GetAttributeSet(
-	    CDcfCommon& aDcfFile,
-	    RAttributeSet& aAttributeSet,
-	    const TVirtualPathPtr& aVirtualPath,
-	    RDRMRightsClient* aRightsClient = NULL);
-	    
-	static TInt GetStringAttribute(
-	    CDcfCommon& aDcfFile,
-	    TInt aAttribute,
-	    TDes& aValue,
-	    const TVirtualPathPtr& aVirtualPath,
-	    RDRMRightsClient* aRightsClient = NULL);
-	    
-	static TInt GetStringAttributeSet(
-	    CDcfCommon& aDcfFile,
-	    RStringAttributeSet& aStringAttributeSet,
-	    const TVirtualPathPtr& aVirtualPath,
-	    RDRMRightsClient* aRightsClient = NULL);
-	};
+    static TInt GetAttribute(
+        CDcfCommon& aDcfFile,
+        TInt aAttribute,
+        const TVirtualPathPtr& aVirtualPath,
+        RDRMRightsClient* aRightsClient = NULL);
+
+    static TInt GetAttributeSet(
+        CDcfCommon& aDcfFile,
+        RAttributeSet& aAttributeSet,
+        const TVirtualPathPtr& aVirtualPath,
+        RDRMRightsClient* aRightsClient = NULL);
+
+    static TInt GetStringAttribute(
+        CDcfCommon& aDcfFile,
+        TInt aAttribute,
+        TDes& aValue,
+        const TVirtualPathPtr& aVirtualPath,
+        RDRMRightsClient* aRightsClient = NULL);
+
+    static TInt GetStringAttributeSet(
+        CDcfCommon& aDcfFile,
+        RStringAttributeSet& aStringAttributeSet,
+        const TVirtualPathPtr& aVirtualPath,
+        RDRMRightsClient* aRightsClient = NULL);
+    };
 
 #endif // __Oma2AGENTATTRIBUTES_H__