# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1263838780 -7200
# Node ID 627793106ff9f7e7cc3ea05880ecbe59f2ef8643
# Parent  09d076ed0f23073a94d5ae710e810cfbad7a97a2
Revision: 201001
Kit: 201003

diff -r 09d076ed0f23 -r 627793106ff9 profilesapplication/Profiles/GSProfilesPlugin/src/GSProfilesPlugin.cpp
--- a/profilesapplication/Profiles/GSProfilesPlugin/src/GSProfilesPlugin.cpp	Thu Jan 07 12:46:32 2010 +0200
+++ b/profilesapplication/Profiles/GSProfilesPlugin/src/GSProfilesPlugin.cpp	Mon Jan 18 20:19:40 2010 +0200
@@ -23,7 +23,7 @@
 #include    <GSProfilesPluginRsc.rsg> // GUI Resource
 #include    <gsprofilesplugin.mbg>
 #include    <gsprivatepluginproviderids.h>
-#include    <profileenginesdkcrkeys.h>
+#include    <ProfileEngineSDKCRKeys.h>
 #include    <hwrmvibrasdkcrkeys.h>
 
 // System includes
@@ -33,25 +33,25 @@
 #include    <StringLoader.h>
 #include    <centralrepository.h>
 
-#include    <proengfactory.h>
-#include    <mprofileengine.h>
-#include    <mprofile.h>
-#include    <mprofiletones.h>
-#include    <mproengtonesettings.h>
-#include    <mprofileextrasettings.h>
-#include    <mprofilefeedbacksettings.h>
-#include    <tprofiletonesettings.h>
+#include    <ProEngFactory.h>
+#include    <MProfileEngine.h>
+#include    <MProfile.h>
+#include    <MProfileTones.h>
+#include    <MProEngToneSettings.h>
+#include    <MProfileExtraSettings.h>
+#include    <MProfileFeedbackSettings.h>
+#include    <TProfileToneSettings.h>
 
-#include    <profileeng.hrh>
-#include    <profileengineinternalcrkeys.h>
+#include    <ProfileEng.hrh>
+#include    <ProfileEngineInternalCRKeys.h>
 
 // PSM client
 #include <psmclient.h>
 #include <psmsettings.h>
 #include <e32property.h>
-#include <mprofileengineextended.h>
-#include <mprofileextended.h>
-#include <profileengineprivatepskeys.h>
+#include <MProfileEngineExtended.h>
+#include <MProfileExtended.h>
+#include <ProfileEnginePrivatePSKeys.h>
 
 
 // ========================= MEMBER FUNCTIONS ================================
diff -r 09d076ed0f23 -r 627793106ff9 profilesapplication/Profiles/ProfileApp/SettingsViewInc/CProfileSettingsContainer.h
--- a/profilesapplication/Profiles/ProfileApp/SettingsViewInc/CProfileSettingsContainer.h	Thu Jan 07 12:46:32 2010 +0200
+++ b/profilesapplication/Profiles/ProfileApp/SettingsViewInc/CProfileSettingsContainer.h	Mon Jan 18 20:19:40 2010 +0200
@@ -24,7 +24,7 @@
 #include    <MSSSettingsObserver.h>
 #include    <ConeResLoader.h>           // RConeResourceLoader
 #include    <AknTabObserver.h>          // MAknTabObserver
-#include    <mprofilechangeobserver.h>
+#include    <MProfileChangeObserver.h>
 #include    "MProfileExternalSettingsObserver.h"
 #include    "MProfileExternalSettingsHandler.h"
 #include    <centralrepository.h>
diff -r 09d076ed0f23 -r 627793106ff9 profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfile3dSettingPage.cpp
--- a/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfile3dSettingPage.cpp	Thu Jan 07 12:46:32 2010 +0200
+++ b/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfile3dSettingPage.cpp	Mon Jan 18 20:19:40 2010 +0200
@@ -21,13 +21,13 @@
 #include "CProfile3dSettingPage.h"
 #include "ProfileSettingsView.hrh"
 
