diff -r 8ee96d21d9bf -r 7e0eff37aedb profilesservices/ProfileEngine/EngSrc/CProfileEngineImpl.h --- a/profilesservices/ProfileEngine/EngSrc/CProfileEngineImpl.h Tue Aug 31 15:29:50 2010 +0300 +++ b/profilesservices/ProfileEngine/EngSrc/CProfileEngineImpl.h Wed Sep 01 12:20:44 2010 +0100 @@ -24,7 +24,7 @@ #include #include // RFs #include // TProfileRingingVolume -#include // MProfileEngineExtended2 +#include // MProfileEngineExtended #include // MProfileExtended // FORWARD DECLARATIONS @@ -46,7 +46,7 @@ * @since 2.0 */ NONSHARABLE_CLASS(CProfileEngineImpl) : public CBase, - public MProfileEngineExtended2 + public MProfileEngineExtended { public: // Constructors and destructor @@ -186,56 +186,9 @@ TBool IsActiveProfileTimedL(); /** - * From MProfileEngineExtended2. + * From MProfileEngineExtended. */ void SetActiveProfileTimedL( TInt aId, TTime aTime ); - - - /** - * From MProfileEngineExtended2. - */ - virtual MProfileExtended2* Profile2LC( TInt aId ); - - /** - * From MProfileEngineExtended2. - */ - virtual MProfileExtended2* Profile2L( TInt aId ); - - /** - * From MProfileEngineExtended2. - */ - virtual void CommitChange2L( MProfileExtended2& aProfile ); - - - /** - * From MProfileEngineExtended2. - */ - virtual TInt MasterVolumeL() const; - - /** - * From MProfileEngineExtended2. - */ - virtual void SetMasterVolumeL( TInt aMasterVolume ); - - /** - * From MProfileEngineExtended2. - */ - virtual TBool MasterVibraL() const; - - /** - * From MProfileEngineExtended2. - */ - virtual void SetMasterVibraL( TBool aMasterVibra ); - - /** - * From MProfileEngineExtended2. - */ - virtual TBool SilenceModeL() const; - - /** - * From MProfileEngineExtended2. - */ - virtual void SetSilenceModeL( TBool aSilenceMode ); protected: // New functions @@ -276,7 +229,7 @@ * @param aSetId sets the id of the active profile to Central Repository * only if this is ETrue */ - void UpdateActiveProfileSettingsL( MProfileExtended2& aProfile, + void UpdateActiveProfileSettingsL( MProfile& aProfile, TBool aSetId = EFalse ); /**