Merge from PDK_3.0.h CompilerCompatibility
authorWilliam Roberts <williamr@symbian.org>
Sun, 14 Mar 2010 12:35:37 +0000
branchCompilerCompatibility
changeset 16 cee235f8aa57
parent 15 78dea7994cf2 (current diff)
parent 12 08c4f946d508 (diff)
Merge from PDK_3.0.h
systemswstubs/hwrmhapticsstubplugin/data/2001CB6D.rss
systemswstubs/hwrmhapticsstubplugin/group/bld.inf
systemswstubs/hwrmhapticsstubplugin/group/hwrmhapticsstubplugin.mmp
systemswstubs/hwrmhapticsstubplugin/inc/hwrmhapticsstubplugin.h
systemswstubs/hwrmhapticsstubplugin/inc/hwrmhapticsstubpluginidleresponder.h
systemswstubs/hwrmhapticsstubplugin/src/hwrmhapticsstubplugin.cpp
systemswstubs/hwrmhapticsstubplugin/src/hwrmhapticsstubpluginidleresponder.cpp
systemswstubs/hwrmhapticsstubplugin/src/proxy.cpp
--- a/audiostubs/devsoundextensions_stubs/mmfaudioserverfactorystub/group/mmfaudioserverfactorystub.mmp	Fri Mar 12 09:45:18 2010 +0000
+++ b/audiostubs/devsoundextensions_stubs/mmfaudioserverfactorystub/group/mmfaudioserverfactorystub.mmp	Sun Mar 14 12:35:37 2010 +0000
@@ -43,6 +43,7 @@
 USERINCLUDE     ../../inc
 
 MW_LAYER_SYSTEMINCLUDE
+OS_LAYER_SYSTEMINCLUDE
 SYSTEMINCLUDE   /epoc32/include/a3f
 SYSTEMINCLUDE   /epoc32/include/mmf/common
 SYSTEMINCLUDE   /epoc32/include/ecom
--- a/audiostubs/devsoundextensions_stubs/mmfaudioserverfactorystub/inc/mmfaudioserverfactorystub.h	Fri Mar 12 09:45:18 2010 +0000
+++ b/audiostubs/devsoundextensions_stubs/mmfaudioserverfactorystub/inc/mmfaudioserverfactorystub.h	Sun Mar 14 12:35:37 2010 +0000
@@ -18,7 +18,7 @@
 #ifndef MMFAUDIOSERVERFACTORYSTUB_H
 #define MMFAUDIOSERVERFACTORYSTUB_H
 
-#include <mmfaudiosvrservice.h>
+#include <a3f/mmfaudiosvrservice.h>
 
 // FORWARD DECLARATION
 class CTelephonyAudioRoutingManagerStub;
--- a/systemswstubs/hwrmhapticsstubplugin/data/2001CB6D.rss	Fri Mar 12 09:45:18 2010 +0000
+++ b/systemswstubs/hwrmhapticsstubplugin/data/2001CB6D.rss	Sun Mar 14 12:35:37 2010 +0000
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 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 "Eclipse Public License v1.0"
+* under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -16,7 +16,7 @@
 */
 
 
-#include "RegistryInfoV2.rh"
+#include "registryinfov2.rh"
 
 // Declares info for implementations
 RESOURCE REGISTRY_INFO SA_HAPTICS_ADAPTATION
--- a/systemswstubs/hwrmhapticsstubplugin/group/bld.inf	Fri Mar 12 09:45:18 2010 +0000
+++ b/systemswstubs/hwrmhapticsstubplugin/group/bld.inf	Sun Mar 14 12:35:37 2010 +0000
@@ -2,7 +2,7 @@
 * Copyright (c) 2008 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 "Eclipse Public License v1.0"
+* under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/systemswstubs/hwrmhapticsstubplugin/group/hwrmhapticsstubplugin.mmp	Fri Mar 12 09:45:18 2010 +0000
+++ b/systemswstubs/hwrmhapticsstubplugin/group/hwrmhapticsstubplugin.mmp	Sun Mar 14 12:35:37 2010 +0000
@@ -2,7 +2,7 @@
 * Copyright (c) 2008 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 "Eclipse Public License v1.0"
+* under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/systemswstubs/hwrmhapticsstubplugin/inc/hwrmhapticsstubplugin.h	Fri Mar 12 09:45:18 2010 +0000
+++ b/systemswstubs/hwrmhapticsstubplugin/inc/hwrmhapticsstubplugin.h	Sun Mar 14 12:35:37 2010 +0000
@@ -2,7 +2,7 @@
 * Copyright (c) 2008 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 "Eclipse Public License v1.0"
+* under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/systemswstubs/hwrmhapticsstubplugin/inc/hwrmhapticsstubpluginidleresponder.h	Fri Mar 12 09:45:18 2010 +0000
+++ b/systemswstubs/hwrmhapticsstubplugin/inc/hwrmhapticsstubpluginidleresponder.h	Sun Mar 14 12:35:37 2010 +0000
@@ -2,7 +2,7 @@
 * Copyright (c) 2008 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 "Eclipse Public License v1.0"
+* under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/systemswstubs/hwrmhapticsstubplugin/src/hwrmhapticsstubplugin.cpp	Fri Mar 12 09:45:18 2010 +0000
+++ b/systemswstubs/hwrmhapticsstubplugin/src/hwrmhapticsstubplugin.cpp	Sun Mar 14 12:35:37 2010 +0000
@@ -2,7 +2,7 @@
 * Copyright (c) 2008 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 "Eclipse Public License v1.0"
+* under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/systemswstubs/hwrmhapticsstubplugin/src/hwrmhapticsstubpluginidleresponder.cpp	Fri Mar 12 09:45:18 2010 +0000
+++ b/systemswstubs/hwrmhapticsstubplugin/src/hwrmhapticsstubpluginidleresponder.cpp	Sun Mar 14 12:35:37 2010 +0000
@@ -2,7 +2,7 @@
 * Copyright (c) 2008 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 "Eclipse Public License v1.0"
+* under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/systemswstubs/hwrmhapticsstubplugin/src/proxy.cpp	Fri Mar 12 09:45:18 2010 +0000
+++ b/systemswstubs/hwrmhapticsstubplugin/src/proxy.cpp	Sun Mar 14 12:35:37 2010 +0000
@@ -2,7 +2,7 @@
 * Copyright (c) 2008 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 "Eclipse Public License v1.0"
+* under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -17,7 +17,7 @@
 
 
 #include <e32std.h>
-#include <ImplementationProxy.h>
+#include <implementationproxy.h>
 
 #include "hwrmhapticsstubplugin.h"