-#include <cfldcontroller.h>
+#include <CFLDController.h>
 #include <ProfileSettingsView.rsg>
 #include <apgcli.h>	// For RApaLsSession
 #include <bautils.h> // For BaflUtils
 #include <centralrepository.h>
-#include <profileengineinternalcrkeys.h>
-#include <profileinternal.hrh>
+#include <ProfileEngineInternalCRKeys.h>
+#include <ProfileInternal.hrh>
 
 // CONSTANTS
 namespace
diff -r 09d076ed0f23 -r 627793106ff9 profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileEngineHandler.cpp
--- a/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileEngineHandler.cpp	Thu Jan 07 12:46:32 2010 +0200
+++ b/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileEngineHandler.cpp	Mon Jan 18 20:19:40 2010 +0200
@@ -20,9 +20,9 @@
 // INCLUDE FILES
 #include "CProfileEngineHandler.h"
 
-#include <mprofileengineextended.h>
-#include <mprofilesnamesarray.h>
-#include <mprofilename.h>
+#include <MProfileEngineExtended.h>
+#include <MProfilesNamesArray.h>
+#include <MProfileName.h>
 
 // ============================ MEMBER FUNCTIONS ===============================
 
diff -r 09d076ed0f23 -r 627793106ff9 profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileFileListSettingItem.cpp
--- a/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileFileListSettingItem.cpp	Thu Jan 07 12:46:32 2010 +0200
+++ b/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileFileListSettingItem.cpp	Mon Jan 18 20:19:40 2010 +0200
@@ -23,17 +23,17 @@
 // INTERNAL INCLUDES
 #include <coemain.h>
 
-#include <profile.hrh> // From Profile Engine
+#include <Profile.hrh> // From Profile Engine
 #include <StringLoader.h>
 #include <centralrepository.h>
-#include <profileengineinternalcrkeys.h>
+#include <ProfileEngineInternalCRKeys.h>
 #include <ProfileSettingsView.rsg>
 #include <data_caging_path_literals.hrh>
 #include <CLFContentListing.hrh>	// For TCLFMediaType::ECLFMediaTypeVideo
 
 // for mediafilelist
 #include <mediafilelist.h>
-#include <profileinternal.hrh>
+#include <ProfileInternal.hrh>
 #include <DRMHelper.h>
 
 
diff -r 09d076ed0f23 -r 627793106ff9 profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileIndexHandler.cpp
--- a/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileIndexHandler.cpp	Thu Jan 07 12:46:32 2010 +0200
+++ b/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileIndexHandler.cpp	Mon Jan 18 20:19:40 2010 +0200
@@ -20,7 +20,7 @@
 //  INCLUDES
 #include "CProfileIndexHandler.h"
 
-#include <mprofilesnamesarray.h>
+#include <MProfilesNamesArray.h>
 #include <eiklbx.h>
 
 #include "CProfileEngineHandler.h"
diff -r 09d076ed0f23 -r 627793106ff9 profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileNaviPaneContainer.cpp
--- a/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileNaviPaneContainer.cpp	Thu Jan 07 12:46:32 2010 +0200
+++ b/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileNaviPaneContainer.cpp	Mon Jan 18 20:19:40 2010 +0200
@@ -25,9 +25,9 @@
 #include    <eikspane.h>
 #include    <avkon.hrh> // EEikStatusPaneUidNavi
 #include    <AknUtils.h> // AknTextUtils
-#include    <mprofilesnamesarray.h>
-#include    <mprofileengineextended.h>
-#include    <mprofilename.h>
+#include    <MProfilesNamesArray.h>
+#include    <MProfileEngineExtended.h>
+#include    <MProfileName.h>
 
 #include    "CProfileEngineHandler.h"
 
