diff -r 159cfcd3c1c5 -r 48848d132687 profilesservices/ProfileEngine/WrapperSrc/CProEngNotifyHandlerImpl.h --- a/profilesservices/ProfileEngine/WrapperSrc/CProEngNotifyHandlerImpl.h Thu Apr 01 03:31:13 2010 +0800 +++ b/profilesservices/ProfileEngine/WrapperSrc/CProEngNotifyHandlerImpl.h Fri Apr 16 11:40:46 2010 +0800 @@ -21,7 +21,7 @@ #define CPROENGNOTIFYHANDLERIMPL_H // INCLUDES -#include +#include #include // FORWARD DECLARATIONS @@ -29,6 +29,8 @@ class CProEngActiveProfileDelegate; class CProEngProfileNameArrayEventDelegate; class CProEngProfileEventDelegate; +class CProEngActiveSettingsEventDelegate; +class CProEngMasterSettingsEventDelegate; // CLASS DECLARATION @@ -39,7 +41,7 @@ * @since 3.1 */ NONSHARABLE_CLASS( CProEngNotifyHandlerImpl ) : public CBase, - public MProEngNotifyHandler + public MProEngNotifyHandler2 { public: // Constructors and destructor @@ -81,6 +83,18 @@ MProEngProfileNameArrayObserver& aObserver ); /** + * From MProEngNotifyHandler2 + */ + virtual TInt RequestActiveSettingsNotificationsL( + MProEngActiveSettingsObserver &aObserver ); + + /** + * From MProEngNotifyHandler2 + */ + virtual TInt RequestMasterSettingsNotificationsL( + MProEngMasterSettingsObserver &aObserver ); + + /** * From MProEngNotifyHandler */ void CancelProfileActivationNotifications(); @@ -101,9 +115,20 @@ void CancelProfileNameArrayNotifications(); /** + * From MProEngNotifyHandler2 + */ + virtual void CancelActiveSettingsNotificationsL(); + + /** + * From MProEngNotifyHandler2 + */ + virtual void CancelMasterSettingsNotificationsL(); + + /** * From MProEngNotifyHandler */ void CancelAll(); + private: @@ -125,6 +150,12 @@ // Own: Array of profile change observers RPointerArray< CProEngProfileEventDelegate > iProfileEventDelegates; + + // Own: Delegate for active settings modification events + CProEngActiveSettingsEventDelegate *iActiveSettingEventDelegate; + + // Own: Delegate for master settings modification events + CProEngMasterSettingsEventDelegate *iMasterSettingEventDelegate; };