# HG changeset patch
# User hgs
# Date 1278437237 -19800
# Node ID 3a6baaa22be846cf1bd842517869b0fae4dda63a
# Parent  41f2cd9c3aa1d983821f997b614b95c5eb3bb582
201027_01

diff -r 41f2cd9c3aa1 -r 3a6baaa22be8 messagingfw/msgsrvnstore/server/loc/msgs.loc
--- a/messagingfw/msgsrvnstore/server/loc/msgs.loc	Tue Jun 29 22:21:20 2010 +0530
+++ b/messagingfw/msgsrvnstore/server/loc/msgs.loc	Tue Jul 06 22:57:17 2010 +0530
@@ -2,9 +2,9 @@
 * Copyright (c) 2000 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of the License "Symbian Foundation License v1.0"
+* under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
diff -r 41f2cd9c3aa1 -r 3a6baaa22be8 messagingfw/msgtest/testutils/caf2/test/TestAgent/testagentdata.h
--- a/messagingfw/msgtest/testutils/caf2/test/TestAgent/testagentdata.h	Tue Jun 29 22:21:20 2010 +0530
+++ b/messagingfw/msgtest/testutils/caf2/test/TestAgent/testagentdata.h	Tue Jul 06 22:57:17 2010 +0530
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -23,7 +23,7 @@
 #ifndef __TESTAGENTDATA_H__
 #define __TESTAGENTDATA_H__
 
-#include <caf/caf.h>
+#include <caf/cafplatform.h>
 #include <caf/agentinterface.h>
 #include "TestAgentFileInterface.h"
 
diff -r 41f2cd9c3aa1 -r 3a6baaa22be8 messagingfw/msgtest/testutils/caf2/test/TestAgent/testagentfactory.cpp
--- a/messagingfw/msgtest/testutils/caf2/test/TestAgent/testagentfactory.cpp	Tue Jun 29 22:21:20 2010 +0530
+++ b/messagingfw/msgtest/testutils/caf2/test/TestAgent/testagentfactory.cpp	Tue Jul 06 22:57:17 2010 +0530
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -13,7 +13,7 @@
 // Description:
 //
 
-#include <caf/caf.h>
+#include <caf/cafplatform.h>
 #include "testagentfactory.h"
 #include "testagentcontent.h"
 #include "testagentdata.h"
diff -r 41f2cd9c3aa1 -r 3a6baaa22be8 messagingfw/msgtest/testutils/caf2/test/TestAgent/testagentfactory.h
--- a/messagingfw/msgtest/testutils/caf2/test/TestAgent/testagentfactory.h	Tue Jun 29 22:21:20 2010 +0530
+++ b/messagingfw/msgtest/testutils/caf2/test/TestAgent/testagentfactory.h	Tue Jul 06 22:57:17 2010 +0530
@@ -1,6 +1,6 @@
 //testagentfactory.h
 
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -19,7 +19,7 @@
 #ifndef __TESTAGENTFACTORY_H__
 #define __TESTAGENTFACTORY_H__
 
-#include <caf/caf.h>
+#include <caf/cafplatform.h>
 #include <caf/agentfactory.h>
 
 using namespace ContentAccess;
diff -r 41f2cd9c3aa1 -r 3a6baaa22be8 messagingfw/msgtest/testutils/caf2/test/TestAgent/testagentmanager.cpp
--- a/messagingfw/msgtest/testutils/caf2/test/TestAgent/testagentmanager.cpp	Tue Jun 29 22:21:20 2010 +0530
+++ b/messagingfw/msgtest/testutils/caf2/test/TestAgent/testagentmanager.cpp	Tue Jul 06 22:57:17 2010 +0530
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -13,7 +13,7 @@
 // Description:
 //
 
-#include <caf/caf.h>
+#include <caf/cafplatform.h>
 #include <caf/dirstreamable.h>
 #include "testagentmanager.h"
 #include "testagentattributes.h"
diff -r 41f2cd9c3aa1 -r 3a6baaa22be8 messagingfw/msgtest/testutils/caf2/test/TestAgent/testagentmanager.h
--- a/messagingfw/msgtest/testutils/caf2/test/TestAgent/testagentmanager.h	Tue Jun 29 22:21:20 2010 +0530
+++ b/messagingfw/msgtest/testutils/caf2/test/TestAgent/testagentmanager.h	Tue Jul 06 22:57:17 2010 +0530
@@ -1,6 +1,6 @@
 // testagentmanager.h
 
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -18,8 +18,8 @@
 #ifndef __TESTAGENTMANAGER_H__
 #define __TESTAGENTMANAGER_H__
 
