# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1268649633 -7200
# Node ID b79ee333c41d69c51e0928551bd1841b0f07b0b4
# Parent  09aa63f9b2bc9ba4aeaafcd0f902d8db89179f1e
Revision: 201009
Kit: 201010

diff -r 09aa63f9b2bc -r b79ee333c41d profilesapplication/Profiles/GSProfilesPlugin/src/GSProfilesPlugin.cpp
--- a/profilesapplication/Profiles/GSProfilesPlugin/src/GSProfilesPlugin.cpp	Fri Feb 19 22:51:12 2010 +0200
+++ b/profilesapplication/Profiles/GSProfilesPlugin/src/GSProfilesPlugin.cpp	Mon Mar 15 12:40:33 2010 +0200
@@ -28,7 +28,7 @@
 
 // System includes
 #include    <apadoc.h>
-#include    <aknnullservice.h>
+#include    <AknNullService.h>
 #include    <bautils.h>
 #include    <StringLoader.h>
 #include    <centralrepository.h>
diff -r 09aa63f9b2bc -r b79ee333c41d profilesapplication/Profiles/ProfileAiwProvider/src/CProfileAiwProvider.cpp
--- a/profilesapplication/Profiles/ProfileAiwProvider/src/CProfileAiwProvider.cpp	Fri Feb 19 22:51:12 2010 +0200
+++ b/profilesapplication/Profiles/ProfileAiwProvider/src/CProfileAiwProvider.cpp	Mon Mar 15 12:40:33 2010 +0200
@@ -36,12 +36,12 @@
 #include <aknnotewrappers.h> // For CAknInformationNote
 #include <aknlists.h>	// For CAknSingleGraphicPopupMenuStyleListBox
 #include <cprofiletonehandler.h>
-#include <mprofilesnamesarray.h>
-#include <mprofilename.h>
-#include <mprofileengineextended.h>
-#include <mprofileextended.h>
-#include <profileenginedomaincrkeys.h>
-#include <profileeng.hrh>	// For PROFILES_MAX_NAME_LENGTH
+#include <MProfilesNamesArray.h>
+#include <MProfileName.h>
+#include <MProfileEngineExtended.h>
+#include <MProfileExtended.h>
+#include <ProfileEngineDomainCRKeys.h>
+#include <ProfileEng.hrh>	// For PROFILES_MAX_NAME_LENGTH
 #include <eikfutil.h>	// For EikFileUtils
 #include <centralrepository.h>
 #include <featmgr.h>
diff -r 09aa63f9b2bc -r b79ee333c41d profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileNameSettingPage.cpp
--- a/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileNameSettingPage.cpp	Fri Feb 19 22:51:12 2010 +0200
+++ b/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileNameSettingPage.cpp	Mon Mar 15 12:40:33 2010 +0200
@@ -21,7 +21,7 @@
 #include    "CProfileNameSettingPage.h"
 
 #include    <aknnotewrappers.h>
-#include    <mprofilesnamesarray.h>
+#include    <MProfilesNamesArray.h>
 #include    <ProfileSettingsView.rsg>
 #include	<StringLoader.h>
 
diff -r 09aa63f9b2bc -r b79ee333c41d profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileSettingsContainer.cpp
--- a/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileSettingsContainer.cpp	Fri Feb 19 22:51:12 2010 +0200
+++ b/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileSettingsContainer.cpp	Mon Mar 15 12:40:33 2010 +0200
@@ -34,8 +34,8 @@
 #include    "CProfileFileListSettingItem.h"
 #include    "CProfileAlertForSettingItem.h"
 #include    "CProfileStruct.h"
-#include    "mprofileslocalfeatures.h"
-#include    "profilesvariant.hrh"  // KProEngFeatureIdVTRingingTone
+#include    "MProfilesLocalFeatures.h"
+#include    "ProfilesVariant.hrh"  // KProEngFeatureIdVTRingingTone
 #include	"CProfileSettingsView.h"
 #include	"MProfileViewHandler.h" 
 #include    "ProfilesDebug.h"
@@ -49,24 +49,24 @@
 #include    <eikapp.h>
 #include    <csxhelp/mode.hlp.hrh>
 #include    <featmgr.h>
-#include    <mprofileextended.h>
+#include    <MProfileExtended.h>
 
-#include    <mprofile3dtonesettings.h>
-#include    <mprofilefeedbacksettings.h>
-#include    <mprofileextrasettings.h>
+#include    <MProfile3DToneSettings.h>
+#include    <MProfileFeedbackSettings.h>
+#include    <MProfileExtraSettings.h>
 