diff -r 09d076ed0f23 -r 627793106ff9 profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfilePlayingVolumeSettingPage.cpp
--- a/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfilePlayingVolumeSettingPage.cpp	Thu Jan 07 12:46:32 2010 +0200
+++ b/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfilePlayingVolumeSettingPage.cpp	Mon Jan 18 20:19:40 2010 +0200
@@ -21,13 +21,13 @@
 #include "CProfilePlayingVolumeSettingPage.h"
 
 #include <AknQueryDialog.h>
-#include <cfldcontroller.h>
+#include <CFLDController.h>
 #include <ProfileSettingsView.rsg>
 #include "CProfileStruct.h" // KProfileMaxProfileNameLength
 #include <apgcli.h>	// For RApaLsSession
 #include <bautils.h> // For BaflUtils
 #include <centralrepository.h>
-#include <profileengineinternalcrkeys.h>
+#include <ProfileEngineInternalCRKeys.h>
 
 // CONSTANTS
 namespace
diff -r 09d076ed0f23 -r 627793106ff9 profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileSettingsContainer.cpp
--- a/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileSettingsContainer.cpp	Thu Jan 07 12:46:32 2010 +0200
+++ b/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileSettingsContainer.cpp	Mon Jan 18 20:19:40 2010 +0200
@@ -200,8 +200,11 @@
                 *( iAvkonAppUi->StatusPane() ), iEngineHandler );
 
         MProfilesNamesArray* nameArray = iEngineHandler.IdArray();
-        iNaviPaneContainer->SetNaviPaneTextL( 
-            nameArray->MdcaPoint( iIndexHandler->CurrentProfileIndex() ) );
+        if( iIndexHandler )
+            {
+            iNaviPaneContainer->SetNaviPaneTextL( 
+                nameArray->MdcaPoint( iIndexHandler->CurrentProfileIndex() ) );
+            }
         }
 
     iNotifier = CProfileChangeNotifyHandler::NewL( this );
diff -r 09d076ed0f23 -r 627793106ff9 profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileStruct.h
--- a/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileStruct.h	Thu Jan 07 12:46:32 2010 +0200
+++ b/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileStruct.h	Mon Jan 18 20:19:40 2010 +0200
@@ -21,8 +21,8 @@
 #define CPROFILESTRUCT_H
 
 // INCLUDES
-#include "profileeng.hrh"
-#include "profileinternal.hrh"
+#include "ProfileEng.hrh"
+#include "ProfileInternal.hrh"
 #include <cntdef.h>
 
 // CONSTANTS
diff -r 09d076ed0f23 -r 627793106ff9 profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileTabHandler.cpp
--- a/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileTabHandler.cpp	Thu Jan 07 12:46:32 2010 +0200
+++ b/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileTabHandler.cpp	Mon Jan 18 20:19:40 2010 +0200
@@ -23,7 +23,7 @@
 // INTERNAL INCLUDES
 #include "CProfileEngineHandler.h"
 #include "CProfileIndexHandler.h"
-#include "profileengineconstants.h"
+#include "ProfileEngineConstants.h"
 
 // EXTERNAL INCLUDES
 #include <aknnavi.h>
@@ -31,9 +31,9 @@
 #include <akntabgrp.h>
 #include <aknnavide.h>
 #include <AknUtils.h> // AknTextUtils
-#include <mprofilesnamesarray.h>
+#include <MProfilesNamesArray.h>
 
-#include <mprofilename.h>
+#include <MProfileName.h>
 
 // ============================ MEMBER FUNCTIONS ===============================
 
diff -r 09d076ed0f23 -r 627793106ff9 profilesapplication/Profiles/ProfileApp/UIsrc/CProfileMainContainer.cpp
--- a/profilesapplication/Profiles/ProfileApp/UIsrc/CProfileMainContainer.cpp	Thu Jan 07 12:46:32 2010 +0200
+++ b/profilesapplication/Profiles/ProfileApp/UIsrc/CProfileMainContainer.cpp	Mon Jan 18 20:19:40 2010 +0200
@@ -26,16 +26,16 @@
 #include <featmgr.h>
 #include <CProfileEngineHandler.h>
 #include <CProfileIndexHandler.h>