-#include <caf/caf.h>
-#include <caf\agentinterface.h>
+#include <caf/cafplatform.h>
+#include <caf/agentinterface.h>
 
 using namespace ContentAccess;
 
diff -r 41f2cd9c3aa1 -r 3a6baaa22be8 messagingfw/msgtest/testutils/caf2/test/TestAgent/testagentrightsmanager.h
--- a/messagingfw/msgtest/testutils/caf2/test/TestAgent/testagentrightsmanager.h	Tue Jun 29 22:21:20 2010 +0530
+++ b/messagingfw/msgtest/testutils/caf2/test/TestAgent/testagentrightsmanager.h	Tue Jul 06 22:57:17 2010 +0530
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -16,8 +16,8 @@
 #ifndef __TESTAGENTRIGHTSMANAGER_H__
 #define __TESTAGENTRIGHTSMANAGER_H__
 
-#include <caf/caf.h>
-#include <caf\agentinterface.h>
+#include <caf/cafplatform.h>
+#include <caf/agentinterface.h>
 
 using namespace ContentAccess;
 
diff -r 41f2cd9c3aa1 -r 3a6baaa22be8 messagingfw/wappushfw/tpush/RefTestAgent/RTAParser/intentparser.h
--- a/messagingfw/wappushfw/tpush/RefTestAgent/RTAParser/intentparser.h	Tue Jun 29 22:21:20 2010 +0530
+++ b/messagingfw/wappushfw/tpush/RefTestAgent/RTAParser/intentparser.h	Tue Jul 06 22:57:17 2010 +0530
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -23,7 +23,7 @@
 #ifndef __INTENTPARSER_H__
 #define __INTENTPARSER_H__
 
-#include <caf/caf.h>
+#include <caf/cafplatform.h>
 #include "parsehandlerbase.h"
 #include "stringparser.h"
 
diff -r 41f2cd9c3aa1 -r 3a6baaa22be8 messagingfw/wappushfw/tpush/RefTestAgent/RTAParser/rightscriteriacount.cpp
--- a/messagingfw/wappushfw/tpush/RefTestAgent/RTAParser/rightscriteriacount.cpp	Tue Jun 29 22:21:20 2010 +0530
+++ b/messagingfw/wappushfw/tpush/RefTestAgent/RTAParser/rightscriteriacount.cpp	Tue Jul 06 22:57:17 2010 +0530
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -14,7 +14,7 @@
 //
 
 #include <s32strm.h>
-#include <caf/caf.h>
+#include <caf/cafplatform.h>
 #include "rightscriteriacount.h"
 
 
diff -r 41f2cd9c3aa1 -r 3a6baaa22be8 messagingfw/wappushfw/tpush/RefTestAgent/RTAParser/rightscriteriacount.h
--- a/messagingfw/wappushfw/tpush/RefTestAgent/RTAParser/rightscriteriacount.h	Tue Jun 29 22:21:20 2010 +0530
+++ b/messagingfw/wappushfw/tpush/RefTestAgent/RTAParser/rightscriteriacount.h	Tue Jul 06 22:57:17 2010 +0530
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -23,7 +23,7 @@
 #define __RIGHTSCRITERIACOUNT_H__
 
 #include <f32file.h>
-#include <caf/caf.h>
+#include <caf/cafplatform.h>
 #include "intent.h"
 
 class RReadStream;
diff -r 41f2cd9c3aa1 -r 3a6baaa22be8 messagingfw/wappushfw/tpush/RefTestAgent/RTAParser/rightscriteriaexpiry.cpp
--- a/messagingfw/wappushfw/tpush/RefTestAgent/RTAParser/rightscriteriaexpiry.cpp	Tue Jun 29 22:21:20 2010 +0530
+++ b/messagingfw/wappushfw/tpush/RefTestAgent/RTAParser/rightscriteriaexpiry.cpp	Tue Jul 06 22:57:17 2010 +0530
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -14,7 +14,7 @@
 //
 
 #include <s32strm.h>
-#include <caf/caf.h>
+#include <caf/cafplatform.h>
 #include "rightscriteriaexpiry.h"
 
 
diff -r 41f2cd9c3aa1 -r 3a6baaa22be8 messagingfw/wappushfw/tpush/RefTestAgent/RTAParser/rightscriteriaexpiry.h
--- a/messagingfw/wappushfw/tpush/RefTestAgent/RTAParser/rightscriteriaexpiry.h	Tue Jun 29 22:21:20 2010 +0530
+++ b/messagingfw/wappushfw/tpush/RefTestAgent/RTAParser/rightscriteriaexpiry.h	Tue Jul 06 22:57:17 2010 +0530
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -23,7 +23,7 @@
 #define __RIGHTSCRITERIAEXPIRY_H__
 
 #include <f32file.h>