-#include    <mprofileengineextended.h>
-#include    <mprofilesnamesarray.h>
-#include    <mprofilename.h>
-#include    <cprofilechangenotifyhandler.h>
+#include    <MProfileEngineExtended.h>
+#include    <MProfilesNamesArray.h>
+#include    <MProfileName.h>
+#include    <CProfileChangeNotifyHandler.h>
 #include    <ProfileSettingsView.rsg>
 #include 	<data_caging_path_literals.hrh>
 #include 	<centralrepository.h>
 #include    <settingsinternalcrkeys.h>
 #include	<bautils.h>	// For BaflUtils
 #include	<StringLoader.h>	// For StringLoader
-#include	<profileenginesdkcrkeys.h>	// For KCRUidProfileEngine
-#include	<profileengineinternalcrkeys.h>	// For KProEngDefaultRingingTone
+#include	<ProfileEngineSDKCRKeys.h>	// For KCRUidProfileEngine
+#include	<ProfileEngineInternalCRKeys.h>	// For KProEngDefaultRingingTone
 #include	<AknQueryDialog.h>	// For CAknQueryDialog
 #include    "CProfileNaviPaneContainer.h" // For CProfileNaviPaneContainer
 #include    <aknnotewrappers.h> // For CAknInformationNote
@@ -75,7 +75,7 @@
 #include    <psmsettings.h>
 #include    <psmsrvdomaincrkeys.h>
 #include    <e32property.h>