-#include <mprofileengineextended.h>
-#include <mprofilesnamesarray.h>
+#include <MProfileEngineExtended.h>
+#include <MProfilesNamesArray.h>
 #include <csxhelp/mode.hlp.hrh>
-#include <profileeng.hrh>
+#include <ProfileEng.hrh>
 
 #include "CProfileMainView.h"
 #include "CProfileDocument.h"
 #include "CProfileApplication.h"
 #include "ProfileApp.hrh"
-#include "profileengineconstants.h"
+#include "ProfileEngineConstants.h"
 
 // CONSTANTS
 _LIT( KTabChar, "\t" );
diff -r 09d076ed0f23 -r 627793106ff9 profilesapplication/Profiles/ProfileApp/UIsrc/CProfileMainView.cpp
--- a/profilesapplication/Profiles/ProfileApp/UIsrc/CProfileMainView.cpp	Thu Jan 07 12:46:32 2010 +0200
+++ b/profilesapplication/Profiles/ProfileApp/UIsrc/CProfileMainView.cpp	Mon Jan 18 20:19:40 2010 +0200
@@ -191,14 +191,6 @@
 			CleanupStack::PopAndDestroy( infoText );
 			return;
 			}
-		else if( !DisplayConfirmationQueryL(
-            R_PROFILE_LEAVE_OFFLINE_CONFIRMATION_QUERY ) )
-			{
-			// SIM card exists.
-			// User replied that he/she doesn't want to activate RF.
-			// Exit from method, do not activate the focused profile.
-			return;
-			}
 		}
 	iEngineHandler.Engine()->SetActiveProfileL( currentProfileId );
 	}
@@ -453,14 +445,6 @@
 			CleanupStack::PopAndDestroy( infoText );
 			return;
 			}
-		else if( !DisplayConfirmationQueryL(
-            R_PROFILE_LEAVE_OFFLINE_CONFIRMATION_QUERY ) )
-			{
-			// SIM card exists.
-			// User replied that he/she doesn't want to activate RF.
-			// Exit from method, do not activate the focused profile.
-			return;
-			}
 		}
 
 	TTime expireTime;
diff -r 09d076ed0f23 -r 627793106ff9 profilesapplication/Profiles/ProfileApp/UIsrc/CProfileMainView.h
--- a/profilesapplication/Profiles/ProfileApp/UIsrc/CProfileMainView.h	Thu Jan 07 12:46:32 2010 +0200
+++ b/profilesapplication/Profiles/ProfileApp/UIsrc/CProfileMainView.h	Mon Jan 18 20:19:40 2010 +0200
@@ -22,7 +22,7 @@
 
 // INCLUDES
 #include <aknview.h>
-#include "mprofilechangeobserver.h"
+#include "MProfileChangeObserver.h"
 #include "MProfileViewHandler.h"
 
 // CONSTANTS
diff -r 09d076ed0f23 -r 627793106ff9 profilesapplication/Profiles/ProfileApp/UIsrc/CProfileSettingsView.cpp
--- a/profilesapplication/Profiles/ProfileApp/UIsrc/CProfileSettingsView.cpp	Thu Jan 07 12:46:32 2010 +0200
+++ b/profilesapplication/Profiles/ProfileApp/UIsrc/CProfileSettingsView.cpp	Mon Jan 18 20:19:40 2010 +0200
@@ -23,8 +23,8 @@
 #include    <akntitle.h>
 #include    <akntabgrp.h>
 #include    <featmgr.h>
-#include    <mprofileengineextended.h>
-#include    <mprofilesnamesarray.h>
+#include    <MProfileEngineExtended.h>
+#include    <MProfilesNamesArray.h>
 #include    <CProfileEngineHandler.h>
 #include    <CProfileIndexHandler.h>
 #include    <CProfileTabHandler.h>