-#include <caf/caf.h>
+#include <caf/cafplatform.h>
 #include "intent.h"
 
 class RReadStream;
diff -r 41f2cd9c3aa1 -r 3a6baaa22be8 messagingfw/wappushfw/tpush/RefTestAgent/RefTestAgent/Reftestagentcontent.cpp
--- a/messagingfw/wappushfw/tpush/RefTestAgent/RefTestAgent/Reftestagentcontent.cpp	Tue Jun 29 22:21:20 2010 +0530
+++ b/messagingfw/wappushfw/tpush/RefTestAgent/RefTestAgent/Reftestagentcontent.cpp	Tue Jul 06 22:57:17 2010 +0530
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -13,7 +13,7 @@
 // Description:
 //
 
-#include <caf/caf.h>
+#include <caf/cafplatform.h>
 #include "Reftestagentcontent.h"
 #include "rtacontent.h"
 
diff -r 41f2cd9c3aa1 -r 3a6baaa22be8 messagingfw/wappushfw/tpush/RefTestAgent/RefTestAgent/Reftestagentcontent.h
--- a/messagingfw/wappushfw/tpush/RefTestAgent/RefTestAgent/Reftestagentcontent.h	Tue Jun 29 22:21:20 2010 +0530
+++ b/messagingfw/wappushfw/tpush/RefTestAgent/RefTestAgent/Reftestagentcontent.h	Tue Jul 06 22:57:17 2010 +0530
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -17,7 +17,7 @@
 #define __REFTESTAGENTCONTENT_H__
 
 #include <f32file.h>
-#include <caf/caf.h>
+#include <caf/cafplatform.h>
 #include <caf/agentinterface.h>
 #include "rtacontent.h"
 
diff -r 41f2cd9c3aa1 -r 3a6baaa22be8 messagingfw/wappushfw/tpush/RefTestAgent/RefTestAgent/Reftestagentdata.cpp
--- a/messagingfw/wappushfw/tpush/RefTestAgent/RefTestAgent/Reftestagentdata.cpp	Tue Jun 29 22:21:20 2010 +0530
+++ b/messagingfw/wappushfw/tpush/RefTestAgent/RefTestAgent/Reftestagentdata.cpp	Tue Jul 06 22:57:17 2010 +0530
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -13,7 +13,7 @@
 // Description:
 //
 
-#include <caf/caf.h>
+#include <caf/cafplatform.h>
 #include "Reftestagentdata.h"
 #include "drmfiles.h"
 
diff -r 41f2cd9c3aa1 -r 3a6baaa22be8 messagingfw/wappushfw/tpush/RefTestAgent/RefTestAgent/Reftestagentdata.h
--- a/messagingfw/wappushfw/tpush/RefTestAgent/RefTestAgent/Reftestagentdata.h	Tue Jun 29 22:21:20 2010 +0530
+++ b/messagingfw/wappushfw/tpush/RefTestAgent/RefTestAgent/Reftestagentdata.h	Tue Jul 06 22:57:17 2010 +0530
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -16,7 +16,7 @@
 #ifndef __REFTESTAGENTDATA_H__
 #define __REFTESTAGENTDATA_H__
 
-#include <caf/caf.h>
+#include <caf/cafplatform.h>
 #include <caf/agentinterface.h>
 #include "rtaArchive.h"
 #include "drmfilecontent.h"
diff -r 41f2cd9c3aa1 -r 3a6baaa22be8 messagingfw/wappushfw/tpush/RefTestAgent/RefTestAgent/Reftestagentfactory.cpp
--- a/messagingfw/wappushfw/tpush/RefTestAgent/RefTestAgent/Reftestagentfactory.cpp	Tue Jun 29 22:21:20 2010 +0530
+++ b/messagingfw/wappushfw/tpush/RefTestAgent/RefTestAgent/Reftestagentfactory.cpp	Tue Jul 06 22:57:17 2010 +0530
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -13,7 +13,7 @@
 // Description:
 //
 
-#include <caf/caf.h>
+#include <caf/cafplatform.h>
 #include "Reftestagentfactory.h"
 #include "Reftestagentcontent.h"
 #include "Reftestagentdata.h"