-#include    <profileengineprivatepskeys.h>
+#include    <ProfileEnginePrivatePSKeys.h>
 
 namespace
 	{
diff -r 09aa63f9b2bc -r b79ee333c41d profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileStruct.cpp
--- a/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileStruct.cpp	Fri Feb 19 22:51:12 2010 +0200
+++ b/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileStruct.cpp	Mon Mar 15 12:40:33 2010 +0200
@@ -19,27 +19,27 @@
 
 // CLASS HEADER
 #include "CProfileStruct.h"
-#include "profileinternal.hrh"
+#include "ProfileInternal.hrh"
 
 // EXTERNAL INCLUDES
-#include <mprofileextended.h>
-#include <mprofilename.h>
-#include <mprofilesetname.h>
-#include <mprofiletones.h>
+#include <MProfileExtended.h>
+#include <MProfileName.h>
+#include <MProfileSetName.h>
+#include <MProfileTones.h>
 #include <MProfileSetTones.h>
-#include <mprofileextratones.h>
-#include <mprofilesetextratones.h>
-#include <mprofileextrasettings.h>
-#include <mprofilesetextrasettings.h>
-#include <mprofilepttsettings.h>
-#include <mprofilesetpttsettings.h>
+#include <MProfileExtraTones.h>
+#include <MProfileSetExtraTones.h>
+#include <MProfileExtraSettings.h>
+#include <MProfileSetExtraSettings.h>
+#include <MProfilePttSettings.h>
+#include <MProfileSetPttSettings.h>
 #include <AknUtils.h> // AknTextUtils
-#include <mprofilefeedbacksettings.h>
-#include <mprofilesetfeedbacksettings.h>
-#include <mprofile3dtonesettings.h>
-#include <mprofileset3dtonesettings.h>
+#include <MProfileFeedbackSettings.h>
+#include <MProfileSetFeedbackSettings.h>
+#include <MProfile3DToneSettings.h>
+#include <MProfileSet3DToneSettings.h>
 
-#include <tprofiletonesettings.h>
+#include <TProfileToneSettings.h>
 
 // ============================ MEMBER FUNCTIONS ===============================
 
diff -r 09aa63f9b2bc -r b79ee333c41d profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileStructDrmFull.cpp
--- a/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileStructDrmFull.cpp	Fri Feb 19 22:51:12 2010 +0200
+++ b/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileStructDrmFull.cpp	Mon Mar 15 12:40:33 2010 +0200
@@ -21,9 +21,9 @@
 #include "CProfileStruct.h"
 
 // EXTERNAL INCLUDES
-#include <mprofileextended.h>
-#include <mprofiletones.h>
-#include <mprofileextratones.h>
+#include <MProfileExtended.h>
+#include <MProfileTones.h>
+#include <MProfileExtraTones.h>
 #include <DRMHelper.h>
 #include <coemain.h>
 
diff -r 09aa63f9b2bc -r b79ee333c41d profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileToneHandler.cpp
--- a/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileToneHandler.cpp	Fri Feb 19 22:51:12 2010 +0200
+++ b/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileToneHandler.cpp	Mon Mar 15 12:40:33 2010 +0200
@@ -29,23 +29,23 @@
 
 // EXTERNAL INCLUDES
 #include 	<centralrepository.h>
-#include    <profileenginedomaincrkeys.h> // KProEngRingingToneMaxSize
+#include    <ProfileEngineDomainCRKeys.h> // KProEngRingingToneMaxSize
 #include    <bautils.h> // BaflUtils
 #include    <apgcli.h> // RApaLsSession
 #include    <coemain.h> // CCoeEnv
 #include    <aknnotewrappers.h> // CAknInformationNote
 #include    <ConeResLoader.h> // RConeResourceLoader
 #include	<StringLoader.h>
-#include    <mprofileengineextended.h>
-#include    <mprofileslocalfeatures.h>
-#include    <mprofileextended.h>
-#include    <mprofilesetextratones.h>
+#include    <MProfileEngineExtended.h>
+#include    <MProfilesLocalFeatures.h>
+#include    <MProfileExtended.h>
+#include    <MProfileSetExtraTones.h>
 #include    <MProfileSetTones.h>
-#include    <mprofileextratones.h>
-#include    <mprofiletones.h>
-#include    <mprofilesnamesarray.h>
-#include    <mprofilename.h>
-#include    <mprofileutilitysingleton.h>
+#include    <MProfileExtraTones.h>
+#include    <MProfileTones.h>
+#include    <MProfilesNamesArray.h>
+#include    <MProfileName.h>
+#include    <MProfileUtilitySingleton.h>
 #include    <ProfileSettingsView.rsg>
 #include    <AknGlobalNote.h>
 #include    <f32file.h>
diff -r 09aa63f9b2bc -r b79ee333c41d profilesapplication/Profiles/ProfileApp/UIsrc/CProfileMainView.cpp
--- a/profilesapplication/Profiles/ProfileApp/UIsrc/CProfileMainView.cpp	Fri Feb 19 22:51:12 2010 +0200
+++ b/profilesapplication/Profiles/ProfileApp/UIsrc/CProfileMainView.cpp	Mon Mar 15 12:40:33 2010 +0200
@@ -33,16 +33,16 @@
 
 #include    <akntitle.h>
 #include	<StringLoader.h>
-#include    <cprofilechangenotifyhandler.h>
+#include    <CProfileChangeNotifyHandler.h>
 #include    <CProfileEngineHandler.h>
 #include    <CProfileIndexHandler.h>
-#include	<mprofileengine.h>
-#include    <mprofileengineextended.h>
-#include    <mprofile.h>
-#include    <mprofilename.h>
-#include    <mprofileextended.h>
-#include    <mprofilesnamesarray.h>
-#include    <profile.hrh>
+#include	<MProfileEngine.h>
+#include    <MProfileEngineExtended.h>
+#include    <MProfile.h>
+#include    <MProfileName.h>
+#include    <MProfileExtended.h>
+#include    <MProfilesNamesArray.h>
+#include    <Profile.hrh>
 #include    <ProfileApp.rsg>
 #include 	<AknQueryDialog.h>
 
@@ -50,8 +50,8 @@
 #include    "CProfileDocument.h"
 #include    "ProfileApp.hrh"
 #include    "CProfileNaviPaneContainer.h"
-#include    "mprofileslocalfeatures.h"
-#include 	"profilesvariant.hrh" // KProEngFeatureIdTimedProfiles
+#include    "MProfilesLocalFeatures.h"
+#include 	"ProfilesVariant.hrh" // KProEngFeatureIdTimedProfiles
 
 
 // CONSTANTS
diff -r 09aa63f9b2bc -r b79ee333c41d profilesapplication/Profiles/ProfileApp/tsrc/public/ProfileStif/group/ProfileStif_DoxyFile.txt
--- a/profilesapplication/Profiles/ProfileApp/tsrc/public/ProfileStif/group/ProfileStif_DoxyFile.txt	Fri Feb 19 22:51:12 2010 +0200
+++ b/profilesapplication/Profiles/ProfileApp/tsrc/public/ProfileStif/group/ProfileStif_DoxyFile.txt	Mon Mar 15 12:40:33 2010 +0200
@@ -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".
 #