--- a/profilesservices/ProfileEngine/WrapperSrc/CProEngNotifyHandlerImpl.h Thu May 27 13:08:28 2010 +0300
+++ b/profilesservices/ProfileEngine/WrapperSrc/CProEngNotifyHandlerImpl.h Fri Jun 11 13:56:17 2010 +0300
@@ -21,7 +21,7 @@
#define CPROENGNOTIFYHANDLERIMPL_H
// INCLUDES
-#include <MProEngNotifyHandler2.h>
+#include <MProEngNotifyHandler.h>
#include <e32base.h>
// FORWARD DECLARATIONS
@@ -29,8 +29,6 @@
class CProEngActiveProfileDelegate;
class CProEngProfileNameArrayEventDelegate;
class CProEngProfileEventDelegate;
-class CProEngActiveSettingsEventDelegate;
-class CProEngMasterSettingsEventDelegate;
// CLASS DECLARATION
@@ -41,7 +39,7 @@
* @since 3.1
*/
NONSHARABLE_CLASS( CProEngNotifyHandlerImpl ) : public CBase,
- public MProEngNotifyHandler2
+ public MProEngNotifyHandler
{
public: // Constructors and destructor
@@ -83,18 +81,6 @@
MProEngProfileNameArrayObserver& aObserver );
/**
- * From MProEngNotifyHandler2
- */
- virtual TInt RequestActiveSettingsNotificationsL(
- MProEngActiveSettingsObserver &aObserver );
-
- /**
- * From MProEngNotifyHandler2
- */
- virtual TInt RequestMasterSettingsNotificationsL(
- MProEngMasterSettingsObserver &aObserver );
-
- /**
* From MProEngNotifyHandler
*/
void CancelProfileActivationNotifications();
@@ -115,20 +101,9 @@
void CancelProfileNameArrayNotifications();
/**
- * From MProEngNotifyHandler2
- */
- virtual void CancelActiveSettingsNotificationsL();
-
- /**
- * From MProEngNotifyHandler2
- */
- virtual void CancelMasterSettingsNotificationsL();
-
- /**
* From MProEngNotifyHandler
*/
void CancelAll();
-
private:
@@ -150,12 +125,6 @@
// 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;
};