diff -r 41f2cd9c3aa1 -r 3a6baaa22be8 messagingfw/wappushfw/tpush/RefTestAgent/RefTestAgent/Reftestagentfactory.h
--- a/messagingfw/wappushfw/tpush/RefTestAgent/RefTestAgent/Reftestagentfactory.h	Tue Jun 29 22:21:20 2010 +0530
+++ b/messagingfw/wappushfw/tpush/RefTestAgent/RefTestAgent/Reftestagentfactory.h	Tue Jul 06 22:57:17 2010 +0530
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -17,7 +17,7 @@
 #ifndef __REFTESTAGENTFACTORY_H__
 #define __REFTESTAGENTFACTORY_H__
 
-#include <caf/caf.h>
+#include <caf/cafplatform.h>
 #include <caf/agentfactory.h>
 
 using namespace ContentAccess;
diff -r 41f2cd9c3aa1 -r 3a6baaa22be8 messagingfw/wappushfw/tpush/RefTestAgent/RefTestAgent/Reftestagentimportfile.h
--- a/messagingfw/wappushfw/tpush/RefTestAgent/RefTestAgent/Reftestagentimportfile.h	Tue Jun 29 22:21:20 2010 +0530
+++ b/messagingfw/wappushfw/tpush/RefTestAgent/RefTestAgent/Reftestagentimportfile.h	Tue Jul 06 22:57:17 2010 +0530
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -16,7 +16,7 @@
 #ifndef __REFTESTAGENTIMPORTFILE_H__
 #define __REFTESTAGENTIMPORTFILE_H__
 
-#include <caf/caf.h>
+#include <caf/cafplatform.h>
 #include <caf/agentinterface.h>
 #include "rtaImport.h"
 
diff -r 41f2cd9c3aa1 -r 3a6baaa22be8 messagingfw/wappushfw/tpush/RefTestAgent/RefTestAgent/Reftestagentmanager.cpp
--- a/messagingfw/wappushfw/tpush/RefTestAgent/RefTestAgent/Reftestagentmanager.cpp	Tue Jun 29 22:21:20 2010 +0530
+++ b/messagingfw/wappushfw/tpush/RefTestAgent/RefTestAgent/Reftestagentmanager.cpp	Tue Jul 06 22:57:17 2010 +0530
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -13,7 +13,7 @@
 // Description:
 //
 
-#include <caf/caf.h>
+#include <caf/cafplatform.h>
 #include <http.h>
 #include <http/rhttpheaders.h>
 #include <stringpool.h>
diff -r 41f2cd9c3aa1 -r 3a6baaa22be8 messagingfw/wappushfw/tpush/RefTestAgent/RefTestAgent/Reftestagentmanager.h
--- a/messagingfw/wappushfw/tpush/RefTestAgent/RefTestAgent/Reftestagentmanager.h	Tue Jun 29 22:21:20 2010 +0530
+++ b/messagingfw/wappushfw/tpush/RefTestAgent/RefTestAgent/Reftestagentmanager.h	Tue Jul 06 22:57:17 2010 +0530
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -16,7 +16,7 @@
 #ifndef __REFTESTAGENTMANAGER_H__
 #define __REFTESTAGENTMANAGER_H__
 
-#include <caf/caf.h>
+#include <caf/cafplatform.h>
 #include <caf/agentinterface.h>
 
 #include "rtamanager.h"
diff -r 41f2cd9c3aa1 -r 3a6baaa22be8 messagingfw/wappushfw/tpush/RefTestAgent/RefTestAgent/Reftestagentrightsmanager.h
--- a/messagingfw/wappushfw/tpush/RefTestAgent/RefTestAgent/Reftestagentrightsmanager.h	Tue Jun 29 22:21:20 2010 +0530
+++ b/messagingfw/wappushfw/tpush/RefTestAgent/RefTestAgent/Reftestagentrightsmanager.h	Tue Jul 06 22:57:17 2010 +0530
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -16,7 +16,7 @@
 #ifndef __REFTESTAGENTRIGHTSMANAGER_H__
 #define __REFTESTAGENTRIGHTSMANAGER_H__
 
-#include <caf/caf.h>
+#include <caf/cafplatform.h>
 #include <caf/agentinterface.h>
 #include "rtarights.h"
 
diff -r 41f2cd9c3aa1 -r 3a6baaa22be8 messagingfw/wappushfw/tpush/RefTestAgent/inc/rightsobject.h
--- a/messagingfw/wappushfw/tpush/RefTestAgent/inc/rightsobject.h	Tue Jun 29 22:21:20 2010 +0530
+++ b/messagingfw/wappushfw/tpush/RefTestAgent/inc/rightsobject.h	Tue Jul 06 22:57:17 2010 +0530
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -23,7 +23,7 @@
 #define __RIGHTSOBJECT_H__
 
 #include <f32file.h>
-#include <caf/caf.h>
+#include <caf/cafplatform.h>
 
 class RReadStream;
 class RWriteStream;