--- a/gsprofilesrv_plat/profiles_engine_api/inc/ProfileEng.hrh Tue Feb 02 00:22:03 2010 +0200
+++ b/gsprofilesrv_plat/profiles_engine_api/inc/ProfileEng.hrh Fri Feb 19 23:06:10 2010 +0200
@@ -62,7 +62,8 @@
EProfileSettingId3DEffect = 0x00000017,
EProfileSettingId3DEcho = 0x00000018,
EProfileSettingIdTactileFeedback = 0x00000019,
- EProfileSettingIdAudioFeedback = 0x0000001A
+ EProfileSettingIdAudioFeedback = 0x0000001A,
+ EProfileSettingIdEmailVibra=0x0000001B
};
#endif // __PROFILEENG_HRH__
--- a/gsprofilesrv_plat/settings_framework_api/inc/GSMainView.h Tue Feb 02 00:22:03 2010 +0200
+++ b/gsprofilesrv_plat/settings_framework_api/inc/GSMainView.h Fri Feb 19 23:06:10 2010 +0200
@@ -184,7 +184,7 @@
//keep the exact position of the listbox including current item index,
//iVerticalOffset and TopItemindex
- RArray<TInt> position;
+ RArray<TInt> iPosition;
//record the screen mode, portrait/landscape
TBool iScreenMode;
--- a/gsprofilesrv_plat/settings_framework_api/inc/GSParentContainer.h Tue Feb 02 00:22:03 2010 +0200
+++ b/gsprofilesrv_plat/settings_framework_api/inc/GSParentContainer.h Fri Feb 19 23:06:10 2010 +0200
@@ -116,12 +116,12 @@
* @return the exact position of the listbox containing current item index,
* iVerticalOffset and TopItemindex
*/
- void GetPositionL(RArray<TInt>& posArray);
+ void GetPositionL(RArray<TInt>& aPosition);
/**
* set listbox's exact position.
*/
- void SetPosition(const RArray<TInt>& pos, TBool aChangeMode);
+ void SetPosition(const RArray<TInt>& aPosition, TBool aChangeMode);
public: // From CCoeControl
--- a/gsprofilesrv_plat/settings_framework_api/inc/GSParentPlugin.h Tue Feb 02 00:22:03 2010 +0200
+++ b/gsprofilesrv_plat/settings_framework_api/inc/GSParentPlugin.h Fri Feb 19 23:06:10 2010 +0200
@@ -331,7 +331,7 @@
//keep the exact position of the listbox including current item index,
//iVerticalOffset and TopItemindex
- RArray<TInt> position;
+ RArray<TInt> iPosition;
//record the screen mode, portrait/landscape
TBool iScreenMode;
--- a/gssettingsuis/Gs/GSApplication/Inc/GSMainContainer.h Tue Feb 02 00:22:03 2010 +0200
+++ b/gssettingsuis/Gs/GSApplication/Inc/GSMainContainer.h Fri Feb 19 23:06:10 2010 +0200
@@ -84,12 +84,12 @@
* @return the exact position of the listbox containing current item index,
* iVerticalOffset and TopItemindex
*/
- void GetPositionL(RArray<TInt>& posArray);
+ void GetPositionL(RArray<TInt>& aPosition);
/**
* set listbox's exact position.
*/
- void SetPosition(const RArray<TInt>& pos, TBool aChangeMode);
+ void SetPosition(const RArray<TInt>& aPosition, TBool aChangeMode);
public: // From CCoeControl
--- a/gssettingsuis/Gs/GSApplication/Src/GSMainContainer.cpp Tue Feb 02 00:22:03 2010 +0200
+++ b/gssettingsuis/Gs/GSApplication/Src/GSMainContainer.cpp Fri Feb 19 23:06:10 2010 +0200
@@ -491,11 +491,11 @@
//Get the exact position of listbox.
// -----------------------------------------------------------------------------
//
-void CGSMainContainer::GetPositionL(RArray<TInt>& posArray)
+void CGSMainContainer::GetPositionL(RArray<TInt>& aPosition)
{
- posArray.AppendL(iListBox->CurrentItemIndex());
- posArray.AppendL(iListBox->View()->ItemOffsetInPixels());
- posArray.AppendL(iListBox->View()->TopItemIndex());
+ aPosition.AppendL(iListBox->CurrentItemIndex());
+ aPosition.AppendL(iListBox->View()->ItemOffsetInPixels());
+ aPosition.AppendL(iListBox->View()->TopItemIndex());
return;
}
@@ -505,19 +505,22 @@
//Get the exact position of listbox.
// -----------------------------------------------------------------------------
//
-void CGSMainContainer::SetPosition(const RArray<TInt>& pos, TBool aChangeMode)
+void CGSMainContainer::SetPosition(const RArray<TInt>& aPosition, TBool aChangeMode)
{
- iListBox->SetCurrentItemIndex(pos.operator[](0));
-
- if (aChangeMode)
- {
- iListBox->View()->VerticalMoveToItemL(pos.operator[](0),
- CListBoxView::ESingleSelection);
- }
- else
- {
- iListBox->View()->SetItemOffsetInPixels(pos.operator[](1));
- iListBox->View()->SetTopItemIndex(pos.operator[](2));
- }
- }
+ if ( aPosition.operator[](0) >= 0 )
+ {
+ iListBox->SetCurrentItemIndex( aPosition.operator[](0) );
+ }
+
+ if (aChangeMode)
+ {
+ iListBox->View()->VerticalMoveToItemL( aPosition.operator[](0 ),
+ CListBoxView::ESingleSelection);
+ }
+ else
+ {
+ iListBox->View()->SetItemOffsetInPixels( aPosition.operator[](1) );
+ iListBox->View()->SetTopItemIndex( aPosition.operator[](2) );
+ }
+ }
// End of File
--- a/gssettingsuis/Gs/GSApplication/Src/GSMainView.cpp Tue Feb 02 00:22:03 2010 +0200
+++ b/gssettingsuis/Gs/GSApplication/Src/GSMainView.cpp Fri Feb 19 23:06:10 2010 +0200
@@ -132,6 +132,10 @@
iAppUi->RemoveFromViewStack( *this, iContainer );
delete iContainer;
}
+ if (iPosition.Count() > 0)
+ {
+ iPosition.Close();
+ }
}
@@ -203,15 +207,15 @@
// Do this to update listbox from already existing iPluginArray.
iContainer->UpdateListBoxL();
- if (position.Count() > 0)
+ if (iPosition.Count() > 0)
{
if (iScreenMode == Layout_Meta_Data::IsLandscapeOrientation())
{
- iContainer->SetPosition(position, EFalse);
+ iContainer->SetPosition(iPosition, EFalse);
}
else
{
- iContainer->SetPosition(position, ETrue);
+ iContainer->SetPosition(iPosition, ETrue);
}
}
iAppUi->AddToViewStackL( *this, iContainer );
@@ -239,11 +243,11 @@
if ( iContainer )
{
- if (position.Count() > 0)
+ if (iPosition.Count() > 0)
{
- position.Reset();
+ iPosition.Reset();
}
- TRAPD(err, iContainer->GetPositionL(position));
+ TRAPD(err, iContainer->GetPositionL(iPosition));
iScreenMode = Layout_Meta_Data::IsLandscapeOrientation();
iAppUi->RemoveFromViewStack(*this, iContainer);
delete iContainer;
--- a/gssettingsuis/Gs/GSFramework/src/GSParentContainer.cpp Tue Feb 02 00:22:03 2010 +0200
+++ b/gssettingsuis/Gs/GSFramework/src/GSParentContainer.cpp Fri Feb 19 23:06:10 2010 +0200
@@ -839,11 +839,11 @@
//Get the exact position of listbox.
// -----------------------------------------------------------------------------
//
-void CGSParentContainer::GetPositionL(RArray<TInt>& posArray)
+void CGSParentContainer::GetPositionL(RArray<TInt>& aPosition)
{
- posArray.AppendL(iListBox->CurrentItemIndex());
- posArray.AppendL(iListBox->View()->ItemOffsetInPixels());
- posArray.AppendL(iListBox->View()->TopItemIndex());
+ aPosition.AppendL(iListBox->CurrentItemIndex());
+ aPosition.AppendL(iListBox->View()->ItemOffsetInPixels());
+ aPosition.AppendL(iListBox->View()->TopItemIndex());
return;
}
@@ -853,17 +853,23 @@
//Get the exact position of listbox.
// -----------------------------------------------------------------------------
//
-void CGSParentContainer::SetPosition(const RArray<TInt>& pos, TBool aChangeMode)
+void CGSParentContainer::SetPosition(const RArray<TInt>& aPosition, TBool aChangeMode)
{
- iListBox->SetCurrentItemIndex(pos.operator[](0));
- iListBox->View()->SetItemOffsetInPixels(pos.operator[](1));
- if (aChangeMode)
- {
- iListBox->View()->VerticalMoveToItemL(pos.operator[](0), CListBoxView::ESingleSelection);
- }
- else
- {
- iListBox->View()->SetTopItemIndex(pos.operator[](2));
- }
- }
+ if ( aPosition.operator[](0) >= 0 )
+ {
+ iListBox->SetCurrentItemIndex( aPosition.operator[](0) );
+ }
+
+ //iListBox->View()->SetItemOffsetInPixels( aPosition.operator[](1) );
+ if (aChangeMode)
+ {
+ iListBox->View()->VerticalMoveToItemL( aPosition.operator[](0),
+ CListBoxView::ESingleSelection );
+ }
+ else
+ {
+ iListBox->View()->SetItemOffsetInPixels( aPosition.operator[](1) );
+ iListBox->View()->SetTopItemIndex( aPosition.operator[](2) );
+ }
+ }
//End of File
--- a/gssettingsuis/Gs/GSFramework/src/GSParentPlugin.cpp Tue Feb 02 00:22:03 2010 +0200
+++ b/gssettingsuis/Gs/GSFramework/src/GSParentPlugin.cpp Fri Feb 19 23:06:10 2010 +0200
@@ -139,6 +139,10 @@
iAppUi->RemoveFromViewStack( *this, iContainer );
delete iContainer;
}
+ if ( iPosition.Count() > 0)
+ {
+ iPosition.Close();
+ }
}
@@ -214,15 +218,15 @@
// Update listbox from already existing iPluginArray:
iContainer->UpdateListBoxL();
- if (position.Count() > 0)
+ if (iPosition.Count() > 0)
{
if (iScreenMode == Layout_Meta_Data::IsLandscapeOrientation())
{
- iContainer->SetPosition(position, EFalse);
+ iContainer->SetPosition(iPosition, EFalse);
}
else
{
- iContainer->SetPosition(position, ETrue);
+ iContainer->SetPosition(iPosition, ETrue);
}
}
iAppUi->AddToViewStackL(*this, iContainer);
@@ -268,11 +272,11 @@
if ( iContainer )
{
- if (position.Count() > 0)
+ if (iPosition.Count() > 0)
{
- position.Reset();
+ iPosition.Reset();
}
- TRAPD(err, iContainer->GetPositionL(position));
+ TRAPD(err, iContainer->GetPositionL(iPosition));
iScreenMode = Layout_Meta_Data::IsLandscapeOrientation();
iAppUi->RemoveFromViewStack(*this, iContainer);
Binary file gssettingsuis/Gs/help/data/xhtml.zip has changed
--- a/gssettingsuis/Gs/help/inc/cp.hlp.hrh Tue Feb 02 00:22:03 2010 +0200
+++ b/gssettingsuis/Gs/help/inc/cp.hlp.hrh Fri Feb 19 23:06:10 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 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"
--- a/profilesservices/MediaFileList/Src/mediafiledialog.cpp Tue Feb 02 00:22:03 2010 +0200
+++ b/profilesservices/MediaFileList/Src/mediafiledialog.cpp Fri Feb 19 23:06:10 2010 +0200
@@ -1887,11 +1887,6 @@
return;
}
- if ( aMediaType == CMediaFileList::EMediaFileTypeVideo )
- {
- PreviewVideoL( iBuf );
- return;
- }
if ( iState->CurrentFolder() == EEFolderSearch )
{
@@ -1906,6 +1901,12 @@
return;
}
+ if ( aMediaType == CMediaFileList::EMediaFileTypeVideo )
+ {
+ PreviewVideoL( iBuf );
+ return;
+ }
+
iAudioPreviewHandler->SetAttrL( TMFDialogUtil::EAttrFileName, iBuf );
iAudioPreviewHandler->PlayL();
--- a/profilesservices/ProfileEngine/EngInc/MProfileEngineExtended.h Tue Feb 02 00:22:03 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,163 +0,0 @@
-/*
-* Copyright (c) 2002 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Extended profile engine interface.
-*
-*/
-
-
-
-#ifndef __MPROFILEENGINEEXTENDED_H__
-#define __MPROFILEENGINEEXTENDED_H__
-
-// INCLUDES
-#include <MProfileEngine.h>
-
-// DATA TYPES
-enum TProfileUtilityObjectType
- {
- EProfileUtilityObjectPresenceTool = 0
- };
-
-// FUNCTION PROTOTYPES
-class MProfileEngineExtended;
-class MProfilesLocalFeatures;
-
-/**
-* Create extended profile engine, ownership transfered.
-*
-* @lib ProfileEng.lib
-* @since 2.0
-*/
-IMPORT_C MProfileEngineExtended* CreateProfileEngineExtendedL();
-
-/**
-* Create extended profile engine, ownership transfered.
-*
-* @param aFs An open file server session, ownership is NOT transferred.
-* aFs must remain connected for the lifetime of the returned object.
-* @lib ProfileEng.lib
-* @since 3.0
-*/
-IMPORT_C MProfileEngineExtended* CreateProfileEngineExtendedL( RFs* aFs );
-
-// FORWARD DECLARATIONS
-class MProfileExtended;
-class MProfilePresence;
-
-// CLASS DECLARATION
-
-/**
-* Extended profile engine interface.
-* This interface extend MProfileEngine interface and
-* offers methods to get profile settings and store profile settings.
-*
-* @lib N/A
-* @since 2.0
-*/
-class MProfileEngineExtended : public MProfileEngine
- {
- protected: // Destructor
-
- virtual ~MProfileEngineExtended() {};
-
- public: // New functions
-
- /**
- * Create extended profile, ownership transfered.
- * @since 2.0
- * @param aId Profile ID
- * @return Instance of the MProfileExtended
- */
- virtual MProfileExtended* ProfileLC( TInt aId ) = 0;
-
- /**
- * Create extended profile, ownership transfered.
- * @since 2.0
- * @param aId Profile ID
- * @return Instance of the MProfileExtended
- */
- virtual MProfileExtended* ProfileL( TInt aId ) = 0;
-
- /**
- * Store profile settings. Leaves with KErrAccessDenied if one or more
- * of the settings of the target profile is/are read-only.
- * @since 2.0
- * @param aProfile Profile
- */
- virtual void CommitChangeL( MProfileExtended& aProfile ) = 0;
-
- /**
- * Send presence settings.
- * @since 2.1
- * @param aProfile Profile
- */
- virtual void SendPresenceSettingsL(
- const MProfilePresence& aPresence ) = 0;
-
- /**
- * Delete profile.
- * @since 2.1
- * @param aId Profile ID
- * @return Error code
- */
- virtual TInt DeleteProfileL( TInt aId ) = 0;
-
- /**
- * Create new profile, ownership transfered.
- * @since 2.1
- * @return Instance of the MProfileExtended
- */
- virtual MProfileExtended* CreateProfileL() = 0;
-
- /**
- * Returns is profile default profile.
- * @since 2.0
- * @param aId Profile ID
- * @return Is profile default profile
- */
- virtual TBool IsDefaultProfile( TInt aId ) = 0;
-
- /**
- * Returns locally variated features of Profiles.
- * @since 2.6
- */
- virtual MProfilesLocalFeatures& LocalFeatures() = 0;
-
- /**
- * Returns an utility object needed for a specific task. The returned
- * object can be generally of any class and the caller must know what
- * it wants and cast the returned object to the correct class.
- * The ownership is not transferred.
- * @param aType the type of the utility object to be returned.
- * @param aImpl the utility object needed by the client on return, NULL
- * if there isn't any of the given type
- */
- virtual void GetProfileUtilityObject(
- TProfileUtilityObjectType aType, TAny*& aImpl ) = 0;
-
- /**
- * Set timed active profile. When the time expires the profile which was
- * active before calling this method will be reactivated.
- * If ID is incorrect then leave with KErrNotFound.
- * @since 3.2
- * @param aId Profile ID
- * @param aTime time when the profile activation expires
- */
- virtual void SetActiveProfileTimedL( TInt aId, TTime aTime ) = 0;
-
- };
-
-#endif // __MPROFILEENGINEEXTENDED_H__
-
-// End of File
--- a/profilesservices/ProfileEngine/EngInc/MProfileExtended.h Tue Feb 02 00:22:03 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,156 +0,0 @@
-/*
-* Copyright (c) 2002 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Extended profile interface.
-*
-*/
-
-
-
-#ifndef __MPROFILEEXTENDED_H__
-#define __MPROFILEEXTENDED_H__
-
-// INCLUDES
-#include <MProfile.h>
-
-// DATA TYPES
-enum TProfileFlags
- {
- EProfileFlagRingingTone = 0x0001,
- EProfileFlagRingingType = 0x0002,
- EProfileFlagRingingVolume = 0x0004,
- EProfileFlagMessageAlertTone = 0x0008,
- EProfileFlagInstantMessageAlertTone = 0x0010,
- EProfileFlagVibratingAlert = 0x0020,
- EProfileFlagKeypadVolume = 0x0040,
- EProfileFlagWarningTones = 0x0080,
- EProfileFlagAlertFor = 0x0100,
- EProfileFlagAvailabilityAttribute = 0x0200,
- EProfileFlagStatusMessage = 0x0400,
- EProfileFlagProfileName = 0x0800,
- EProfileFlagEmailAlertTone = 0x1000,
- EProfileFlagVideoCallRingingTone = 0x2000,
- EProfileFlagMediaVolume = 0x4000,
- EProfileFlagTextToSpeechTone = 0x8000,
-// Free slot = 0x10000,
- EProfileFlagPttTone = 0x20000,
- EProfileFlagPttStatus = 0x40000,
- EProfileFlag3DEffect = 0x80000,
- EProfileFlag3DEcho = 0x100000,
- EProfileFlagTactileFeedback = 0x200000,
- EProfileFlagAudioFeedback = 0x400000,
- EProfileFlagAll = 0xFFFF
- };
-
-// FORWARD DECLARATIONS
-class MProfileSetName;
-class MProfileSetTones;
-class MProfilePresence;
-class MProfileSetPresence;
-class MProfileSetExtraTones;
-class MProfileSetExtraSettings;
-class CRepository;
-
-// CLASS DECLARATION
-
-/**
-* Extended profile interface.
-* This interface extend MProfile interface.
-*
-* @lib N/A
-* @since 2.0
-*/
-class MProfileExtended : public MProfile
- {
- protected: // Destructor
-
- virtual ~MProfileExtended() {};
-
- public: // New functions
-
- /**
- * This method set alert for items to the profile.
- * @since 2.0
- * @param aAlertFor Alert for item array.
- */
- virtual void SetAlertForL(
- const TArray<TContactItemId>& aAlertFor ) = 0;
-
- /**
- * Returns set profile name interface.
- * @since 2.0
- * @return Returns set profile name interface.
- */
- virtual MProfileSetName& ProfileSetName() const = 0;
-
- /**
- * Returns set profile tones interface.
- * @since 2.0
- * @return Returns set profile tones interface.
- */
- virtual MProfileSetTones& ProfileSetTones() const = 0;
-
- /**
- * Returns profile presence interface.
- * @since 2.0
- * @return Returns profile presence interface.
- */
- virtual const MProfilePresence& ProfilePresence() const = 0;
-
- /**
- * Returns set profile presence interface.
- * @since 2.0
- * @return Returns set profile presence interface.
- */
- virtual MProfileSetPresence& ProfileSetPresence() const = 0;
-
- /**
- * Returns set profile extra tones interface.
- * @since 2.0
- * @return Returns set profile extra tones interface.
- */
- virtual MProfileSetExtraTones& ProfileSetExtraTones() const = 0;
-
- /**
- * Returns profile modifiable flags. See TProfileFlags.
- * @since 2.0
- * @return Returns profile modifiable flags.
- */
- virtual TUint32 ModifiableFlags() const = 0;
-
- /**
- * Returns profile visible flags. See TProfileFlags.
- * @since 2.0
- * @return Returns profile visible flags.
- */
- virtual TUint32 VisibleFlags() const = 0;
-
- /**
- * Externalize data to Central Repository.
- * @since 2.8
- * @param aCenRep Central Repository object to write the settings
- */
- virtual void ExternalizeL( CRepository& aCenRep ) = 0;
-
- /**
- * Returns set profile extra settings interface.
- * @since 3.0
- * @return set profile extra settings interface.
- */
- virtual MProfileSetExtraSettings& ProfileSetExtraSettings() const = 0;
-
- };
-
-#endif // __MPROFILEEXTENDED_H__
-
-// End of File
--- a/profilesservices/ProfileEngine/EngInc/MProfilePresence.h Tue Feb 02 00:22:03 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-/*
-* Copyright (c) 2002 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Profile presence interface.
-*
-*/
-
-
-
-#ifndef __MPROFILEPRESENCE_H
-#define __MPROFILEPRESENCE_H
-
-// INCLUDES
-#include <e32std.h>
-
-// CLASS DECLARATION
-
-/**
-* Profile presence interface.
-* This interface offers methods to get status message and
-* availability attribute.
-*
-* @lib N/A
-* @since 2.0
-*/
-class MProfilePresence
- {
- protected: // Destructor
-
- virtual ~MProfilePresence() {};
-
- public: // New functions
-
- /**
- * Return status message of the profile.
- * @since 2.1
- * @return Status message of the profile.
- */
- virtual const TDesC& StatusMessage() const = 0;
-
- /**
- * Return availability attribute of the profile.
- * @since 2.1
- * @return Return availability attribute of the profile.
- */
- virtual TUint32 AvailabilityAttribute() const = 0;
-
- };
-
-#endif // __MPROFILEPRESENCE_H
-
-// End of File
--- a/profilesservices/ProfileEngine/EngInc/MProfileSet3DToneSettings.h Tue Feb 02 00:22:03 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-/*
-* Copyright (c) 2002 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Profile set 3D tone settings interface.
-*
-*/
-
-
-
-#ifndef MPROFILESET3DTONESETTINGS_H
-#define MPROFILESET3DTONESETTINGS_H
-
-// INCLUDES
-#include <e32def.h>
-
-// FORWARD DECLARATIONS
-
-// CLASS DECLARATION
-
-/**
-* Profile set 3D tone settings interface.
-* @since 3.1
-*/
-class MProfileSet3DToneSettings
- {
- protected: // Destructor
-
- virtual ~MProfileSet3DToneSettings() {};
-
- public: // New functions
-
- /**
- * Set 3D tone effect of the profile.
- * @since 3.1
- */
- virtual void SetEffect( TProfile3DToneEffect aEffect ) = 0;
-
- /**
- * Set 3D tone echo of the profile.
- * @since 3.1
- */
- virtual void SetEcho( TProfile3DToneEcho aEcho ) = 0;
-
- };
-
-#endif // MPROFILESET3DTONESETTINGS_H
-
-// End of File
-
-
-
--- a/profilesservices/ProfileEngine/EngInc/MProfileSetExtraSettings.h Tue Feb 02 00:22:03 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-/*
-* Copyright (c) 2002 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Profile settings interface.
-*
-*/
-
-
-
-#ifndef MPROFILESETEXTRASETTINGS_H
-#define MPROFILESETEXTRASETTINGS_H
-
-// INCLUDES
-#include <e32def.h>
-
-// FORWARD DECLARATIONS
-class MProfileSetPttSettings;
-class MProfileSetFeedbackSettings;
-class MProfileSet3DToneSettings;
-
-// CLASS DECLARATION
-
-/**
-* Interface for modifying Profiles extra settings.
-* @since 3.1
-*/
-class MProfileSetExtraSettings
- {
- protected: // Destructor
-
- virtual ~MProfileSetExtraSettings() {};
-
- public: // New functions
-
- /**
- * Returns set profile ptt settings interface.
- * @return set profile ptt settings interface.
- * @since 3.1
- */
- virtual MProfileSetPttSettings& ProfileSetPttSettings() const = 0;
-
- /**
- * Returns set profile feedback settings interface.
- * @return set profile feedback settings interface.
- * @since 5.0
- */
- virtual MProfileSetFeedbackSettings& ProfileSetFeedbackSettings() const = 0;
-
- /**
- * Returns set profile 3D tone settings interface.
- * @return set profile 3D tone settings interface.
- * @since 3.1
- */
- virtual MProfileSet3DToneSettings& ProfileSet3DToneSettings() const = 0;
-
- };
-
-#endif // MPROFILESETEXTRASETTINGS_H
-
-// End of File
-
-
--- a/profilesservices/ProfileEngine/EngInc/MProfileSetExtraTones.h Tue Feb 02 00:22:03 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-/*
-* Copyright (c) 2002 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Set profile extra tones interface.
-*
-*/
-
-
-
-#ifndef __MPROFILESETEXTRATONES_H
-#define __MPROFILESETEXTRATONES_H
-
-// INCLUDES
-#include <e32std.h>
-
-// CLASS DECLARATION
-
-/**
-* Set profile extra tones interface.
-* This interface offers methods to set IM message alert tone file name.
-*
-* @lib N/A
-* @since 2.0
-*/
-class MProfileSetExtraTones
- {
- protected: // Destructor
-
- virtual ~MProfileSetExtraTones() {};
-
- public: // New functions
-
- /**
- * Set IM message alert tone file name.
- * @since 2.0
- * @param aIMMessageAlertTone IM message alert tone.
- */
- virtual void SetIMMessageAlertToneL(
- const TDesC& aIMMessageAlertTone ) = 0;
-
- /**
- * Set Email alert tone file name.
- * @since 2.0
- * @param aEmailAlertTone Email alert tone.
- */
- virtual void SetEmailAlertToneL(
- const TDesC& aEmailAlertTone ) = 0;
-
- /**
- * Set Video call ringing tone file name.
- * @since 2.6
- * @param aRingingTone Video call ringing tone file name.
- */
- virtual void SetVideoCallRingingToneL(
- const TDesC& aRingingTone ) = 0;
-
- };
-
-
-#endif // __MPROFILESETEXTRATONES_H
-
-// End of File
--- a/profilesservices/ProfileEngine/EngInc/MProfileSetFeedbackSettings.h Tue Feb 02 00:22:03 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-/*
-* Copyright (c) 2007 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Profile set feedback settings interface.
-*
-*/
-
-
-
-#ifndef MPROFILESETFEEDBACKSETTINGS_H
-#define MPROFILESETFEEDBACKSETTINGS_H
-
-// INCLUDES
-#include <e32def.h>
-
-// FORWARD DECLARATIONS
-
-// CLASS DECLARATION
-
-/**
-* Profile set feedback settings interface.
-* @since 5.0
-*/
-class MProfileSetFeedbackSettings
- {
- protected: // Destructor
-
- virtual ~MProfileSetFeedbackSettings() {};
-
- public: // New functions
-
- /**
- * Set tactile feedback of the profile.
- * @since 5.0
- */
- virtual void SetTactileFeedback( TProfileTactileFeedback aTactileFeedback ) = 0;
-
- /**
- * Set audio feedback of the profile.
- * @since 5.0
- */
- virtual void SetAudioFeedback( TProfileAudioFeedback aAudioFeedback ) = 0;
-
- };
-
-#endif // MPROFILESETFEEDBACKSETTINGS_H
-
-// End of File
-
-
-
--- a/profilesservices/ProfileEngine/EngInc/MProfileSetName.h Tue Feb 02 00:22:03 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-/*
-* Copyright (c) 2002 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Set profile name interface.
-*
-*/
-
-
-
-#ifndef __MPROFILESETNAME_H
-#define __MPROFILESETNAME_H
-
-// INCLUDES
-#include <e32std.h>
-
-// CLASS DECLARATION
-
-/**
-* Set profile name interface.
-* This interface offers method to set profile name.
-*
-* @lib N/A
-* @since 2.0
-*/
-class MProfileSetName
- {
- protected: // Destructor
-
- virtual ~MProfileSetName() {};
-
- public: // New functions
-
- /**
- * Set name of the profile.
- * @since 2.0
- * @param aName Name of the profile.
- */
- virtual void SetNameL( const TDesC& aName ) = 0;
-
- };
-
-#endif // __MPROFILESETNAME_H
-
-// End of File
--- a/profilesservices/ProfileEngine/EngInc/MProfileSetPresence.h Tue Feb 02 00:22:03 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-/*
-* Copyright (c) 2002 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Set profile presence settings interface.
-*
-*/
-
-
-
-#ifndef __MPROFILESETPRESENCE_H
-#define __MPROFILESETPRESENCE_H
-
-// INCLUDES
-#include <e32std.h>
-
-// CLASS DECLARATION
-
-/**
-* Set profile presence settings interface.
-* This interface offers methods to set profile status message and
-* availability attribute.
-*
-* @lib N/A
-* @since 2.0
-*/
-class MProfileSetPresence
- {
- protected: // Destructor
-
- virtual ~MProfileSetPresence() {};
-
- public: // New functions
-
- /**
- * Set status message of the profile.
- * @since 2.0
- * @param aStatusMessage status message of the profile.
- */
- virtual void SetStatusMessageL( const TDesC& aStatusMessage ) = 0;
-
- /**
- * Set availability attribute of the profile.
- * @since 2.0
- * @param aAvailabilityAttribute Availability attribute of the profile.
- */
- virtual void SetAvailabilityAttribute(
- const TUint32 aAvailabilityAttribute ) = 0;
- };
-
-#endif // __MPROFILESETPRESENCE_H
-
-// End of File
--- a/profilesservices/ProfileEngine/EngInc/MProfileSetPttSettings.h Tue Feb 02 00:22:03 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-/*
-* Copyright (c) 2002 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Profile set PTT settings interface.
-*
-*/
-
-
-
-#ifndef MPROFILESETPTTSETTINGS_H
-#define MPROFILESETPTTSETTINGS_H
-
-// INCLUDES
-#include <e32def.h>
-
-// FORWARD DECLARATIONS
-
-// CLASS DECLARATION
-
-/**
-* Profile set PTT settings interface.
-* @since 3.1
-*/
-class MProfileSetPttSettings
- {
- protected: // Destructor
-
- virtual ~MProfileSetPttSettings() {};
-
- public: // New functions
-
- /**
- * Set PTT ringing tone file name.
- * @since 3.1
- */
- virtual void SetPttRingingToneL( const TDesC& aPttRingingTone ) = 0;
-
- /**
- * Set PTT status of the profile.
- * @since 3.1
- */
- virtual void SetPttStatus( TProfilePttStatus aPttStatus ) = 0;
-
- };
-
-#endif // MPROFILESETPTTSETTINGS_H
-
-// End of File
-
-
--- a/profilesservices/ProfileEngine/EngInc/MProfileSetTones.h Tue Feb 02 00:22:03 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-/*
-* Copyright (c) 2002 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Set tone settings interface.
-*
-*/
-
-
-
-#ifndef __MPROFILESETTONES_H
-#define __MPROFILESETTONES_H
-
-// INCLUDES
-#include <e32std.h>
-
-// FORWARD DECLARATIONS
-struct TProfileToneSettings;
-
-// CLASS DECLARATION
-
-/**
-* Set tone settings interface.
-* This interface offers methods to set line 1 and 2 ringing tone,
-* message alert tone and tone settings.
-*
-* @lib N/A
-* @since 2.0
-*/
-class MProfileSetTones
- {
- protected: // Destructor
-
- virtual ~MProfileSetTones() {};
-
- public: // New functions
-
- /**
- * Set line 1 ringing tone.
- * @since 2.0
- * @param aRingingTone File name of the ringing tone.
- */
- virtual void SetRingingTone1L( const TDesC& aRingingTone ) = 0;
-
- /**
- * Set line 2 ringing tone.
- * @since 2.0
- * @param aRingingTone File name of the ringing tone.
- */
- virtual void SetRingingTone2L( const TDesC& aRingingTone ) = 0;
-
- /**
- * Set message alert tone.
- * @since 2.0
- * @param aMessageAlertTone File name of the message alert tone.
- */
- virtual void SetMessageAlertToneL(
- const TDesC& aMessageAlertTone ) = 0;
-
- /**
- * Set tone settings of the profile.
- * @since 2.0
- * @return Tone settings structure.
- */
- virtual TProfileToneSettings& SetToneSettings() = 0;
-
- };
-
-#endif // __MPROFILESETTONES_H
-
-// End of File
--- a/profilesservices/ProfileEngine/EngInc/MProfileUtilitySingleton.h Tue Feb 02 00:22:03 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-/*
-* Copyright (c) 2002 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Profile Utility interface.
-*
-*/
-
-
-
-#ifndef __MPROFILEUTILITYSINGLETON_H__
-#define __MPROFILEUTILITYSINGLETON_H__
-
-// INCLUDES
-
-// FORWARD DECLARATIONS
-class MProfileUtilitySingleton;
-class MProfilesLocalFeatures;
-
-// FUNCTION PROTOTYPES
-/**
-* Return reference to MProfileUtilitySingleton instance. Create it if
-* necessary. For each succesful InstanceL() call there must be a corres-
-* ponding Release() call, so that the internal reference counting works.
-* @since 3.2
-* @return Reference to the only MProfileUtilitySingleton instance.
-*/
-IMPORT_C MProfileUtilitySingleton& ProfileUtilityInstanceL();
-
-/**
-* Release the resources of MProfileUtilitySingleton (when there are no
-* references to it anymore). For each succesful InstanceL() call there
-* must be a corresponding Release() call, so that the internal
-* reference counting works.
-* @since 3.2
-*/
-IMPORT_C void ReleaseProfileUtility();
-
-
-// CLASS DECLARATION
-/**
-* Profile utility class.
-*
-* @lib profileeng.lib
-* @since 3.2
-*/
-class MProfileUtilitySingleton
- {
- protected: // Destructor
-
- virtual ~MProfileUtilitySingleton() {};
-
- public: // New functions
-
- /**
- * Returns a reference to MProfilesLocalFeatures instance owned by
- * this MProfileUtility instance.
- * @since 3.2
- */
- virtual MProfilesLocalFeatures& ProfilesLocalFeatures() = 0;
-
- };
-
-#endif // __MPROFILEUTILITYSINGLETON_H__
-
-// End of File
-
--- a/profilesservices/ProfileEngine/EngInc/MProfilesLocalFeatures.h Tue Feb 02 00:22:03 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,110 +0,0 @@
-/*
-* Copyright (c) 2002 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Interface for locally variated features of Profiles.
-*
-*/
-
-
-
-#ifndef __MPROFILESLOCALFEATURES_H__
-#define __MPROFILESLOCALFEATURES_H__
-
-// CLASS DECLARATION
-
-/**
-* Profiles local feature variation interface.
-* MProfilesLocalFeatures offers simple interface to get locally variated
-* features of Profiles.
-* How to use:
-* Get local features object with MProfileEngineExtended::LocalFeaturesL().
-* MProfilesLocalFeatures& features = iProfileEngine->LocalFeatures();
-* Check whether a feature is supported (use the ID:s defined in
-* ProfilesVariant.hrh):
-* if( features.IsFeatureSupported( KFeatureIdSomeFeature ) )
-* {
-* // do stuff
-* }
-*
-* @lib N/A
-* @since 2.6
-*/
-class MProfilesLocalFeatures
- {
- protected: // Destructor
-
- virtual ~MProfilesLocalFeatures() {};
-
- public: // New functions
-
- /**
- * Checks if the given feature is supported or not.
- * @since 2.6
- * @return ETrue if the feature is supported, EFalse otherwise.
- */
- virtual TBool IsFeatureSupported( TInt aFeatureId ) const = 0;
-
- /**
- * Checks if the given MIME-type is explicitly blocked from using as
- * an alert tone.
- * @since 3.1
- * @param aMimeType the MIME-type to be checked.
- * @return ETrue if the MIME-type is blocked, EFalse otherwise.
- */
- virtual TBool IsBlockedType( const TDesC& aMimeType ) = 0;
-
- /**
- * Checks if the given MIME-type is explicitly blocked from using as
- * an alert tone if the alert tone file of the type is unprotected.
- * @since 3.1
- * @param aMimeType the MIME-type to be checked.
- * @return ETrue if the MIME-type is blocked if the alert tone file is
- * unprotected, EFalse otherwise.
- */
- virtual TBool IsBlockedUnprotectedType( const TDesC& aMimeType ) = 0;
-
- /**
- * Checks if the given MIME-type is explicitly blocked from using as
- * an alert tone if the alert tone file of the type is protected.
- * @since 3.1
- * @param aMimeType the MIME-type to be checked.
- * @return ETrue if the MIME-type is blocked if the alert tone file is
- * protected, EFalse otherwise.
- */
- virtual TBool IsBlockedProtectedType( const TDesC& aMimeType ) = 0;
-
- /**
- * Checks if the given MIME-type is explicitly blocked from demo
- * playing.
- * @since 3.1
- * @param aMimeType the MIME-type to be checked.
- * @return ETrue if the MIME-type is blocked from demo-playing,
- * EFalse otherwise.
- */
- virtual TBool IsBlockedDemoPlayType( const TDesC& aMimeType ) = 0;
-
- /**
- * Checks if the given MIME-type is explicitly excluded from the tone
- * selection list. Also when tried to be set as alert tones through
- * other means, should behave as the tone would be in blocked type list.
- * @since 3.1
- * @param aMimeType the MIME-type to be checked.
- * @return ETrue if the MIME-type is excluded from the tone selection
- * list, EFalse otherwise.
- */
- virtual TBool IsExcludedType( const TDesC& aMimeType ) = 0;
- };
-
-#endif // __MPROFILESLOCALFEATURES_H__
-
-// End of File
--- a/profilesservices/ProfileEngine/EngInc/ProfileEng.hrh Tue Feb 02 00:22:03 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-/*
-* Copyright (c) 2002 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Profiles Engine enumeration TProfileSettingKeyType
-* and TProfileSettingId.
-*
-*/
-
-
-#ifndef __PROFILEENG_HRH__
-#define __PROFILEENG_HRH__
-
-#define PROFILES_ENGINE_RESOURCE_SIGNATURE 75
-#define PROFILES_MAX_NAME_LENGTH 64
-#define PROFILES_MAX_STATUS_MSG_LENGTH 40
-#define PROFILES_MAX_CALL_OBJECT_TEXT_LENGTH 1000
-
-// DATA TYPES
-enum TProfileSettingKeyType
- {
- EProfileSettingKeyTypeInt = 0,
- EProfileSettingKeyTypeString = 1,
- EProfileSettingKeyTypeBin = 2,
- EProfileSettingKeyTypeReal = 3
- };
-
-enum TProfileSettingId
- {
- EProfileSettingIdModifiableFlags = 0x00000000,
- EProfileSettingIdVisibleFlags = 0x00000001,
- EProfileSettingIdProfileName = 0x00000002,
- EProfileSettingIdAlertForGroups = 0x00000003,
- EProfileSettingIdRingingTone = 0x00000004,
- EProfileSettingIdRingingTone2 = 0x00000005,
- EProfileSettingIdMsgTone = 0x00000006,
- EProfileSettingIdRingingType = 0x00000007,
- EProfileSettingIdKeypadVolume = 0x00000008,
- EProfileSettingIdRingingVolume = 0x00000009,
- EProfileSettingIdVibra = 0x0000000A,
- EProfileSettingIdWarnAndGameTones = 0x0000000B,
- EProfileSettingIdImTone = 0x0000000C,
- EProfileSettingIdEmailTone = 0x0000000D,
- EProfileSettingIdVideoCallTone = 0x0000000E,
- EProfileSettingIdStatusMsg = 0x0000000F,
- EProfileSettingIdAvailAttribute = 0x00000010,
- EProfileSettingIdMediaVolume = 0x00000011,
- EProfileSettingIdTextToSpeechTone = 0x00000012,
- EProfileSettingIdNameChanged = 0x00000013,
- EProfileSettingIdCallObjectContent = 0x00000014,
- EProfileSettingIdPttTone = 0x00000015,
- EProfileSettingIdPttStatus = 0x00000016,
- EProfileSettingId3DEffect = 0x00000017,
- EProfileSettingId3DEcho = 0x00000018,
- EProfileSettingIdTactileFeedback = 0x00000019,
- EProfileSettingIdAudioFeedback = 0x0000001A,
- EProfileSettingIdEmailVibra=0x0000001B
- };
-
-#endif // __PROFILEENG_HRH__
-
-// End of File
-
--- a/profilesservices/ProfileEngine/EngInc/ProfileEng.rh Tue Feb 02 00:22:03 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-/*
-* Copyright (c) 2002 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Profiles Engine resource structures.
-*
-*/
-
-
-// STRUCTURE DEFINITIONS
-
-// -----------------------------------------------------------------------------
-// DEFAULT_PROFILES
-// Default profiles
-// -----------------------------------------------------------------------------
-//
-STRUCT DEFAULT_PROFILES
- {
- STRUCT items[];
- }
-
-// -----------------------------------------------------------------------------
-// PROFILE
-// profile default name and ID
-// -----------------------------------------------------------------------------
-//
-STRUCT PROFILE
- {
- LONG id = 0;
- LTEXT name = "";
- LTEXT shortname = "";
- LTEXT naviname = "";
- LTEXT titlename = "";
- }
-
-// -----------------------------------------------------------------------------
-// PROFILE_SETTINGS
-// Profile settings
-// -----------------------------------------------------------------------------
-//
-STRUCT PROFILE_SETTINGS
- {
- STRUCT items[];
- }
-
-// -----------------------------------------------------------------------------
-// PROFILE SETTING
-// profile setting for dynamic profiles
-// -----------------------------------------------------------------------------
-//
-STRUCT PROFILE_SETTING
- {
- LONG id = 0;
- LONG key_type = 0;
- }
-
-// End of File
--- a/profilesservices/ProfileEngine/EngInc/ProfileEngineConstants.h Tue Feb 02 00:22:03 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
-* Copyright (c) 2002 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Profiles engine constants
-*
-*/
-
-
-
-#ifndef PROFILEENGINECONSTANTS_H
-#define PROFILEENGINECONSTANTS_H
-
-// INCLUDES
-#include <e32std.h>
-#include "ProfileEng.hrh"
-
-// CONSTANTS
-const TInt KProfileFileEstimationSize( 400 );
-const TInt KProfilesMaxNumberOfDynamicProfiles( 20 );
-const TInt KProfilesMaxTIntLength( 11 );
-const TInt KProfileMaxNameLength( PROFILES_MAX_NAME_LENGTH );
-const TInt KProfileMaxCallObjectTextLength( 1000 );
-const TInt KProfileBaseDynamicProfileId( 30 ); // first dynamic profile ID
-// Used for profile settings cenrep-keys - profile id is encoded in the MSB:
-const TInt KProfileIdShift( 24 );
-
-_LIT( KProfileDriveC, "c:" );
-_LIT( KProfileDriveZ, "z:" );
-_LIT( KProfileFilePrefix, "Profile" );
-_LIT( KProfileFileExtension, ".dat" );
-_LIT( KProfileFilePath, "\\System\\Data\\Profiles\\" );
-_LIT( KProfileEngineResourceDriveAndDir, "Z:ProfileEng.rsc" );
-_LIT( KProfileMutexName, "ProfileFileAccessMutexName" );
-
-#endif // PROFILEENGINECONSTANTS_H
-
-// End of File
--- a/profilesservices/ProfileEngine/EngInc/ProfileEngineInternalCRKeys.h Tue Feb 02 00:22:03 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
-/*
-* Copyright (c) 2002 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Profiles engine internal Central Repository keys.
-*
-*/
-
-
-
-#ifndef PROFILEENGINEINTERNALCRKEYS_H
-#define PROFILEENGINEINTERNALCRKEYS_H
-
-// INCLUDES
-#include <e32std.h>
-#include <ProfileEngineDomainCRKeys.h>
-
-// CONSTANTS
-
-/**
- * Information about whether self recorded tones can be used as ringing tones
- * or not. Integer value.
- *
- * Possible values:
- *
- * 0 (disabled)
- * 1 (enabled)
- */
-const TUint32 KProEngRecordedRingingTones = 0x80000100;
-
-/**
- * If this is true, DRM protected MP4 tones are not allowed as ringing tones.
- *
- * Possible values:
- *
- * 0 (allowed, default)
- * 1 (not allowed)
- */
-const TUint32 KProEngNoDrmMP4RingingTones = 0x80000101;
-
-/**
- * If this is true, WMA tones are not allowed as ringing tones.
- *
- * Possible values:
- *
- * 0 (allowed, default)
- * 1 (not allowed)
- */
-const TUint32 KProEngNoWmaRingingTones = 0x80000102;
-
-/**
- * Tactile feedback setting for the currently active profile.
- * THIS COULD BE MOVED TO THE SDK HEADER LATER?
- *
- * Possible values:
- *
- * 0 (Off)
- * 1 (Level 1)
- * 2 (Level 2)
- * 3 (Level 3)
- */
-const TUint32 KProEngActiveTactileFeedback = 0x7E000019;
-
-/**
- * Audio feedback setting for the currently active profile.
- * THIS COULD BE MOVED TO THE SDK HEADER LATER?
- *
- * Possible values:
- *
- * 0 (Off)
- * 1 (Level 1)
- * 2 (Level 2)
- * 3 (Level 3)
- */
-const TUint32 KProEngActiveAudioFeedback = 0x7E00001A;
-
-
-#endif // PROFILEENGINEINTERNALCRKEYS_H
-
-// End of File
--- a/profilesservices/ProfileEngine/EngInc/ProfileEngineInternalPSKeys.h Tue Feb 02 00:22:03 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-* Copyright (c) 2002 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Profiles engine internal Publish & Subscribe keys.
-*
-*/
-
-
-
-#ifndef PROFILEENGINEINTERNALPSKEYS_H
-#define PROFILEENGINEINTERNALPSKEYS_H
-
-// INCLUDES
-#include <e32std.h>
-
-// CONSTANTS
-const TUid KPSUidProfileEngine = {0x101F879F};
-
-#endif // PROFILEENGINEINTERNALPSKEYS_H
-
-// End of File
-
--- a/profilesservices/ProfileEngine/EngInc/ProfileEnginePrivateCRKeys.h Tue Feb 02 00:22:03 2010 +0200
+++ b/profilesservices/ProfileEngine/EngInc/ProfileEnginePrivateCRKeys.h Fri Feb 19 23:06:10 2010 +0200
@@ -23,7 +23,7 @@
// INCLUDES
#include <e32std.h>
#include <ProfileEngineInternalCRKeys.h>
-#include "ProfileEng.hrh"
+#include <ProfileEng.hrh>
// CONSTANTS
/**
@@ -55,6 +55,7 @@
*/
const TUint32 KProEngSchedulerTaskId = 0x80000005;
+const TUint32 KProEngPreviousActiveName = 0x80000006;
//
// The rest of the constants are used with profile-specific settings. The
// actual key for a setting of a profile must be constructed as follows:
--- a/profilesservices/ProfileEngine/EngInc/ProfileEnginePrivatePSKeys.h Tue Feb 02 00:22:03 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
-* Copyright (c) 2002 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Profiles engine internal Publish & Subscribe keys.
-*
-*/
-
-
-
-#ifndef PROFILEENGINEPRIVATEPSKEYS_H
-#define PROFILEENGINEPRIVATEPSKEYS_H
-
-// INCLUDES
-#include <e32std.h>
-#include "ProfileEngineInternalPSKeys.h"
-
-// CONSTANTS
-
-/**
- * A setting in the current active profile was modified. This is used
- * internally by Profiles Engine notification mechanism.
- * Default value: 0.
- */
-const TUint32 KProEngActiveProfileModified = 0x7D000001;
-
-/**
- * The current active profile has changed (or the active profile has been
- * reactivated). This is used internally by Profiles Engine notification
- * mechanism.
- * Default value: 0.
- */
-const TUint32 KProEngActiveProfileChanged = 0x7D000002;
-
-/**
- * Power save mode has changed.
- * This is used internally by Profiles Engine.
- * Default value: 0.
- */
-const TUint32 KProEngPsmChanged = 0x7D000003;
-
-#endif // PROFILEENGINEPRIVATEPSKEYS_H
-
-// End of File
--- a/profilesservices/ProfileEngine/EngSrc/CProfile3DToneSettingsImpl.h Tue Feb 02 00:22:03 2010 +0200
+++ b/profilesservices/ProfileEngine/EngSrc/CProfile3DToneSettingsImpl.h Fri Feb 19 23:06:10 2010 +0200
@@ -23,7 +23,7 @@
// INCLUDES
#include <e32base.h>
#include <MProfile3DToneSettings.h>
-#include "MProfileSet3DToneSettings.h"
+#include <MProfileSet3DToneSettings.h>
// FORWARD DECLARATIONS
class CRepository;
--- a/profilesservices/ProfileEngine/EngSrc/CProfileChangeNotifyHandler.cpp Tue Feb 02 00:22:03 2010 +0200
+++ b/profilesservices/ProfileEngine/EngSrc/CProfileChangeNotifyHandler.cpp Fri Feb 19 23:06:10 2010 +0200
@@ -22,7 +22,7 @@
#include "MProfileChangeObserver.h"
#include "ProfileEngPanic.h"
#include "ProfileEngineSDKCRKeys.h"
-#include "ProfileEnginePrivatePSKeys.h"
+#include <ProfileEnginePrivatePSKeys.h>
#include <centralrepository.h>
// ============================ MEMBER FUNCTIONS ===============================
--- a/profilesservices/ProfileEngine/EngSrc/CProfileEngineImpl.cpp Tue Feb 02 00:22:03 2010 +0200
+++ b/profilesservices/ProfileEngine/EngSrc/CProfileEngineImpl.cpp Fri Feb 19 23:06:10 2010 +0200
@@ -33,21 +33,21 @@
#include "CProfileImpl.h"
#include "CProfileNameImpl.h"
#include "ProfileEngUtils.h"
-#include "MProfileSetName.h"
-#include "ProfileEng.hrh"
-#include "ProfileEngineConstants.h"
+#include <MProfileSetName.h>
+#include <ProfileEng.hrh>
+#include <ProfileEngineConstants.h>
#include "ProfileEngPanic.h"
-#include "MProfileSetTones.h"
-#include "MProfileSetExtraTones.h"
+#include <MProfileSetTones.h>
+#include <MProfileSetExtraTones.h>
#include "MProfileExtraSettings.h"
#include "MProfileFeedbackSettings.h"
-#include "MProfilesLocalFeatures.h"
-#include "MProfileUtilitySingleton.h"
+#include <MProfilesLocalFeatures.h>
+#include <MProfileUtilitySingleton.h>
#include "ProfilesVariant.hrh" // KProEngFeatureIdVTRingingTone
#include "CProfileTiming.h"
#include <centralrepository.h>
#include "ProfileEnginePrivateCRKeys.h"
-#include "ProfileEnginePrivatePSKeys.h"
+#include <ProfileEnginePrivatePSKeys.h>
#include <hwrmvibrasdkcrkeys.h>
#include <data_caging_path_literals.hrh>
#include "ProfilesDebug.h"
@@ -306,12 +306,41 @@
void CProfileEngineImpl::SetActiveProfileL( TInt aId )
{
PRODEBUG1( "SetActiveProfileL( %d )", aId );
+ const TInt KProEngPreviousActiveNameLength( 128 );
CreatePubSubKeysIfNeededL();
iMutex.Wait();
TInt err( CheckProfileIdL( aId ) );
-
+ TInt nameCompare = 0;
+ if( this->IsActiveProfileTimedL() )
+ {
+ HBufC* tempProfileName = HBufC::NewL(KProEngPreviousActiveNameLength);
+ CleanupStack::PushL(tempProfileName);
+ TPtr tempName = tempProfileName->Des();
+ TInt cenrepErr = iCenRep->Get( KProEngPreviousActiveName,tempName );
+ if( tempName.Length() )
+ {
+ TBuf<64> activeProfileName = this->ProfileLC(aId)->ProfileName().Name();
+ nameCompare = activeProfileName.Compare( tempName );
+ CleanupStack::PopAndDestroy();
+ }
+ CleanupStack::PopAndDestroy();
+ User::LeaveIfError( iCenRep->StartTransaction(
+ CRepository::EReadWriteTransaction ) );
+ iCenRep->CleanupCancelTransactionPushL();
+ iCenRep->Set(KProEngPreviousActiveName,_L(""));
+ TUint32 ignore( 0 );
if( !err )
+ {
+ err = iCenRep->CommitTransaction( ignore );
+ }
+ else
+ {
+ iCenRep->CancelTransaction();
+ }
+ CleanupStack::PopAndDestroy();
+ }
+ if( !err && !nameCompare )
{
TRAP( err, DoSetActiveProfileL( aId ) );
}
@@ -360,7 +389,21 @@
if( !err )
{
+ User::LeaveIfError( iCenRep->StartTransaction(
+ CRepository::EReadWriteTransaction ) );
+ iCenRep->CleanupCancelTransactionPushL();
+ iCenRep->Set(KProEngPreviousActiveName,this->ActiveProfileLC()->ProfileName().Name());
+ TUint32 ignore( 0 );
+ err = iCenRep->CommitTransaction( ignore );
+ if( !err )
+ {
TRAP( err, DoSetActiveProfileL( aId, &aTime ) );
+ }
+ else
+ {
+ iCenRep->CancelTransaction();
+ }
+ CleanupStack::PopAndDestroy(2);
}
iMutex.Signal();
--- a/profilesservices/ProfileEngine/EngSrc/CProfileEngineImpl.h Tue Feb 02 00:22:03 2010 +0200
+++ b/profilesservices/ProfileEngine/EngSrc/CProfileEngineImpl.h Fri Feb 19 23:06:10 2010 +0200
@@ -24,8 +24,8 @@
#include <e32property.h>
#include <f32file.h> // RFs
#include <Profile.hrh> // TProfileRingingVolume
-#include "MProfileEngineExtended.h" // MProfileEngineExtended
-#include "MProfileExtended.h" // MProfileExtended
+#include <MProfileEngineExtended.h> // MProfileEngineExtended
+#include <MProfileExtended.h> // MProfileExtended
// FORWARD DECLARATIONS
class CProfileNameImpl;
--- a/profilesservices/ProfileEngine/EngSrc/CProfileEngineImplDynamicProfiles.cpp Tue Feb 02 00:22:03 2010 +0200
+++ b/profilesservices/ProfileEngine/EngSrc/CProfileEngineImplDynamicProfiles.cpp Fri Feb 19 23:06:10 2010 +0200
@@ -33,10 +33,10 @@
#include "CProfileImpl.h"
#include "CProfileNameImpl.h"
#include "ProfileEngUtils.h"
-#include "MProfileSetName.h"
-#include "ProfileEng.hrh"
+#include <MProfileSetName.h>
+#include <ProfileEng.hrh>
#include "ProfileEngPanic.h"
-#include "ProfileEngineConstants.h"
+#include <ProfileEngineConstants.h>
#include "ProfileEnginePrivateCRKeys.h"
namespace
--- a/profilesservices/ProfileEngine/EngSrc/CProfileExtraSettingsImpl.h Tue Feb 02 00:22:03 2010 +0200
+++ b/profilesservices/ProfileEngine/EngSrc/CProfileExtraSettingsImpl.h Fri Feb 19 23:06:10 2010 +0200
@@ -23,7 +23,7 @@
// INCLUDES
#include <e32base.h>
#include <MProfileExtraSettings.h>
-#include "MProfileSetExtraSettings.h"
+#include <MProfileSetExtraSettings.h>
// FORWARD DECLARATIONS
class CRepository;
--- a/profilesservices/ProfileEngine/EngSrc/CProfileExtraTonesImpl.h Tue Feb 02 00:22:03 2010 +0200
+++ b/profilesservices/ProfileEngine/EngSrc/CProfileExtraTonesImpl.h Fri Feb 19 23:06:10 2010 +0200
@@ -23,7 +23,7 @@
// INCLUDES
#include <e32base.h>
#include <MProfileExtraTones.h>
-#include "MProfileSetExtraTones.h"
+#include <MProfileSetExtraTones.h>
// FORWARD DECLARATIONS
class RWriteStream;
--- a/profilesservices/ProfileEngine/EngSrc/CProfileFeedbackSettingsImpl.h Tue Feb 02 00:22:03 2010 +0200
+++ b/profilesservices/ProfileEngine/EngSrc/CProfileFeedbackSettingsImpl.h Fri Feb 19 23:06:10 2010 +0200
@@ -23,7 +23,7 @@
// INCLUDES
#include <e32base.h>
#include <MProfileFeedbackSettings.h>
-#include "MProfileSetFeedbackSettings.h"
+#include <MProfileSetFeedbackSettings.h>
// FORWARD DECLARATIONS
class CRepository;
--- a/profilesservices/ProfileEngine/EngSrc/CProfileImpl.cpp Tue Feb 02 00:22:03 2010 +0200
+++ b/profilesservices/ProfileEngine/EngSrc/CProfileImpl.cpp Fri Feb 19 23:06:10 2010 +0200
@@ -35,8 +35,8 @@
#include "CProfileExtraTonesImpl.h"
#include "CProfileExtraSettingsImpl.h"
#include "CProfilePresenceImpl.h"
-#include "MProfilesLocalFeatures.h"
-#include "MProfileUtilitySingleton.h"
+#include <MProfilesLocalFeatures.h>
+#include <MProfileUtilitySingleton.h>
#include "ProfilesVariant.hrh"
#include "ProfileEngUtils.h"
#include "ProfileEnginePrivateCRKeys.h"
--- a/profilesservices/ProfileEngine/EngSrc/CProfileImpl.h Tue Feb 02 00:22:03 2010 +0200
+++ b/profilesservices/ProfileEngine/EngSrc/CProfileImpl.h Fri Feb 19 23:06:10 2010 +0200
@@ -22,7 +22,7 @@
// INCLUDES
#include <e32base.h>
-#include "MProfileExtended.h"
+#include <MProfileExtended.h>
#include <centralrepository.h> // NCentralRepositoryConstants::KMaxBinaryLength
// CONSTANTS
--- a/profilesservices/ProfileEngine/EngSrc/CProfileNameImpl.cpp Tue Feb 02 00:22:03 2010 +0200
+++ b/profilesservices/ProfileEngine/EngSrc/CProfileNameImpl.cpp Fri Feb 19 23:06:10 2010 +0200
@@ -21,7 +21,7 @@
#include "CProfileNameImpl.h"
#include <s32strm.h>
#include <MProfilesNamesArray.h>
-#include "ProfileEngineConstants.h"
+#include <ProfileEngineConstants.h>
#include <centralrepository.h>
#include "ProfileEnginePrivateCRKeys.h"
#include "ProfileEngUtils.h"
--- a/profilesservices/ProfileEngine/EngSrc/CProfileNameImpl.h Tue Feb 02 00:22:03 2010 +0200
+++ b/profilesservices/ProfileEngine/EngSrc/CProfileNameImpl.h Fri Feb 19 23:06:10 2010 +0200
@@ -23,7 +23,7 @@
// INCLUDES
#include <MProfileName.h>
#include <e32base.h>
-#include "MProfileSetName.h"
+#include <MProfileSetName.h>
// FORWARD DECLARATIONS
class RWriteStream;
--- a/profilesservices/ProfileEngine/EngSrc/CProfilePresenceImpl.cpp Tue Feb 02 00:22:03 2010 +0200
+++ b/profilesservices/ProfileEngine/EngSrc/CProfilePresenceImpl.cpp Fri Feb 19 23:06:10 2010 +0200
@@ -24,8 +24,8 @@
#include <bautils.h>
#include <barsc.h>
#include <ProfileEng.rsg>
-#include "ProfileEng.hrh"
-#include "ProfileEngineConstants.h"
+#include <ProfileEng.hrh>
+#include <ProfileEngineConstants.h>
#include "ProfileEnginePrivateCRKeys.h"
#include "ProfileEngUtils.h"
--- a/profilesservices/ProfileEngine/EngSrc/CProfilePresenceImpl.h Tue Feb 02 00:22:03 2010 +0200
+++ b/profilesservices/ProfileEngine/EngSrc/CProfilePresenceImpl.h Fri Feb 19 23:06:10 2010 +0200
@@ -22,8 +22,8 @@
// INCLUDES
#include <e32base.h>
-#include "MProfilePresence.h"
-#include "MProfileSetPresence.h"
+#include <MProfilePresence.h>
+#include <MProfileSetPresence.h>
// CONSTANTS
// MACROS
--- a/profilesservices/ProfileEngine/EngSrc/CProfilePttSettingsImpl.h Tue Feb 02 00:22:03 2010 +0200
+++ b/profilesservices/ProfileEngine/EngSrc/CProfilePttSettingsImpl.h Fri Feb 19 23:06:10 2010 +0200
@@ -23,7 +23,7 @@
// INCLUDES
#include <e32base.h>
#include <MProfilePttSettings.h>
-#include "MProfileSetPttSettings.h"
+#include <MProfileSetPttSettings.h>
// FORWARD DECLARATIONS
class CRepository;
--- a/profilesservices/ProfileEngine/EngSrc/CProfileTiming.cpp Tue Feb 02 00:22:03 2010 +0200
+++ b/profilesservices/ProfileEngine/EngSrc/CProfileTiming.cpp Fri Feb 19 23:06:10 2010 +0200
@@ -22,8 +22,8 @@
#include <ProfilesVariant.hrh>
#include <f32file.h> // TParse
#include <data_caging_path_literals.hrh>
-#include "MProfilesLocalFeatures.h"
-#include "ProfileEngineConstants.h"
+#include <MProfilesLocalFeatures.h>
+#include <ProfileEngineConstants.h>
#include "ProfileEnginePrivateCRKeys.h"
#include "ProfilesDebug.h"
--- a/profilesservices/ProfileEngine/EngSrc/CProfileTonesImpl.h Tue Feb 02 00:22:03 2010 +0200
+++ b/profilesservices/ProfileEngine/EngSrc/CProfileTonesImpl.h Fri Feb 19 23:06:10 2010 +0200
@@ -24,7 +24,7 @@
#include <e32base.h>
#include <MProfileTones.h>
#include <TProfileToneSettings.h>
-#include "MProfileSetTones.h"
+#include <MProfileSetTones.h>
// FORWARD DECLARATIONS
class RWriteStream;
--- a/profilesservices/ProfileEngine/EngSrc/CProfileUtilitySingletonImpl.cpp Tue Feb 02 00:22:03 2010 +0200
+++ b/profilesservices/ProfileEngine/EngSrc/CProfileUtilitySingletonImpl.cpp Fri Feb 19 23:06:10 2010 +0200
@@ -19,7 +19,7 @@
// INCLUDE FILES
#include "CProfileUtilitySingletonImpl.h"
-#include "MProfilesLocalFeatures.h"
+#include <MProfilesLocalFeatures.h>
#include "CProfilesLocalFeatures.h"
#include "ProfilesDebug.h"
--- a/profilesservices/ProfileEngine/EngSrc/CProfileUtilitySingletonImpl.h Tue Feb 02 00:22:03 2010 +0200
+++ b/profilesservices/ProfileEngine/EngSrc/CProfileUtilitySingletonImpl.h Fri Feb 19 23:06:10 2010 +0200
@@ -23,7 +23,7 @@
// INCLUDES
#include <e32base.h>
-#include "MProfileUtilitySingleton.h"
+#include <MProfileUtilitySingleton.h>
// FORWARD DECLARATIONS
class MProfilesLocalFeatures;
--- a/profilesservices/ProfileEngine/EngSrc/CProfilesLocalFeatures.h Tue Feb 02 00:22:03 2010 +0200
+++ b/profilesservices/ProfileEngine/EngSrc/CProfilesLocalFeatures.h Fri Feb 19 23:06:10 2010 +0200
@@ -23,7 +23,7 @@
// INCLUDES
#include <e32base.h>
-#include "MProfilesLocalFeatures.h"
+#include <MProfilesLocalFeatures.h>
// FORWARD DECLARATIONS
class CRepository;
--- a/profilesservices/ProfileEngine/EngSrc/CProfilesNamesArrayImpl.cpp Tue Feb 02 00:22:03 2010 +0200
+++ b/profilesservices/ProfileEngine/EngSrc/CProfilesNamesArrayImpl.cpp Fri Feb 19 23:06:10 2010 +0200
@@ -22,9 +22,9 @@
#include <collate.h>
#include <MProfilesNamesArray.h>
#include "CProfileNameImpl.h"
-#include "ProfileEng.hrh"
+#include <ProfileEng.hrh>
#include "ProfileEngPanic.h"
-#include "ProfileEngineConstants.h"
+#include <ProfileEngineConstants.h>
// LOCAL CONSTANTS AND MACROS
const TInt KProfileNamesGranularity( 5 );
--- a/profilesservices/ProfileEngine/EngSrc/ProfileEngUtils.cpp Tue Feb 02 00:22:03 2010 +0200
+++ b/profilesservices/ProfileEngine/EngSrc/ProfileEngUtils.cpp Fri Feb 19 23:06:10 2010 +0200
@@ -20,7 +20,7 @@
// INCLUDE FILES
#include "ProfileEngUtils.h"
#include "CProfileEngineImpl.h"
-#include "ProfileEngineConstants.h"
+#include <ProfileEngineConstants.h>
#include <RSSSettings.h>
#include <centralrepository.h>
#include <bldvariant.hrh>
--- a/profilesservices/ProfileEngine/ProfileScheduleEventSrc/CProfileChangeEvent.cpp Tue Feb 02 00:22:03 2010 +0200
+++ b/profilesservices/ProfileEngine/ProfileScheduleEventSrc/CProfileChangeEvent.cpp Fri Feb 19 23:06:10 2010 +0200
@@ -34,7 +34,7 @@
#include <ProfileScheduleEvent.rsg>
#include "ProfileEnginePrivateCRKeys.h"
-#include "ProfileEngineConstants.h"
+#include <ProfileEngineConstants.h>
#include "ProfilesDebug.h"
--- a/profilesservices/ProfileEngine/WrapperSrc/CProEngActiveProfileDelegate.cpp Tue Feb 02 00:22:03 2010 +0200
+++ b/profilesservices/ProfileEngine/WrapperSrc/CProEngActiveProfileDelegate.cpp Fri Feb 19 23:06:10 2010 +0200
@@ -19,7 +19,7 @@
// INCLUDE FILES
#include "CProEngActiveProfileDelegate.h"
-#include "ProfileEnginePrivatePSKeys.h" // KProEngActiveProfileModified
+#include <ProfileEnginePrivatePSKeys.h> // KProEngActiveProfileModified
#include <MProEngActiveProfileObserver.h>
// ============================ MEMBER FUNCTIONS ===============================
--- a/profilesservices/ProfileEngine/WrapperSrc/CProEngCenRepObserverBase.cpp Tue Feb 02 00:22:03 2010 +0200
+++ b/profilesservices/ProfileEngine/WrapperSrc/CProEngCenRepObserverBase.cpp Fri Feb 19 23:06:10 2010 +0200
@@ -20,7 +20,7 @@
// INCLUDE FILES
#include "CProEngCenRepObserverBase.h"
#include <centralrepository.h>
-#include "ProfileEnginePrivatePSKeys.h"
+#include <ProfileEnginePrivatePSKeys.h>
#include "ProfileEngineSDKCRKeys.h"
// ============================ MEMBER FUNCTIONS ===============================
--- a/profilesservices/ProfileEngine/WrapperSrc/CProEngEngineImpl.cpp Tue Feb 02 00:22:03 2010 +0200
+++ b/profilesservices/ProfileEngine/WrapperSrc/CProEngEngineImpl.cpp Fri Feb 19 23:06:10 2010 +0200
@@ -22,8 +22,8 @@
#include <f32file.h>
#include <MProEngProfile.h>
#include <MProEngProfileNameArray.h>
-#include "MProfileEngineExtended.h"
-#include "ProfileEngineConstants.h"
+#include <MProfileEngineExtended.h>
+#include <ProfileEngineConstants.h>
#include "CProEngProfileImpl.h"
#include "CProEngToneHandler.h"
#include "CProEngProfileNameArrayImpl.h"
--- a/profilesservices/ProfileEngine/WrapperSrc/CProEngMediaVariation.cpp Tue Feb 02 00:22:03 2010 +0200
+++ b/profilesservices/ProfileEngine/WrapperSrc/CProEngMediaVariation.cpp Fri Feb 19 23:06:10 2010 +0200
@@ -21,10 +21,10 @@
#include "CProEngMediaVariation.h"
#include <centralrepository.h>
#include <apgcli.h> // RApaLsSession
-#include "ProfileEngineInternalCRKeys.h"
+#include <ProfileEngineInternalCRKeys.h>
#include "ProEngMmfInfoUtility.h"
-#include "MProfileUtilitySingleton.h"
-#include "MProfilesLocalFeatures.h"
+#include <MProfileUtilitySingleton.h>
+#include <MProfilesLocalFeatures.h>
namespace
{
--- a/profilesservices/ProfileEngine/WrapperSrc/CProEngNotifyHandlerImpl.cpp Tue Feb 02 00:22:03 2010 +0200
+++ b/profilesservices/ProfileEngine/WrapperSrc/CProEngNotifyHandlerImpl.cpp Fri Feb 19 23:06:10 2010 +0200
@@ -23,9 +23,9 @@
#include <MProEngActiveProfileObserver.h>
#include <MProEngProfileObserver.h>
#include <MProEngProfileNameArrayObserver.h>
-#include "ProfileEngineConstants.h"
+#include <ProfileEngineConstants.h>
#include "ProfileEnginePrivateCRKeys.h"
-#include "ProfileEnginePrivatePSKeys.h"
+#include <ProfileEnginePrivatePSKeys.h>
#include "CProEngProfileActivationDelegate.h"
#include "CProEngActiveProfileDelegate.h"
#include "CProEngProfileNameArrayEventDelegate.h"
--- a/profilesservices/ProfileEngine/WrapperSrc/CProEngProfileActivationDelegate.cpp Tue Feb 02 00:22:03 2010 +0200
+++ b/profilesservices/ProfileEngine/WrapperSrc/CProEngProfileActivationDelegate.cpp Fri Feb 19 23:06:10 2010 +0200
@@ -21,7 +21,7 @@
#include "CProEngProfileActivationDelegate.h"
#include <centralrepository.h>
#include <MProEngProfileActivationObserver.h>
-#include "ProfileEnginePrivatePSKeys.h" // KProEngActiveProfileChanged
+#include <ProfileEnginePrivatePSKeys.h> // KProEngActiveProfileChanged
#include "ProfileEngineSDKCRKeys.h" // KCRUidProfileEngine etc.
// ============================ MEMBER FUNCTIONS ===============================
--- a/profilesservices/ProfileEngine/WrapperSrc/CProEngProfileImpl.cpp Tue Feb 02 00:22:03 2010 +0200
+++ b/profilesservices/ProfileEngine/WrapperSrc/CProEngProfileImpl.cpp Fri Feb 19 23:06:10 2010 +0200
@@ -23,10 +23,9 @@
#include "CProEngTonesImpl.h"
#include "CProEngToneSettingsImpl.h"
#include "CProEngEngineImpl.h"
-#include "MProfileExtended.h"
-#include "MProfileEngineExtended.h"
-#include "MProfileSetTones.h"
-#include "MProfileExtended.h"
+#include <MProfileExtended.h>
+#include <MProfileEngineExtended.h>
+#include <MProfileSetTones.h>
// ============================ MEMBER FUNCTIONS ===============================
--- a/profilesservices/ProfileEngine/WrapperSrc/CProEngProfileNameImpl.cpp Tue Feb 02 00:22:03 2010 +0200
+++ b/profilesservices/ProfileEngine/WrapperSrc/CProEngProfileNameImpl.cpp Fri Feb 19 23:06:10 2010 +0200
@@ -21,7 +21,7 @@
#include "CProEngProfileNameImpl.h"
#include <MProfileName.h>
#include <MProEngProfileNameArray.h>
-#include "MProfileSetName.h"
+#include <MProfileSetName.h>
#include "CProEngEngineImpl.h"
// ============================ MEMBER FUNCTIONS ===============================
--- a/profilesservices/ProfileEngine/WrapperSrc/CProEngPubSubObserverBase.cpp Tue Feb 02 00:22:03 2010 +0200
+++ b/profilesservices/ProfileEngine/WrapperSrc/CProEngPubSubObserverBase.cpp Fri Feb 19 23:06:10 2010 +0200
@@ -19,7 +19,7 @@
// INCLUDE FILES
#include "CProEngPubSubObserverBase.h"
-#include "ProfileEnginePrivatePSKeys.h"
+#include <ProfileEnginePrivatePSKeys.h>
// ============================ MEMBER FUNCTIONS ===============================
--- a/profilesservices/ProfileEngine/WrapperSrc/CProEngToneHandler.h Tue Feb 02 00:22:03 2010 +0200
+++ b/profilesservices/ProfileEngine/WrapperSrc/CProEngToneHandler.h Fri Feb 19 23:06:10 2010 +0200
@@ -25,7 +25,7 @@
#include <f32file.h> // CBase, RFs
#include <apmstd.h> // KMaxDataTypeLength
#include <data_caging_path_literals.hrh>
-#include "ProfileEng.hrh" // TProfileSettingId
+#include <ProfileEng.hrh> // TProfileSettingId
// FORWARD DECLARATIONS
class DRMCommon;
--- a/profilesservices/ProfileEngine/WrapperSrc/CProEngToneSettingsImpl.cpp Tue Feb 02 00:22:03 2010 +0200
+++ b/profilesservices/ProfileEngine/WrapperSrc/CProEngToneSettingsImpl.cpp Fri Feb 19 23:06:10 2010 +0200
@@ -21,9 +21,9 @@
#include "CProEngToneSettingsImpl.h"
#include <MProfileTones.h>
#include <MProfileExtraTones.h>
-#include "MProfileSetTones.h"
-#include "MProfileSetExtraTones.h"
-#include "MProfileExtended.h"
+#include <MProfileSetTones.h>
+#include <MProfileSetExtraTones.h>
+#include <MProfileExtended.h>
// ============================ MEMBER FUNCTIONS ===============================
--- a/profilesservices/ProfileEngine/WrapperSrc/CProEngTonesImpl.cpp Tue Feb 02 00:22:03 2010 +0200
+++ b/profilesservices/ProfileEngine/WrapperSrc/CProEngTonesImpl.cpp Fri Feb 19 23:06:10 2010 +0200
@@ -21,11 +21,11 @@
#include "CProEngTonesImpl.h"
#include <MProfileTones.h>
#include <MProfileExtraTones.h>
-#include "MProfileSetTones.h"
-#include "MProfileSetExtraTones.h"
-#include "MProfileExtended.h"
+#include <MProfileSetTones.h>
+#include <MProfileSetExtraTones.h>
+#include <MProfileExtended.h>
#include "CProEngToneHandler.h"
-#include "ProfileEng.hrh" // TProfileSettingId
+#include <ProfileEng.hrh> // TProfileSettingId
#include <pathinfo.h>
#include <ProfileEngineDomainConstants.h>
--- a/profilesservices/ProfileEngine/group/ProfileEng.rss Tue Feb 02 00:22:03 2010 +0200
+++ b/profilesservices/ProfileEngine/group/ProfileEng.rss Fri Feb 19 23:06:10 2010 +0200
@@ -25,8 +25,8 @@
#include <eikon.rh>
#include <bldvariant.hrh>
#include "Profile.hrh"
-#include "ProfileEng.rh"
-#include "ProfileEng.hrh"
+#include <ProfileEng.rh>
+#include <ProfileEng.hrh>
#include <profile.loc>
// CONSTANTS
--- a/profilesservices/ProfileEngine/tsrc/public/basic/EngineMdlTest/src/T_CProfileChangeNotifyHandler.cpp Tue Feb 02 00:22:03 2010 +0200
+++ b/profilesservices/ProfileEngine/tsrc/public/basic/EngineMdlTest/src/T_CProfileChangeNotifyHandler.cpp Fri Feb 19 23:06:10 2010 +0200
@@ -36,8 +36,8 @@
#include <MProfileExtended.h>
#include <TProfileToneSettings.h>
#include <MProfileTones.h>
-#include "MProfileSetTones.h"
-#include "ProfileEnginePrivatePSKeys.h"
+#include <MProfileSetTones.h>
+#include <ProfileEnginePrivatePSKeys.h>
// the header for the tested class
#include "T_CProfileChangeNotifyHandler.h"
--- a/profilesservices/ProfileEngine/tsrc/public/basic/EngineMdlTest/src/T_MProfile.cpp Tue Feb 02 00:22:03 2010 +0200
+++ b/profilesservices/ProfileEngine/tsrc/public/basic/EngineMdlTest/src/T_MProfile.cpp Fri Feb 19 23:06:10 2010 +0200
@@ -29,17 +29,17 @@
#include <BAMDESCA.H>
#include <RSSSettings.h>
#include "MProfileEngine.h"
-#include "MProfileEngineExtended.h"
+#include <MProfileEngineExtended.h>
#include "MProfile.h"
#include "MProfileName.h"
#include "MProfileExtraTones.h"
-#include "MProfileSetExtraTones.h"
+#include <MProfileSetExtraTones.h>
#include "MProfileExtraSettings.h"
-#include "MProfilesLocalFeatures.h"
+#include <MProfilesLocalFeatures.h>
#include "MProfileTones.h"
#include <TProfileToneSettings.h>
-#include "MProfileExtended.h"
-#include "MProfileSetTones.h"
+#include <MProfileExtended.h>
+#include <MProfileSetTones.h>
//#include "T_ProfileTestTools.h"
#include "ProfilesVariant.hrh"
--- a/profilesservices/ProfileEngine/tsrc/public/basic/EngineMdlTest/src/T_MProfileEngine.cpp Tue Feb 02 00:22:03 2010 +0200
+++ b/profilesservices/ProfileEngine/tsrc/public/basic/EngineMdlTest/src/T_MProfileEngine.cpp Fri Feb 19 23:06:10 2010 +0200
@@ -35,11 +35,11 @@
#include <MProfilesNamesArray.h>
#include <MProfileTones.h>
#include <MProfileExtraTones.h>
-#include "MProfilesLocalFeatures.h"
+#include <MProfilesLocalFeatures.h>
#include "ProfilesVariant.hrh"
-#include "MProfileExtended.h"
-#include "MProfileSetName.h"
-#include "MProfileEngineExtended.h"
+#include <MProfileExtended.h>
+#include <MProfileSetName.h>
+#include <MProfileEngineExtended.h>
#include <TProfileToneSettings.h>
//#include "T_ProfileTestTools.h"
//#include "T_ProfileTestHelper.h"
--- a/profilesservices/ProfileEngine/tsrc/public/basic/WrapperMdlTest/src/MT_MProEngEngine.cpp Tue Feb 02 00:22:03 2010 +0200
+++ b/profilesservices/ProfileEngine/tsrc/public/basic/WrapperMdlTest/src/MT_MProEngEngine.cpp Fri Feb 19 23:06:10 2010 +0200
@@ -26,12 +26,12 @@
#include <EUnitMacros.h>
#include <MProEngEngine.h>
#include <MProEngProfile.h>
-#include "MProfileEngineExtended.h"
+#include <MProfileEngineExtended.h>
#include "MProfile.h"
-#include "MProfileExtended.h"
+#include <MProfileExtended.h>
#include <ProEngFactory.h>
#include <Profile.hrh>
-#include "ProfileEngineConstants.h"
+#include <ProfileEngineConstants.h>
// INTERNAL INCLUDES
#include "T_ProfileTestTools.h"
--- a/profilesservices/ProfileEngine/tsrc/public/basic/WrapperMdlTest/src/MT_MProEngProfileName.cpp Tue Feb 02 00:22:03 2010 +0200
+++ b/profilesservices/ProfileEngine/tsrc/public/basic/WrapperMdlTest/src/MT_MProEngProfileName.cpp Fri Feb 19 23:06:10 2010 +0200
@@ -27,10 +27,10 @@
#include <MProEngProfileName.h>
#include <MProEngProfile.h>
#include <MProEngEngine.h>
-#include "MProfileEngineExtended.h"
+#include <MProfileEngineExtended.h>
#include "MProfile.h"
#include "MProfileName.h"
-#include "MProfileExtended.h"
+#include <MProfileExtended.h>
#include <ProEngFactory.h>
#include <Profile.hrh>
--- a/profilesservices/ProfileEngine/tsrc/public/basic/WrapperMdlTest/src/MT_MProEngProfileNameArray.cpp Tue Feb 02 00:22:03 2010 +0200
+++ b/profilesservices/ProfileEngine/tsrc/public/basic/WrapperMdlTest/src/MT_MProEngProfileNameArray.cpp Fri Feb 19 23:06:10 2010 +0200
@@ -27,11 +27,11 @@
#include <MProEngProfileNameArray.h>
#include <MProEngProfile.h>
#include <MProEngEngine.h>
-#include "MProfileEngineExtended.h"
+#include <MProfileEngineExtended.h>
#include "MProfile.h"
#include "MProfileName.h"
#include "MProfilesNamesArray.h"
-#include "MProfileExtended.h"
+#include <MProfileExtended.h>
#include <ProEngFactory.h>
#include <Profile.hrh>
--- a/profilesservices/ProfileEngine/tsrc/public/basic/WrapperMdlTest/src/MT_MProEngToneSettings.cpp Tue Feb 02 00:22:03 2010 +0200
+++ b/profilesservices/ProfileEngine/tsrc/public/basic/WrapperMdlTest/src/MT_MProEngToneSettings.cpp Fri Feb 19 23:06:10 2010 +0200
@@ -27,12 +27,12 @@
#include <MProEngToneSettings.h>
#include <MProEngProfile.h>
#include <MProEngEngine.h>
-#include "MProfileEngineExtended.h"
+#include <MProfileEngineExtended.h>
#include "MProfile.h"
#include "MProfileTones.h"
#include "TProfileToneSettings.h"
#include "MProfileExtraTones.h"
-#include "MProfileExtended.h"
+#include <MProfileExtended.h>
#include <ProEngFactory.h>
#include <Profile.hrh>
--- a/profilesservices/ProfileEngine/tsrc/public/basic/WrapperMdlTest/src/MT_MProEngTones.cpp Tue Feb 02 00:22:03 2010 +0200
+++ b/profilesservices/ProfileEngine/tsrc/public/basic/WrapperMdlTest/src/MT_MProEngTones.cpp Fri Feb 19 23:06:10 2010 +0200
@@ -27,11 +27,11 @@
#include <MProEngTones.h>
#include <MProEngProfile.h>
#include <MProEngEngine.h>
-#include "MProfileEngineExtended.h"
+#include <MProfileEngineExtended.h>
#include "MProfile.h"
#include "MProfileTones.h"
#include "MProfileExtraTones.h"
-#include "MProfileExtended.h"
+#include <MProfileExtended.h>
#include <ProEngFactory.h>
#include <Profile.hrh>
#include <centralrepository.h>