diff -r 40a3f856b14d -r 41a7f70b3818 phoneapp/phoneuicontrol/inc/cphonestatemachine.h --- a/phoneapp/phoneuicontrol/inc/cphonestatemachine.h Thu Aug 19 09:54:27 2010 +0300 +++ b/phoneapp/phoneuicontrol/inc/cphonestatemachine.h Tue Aug 31 15:14:29 2010 +0300 @@ -30,8 +30,7 @@ // FORWARD DECLARATIONS class MPhoneState; -class MPhoneSecurityModeObserver; -class MPhoneSecurityMessageHandler; +class MPhoneStorage; // CLASS DECLARATION @@ -102,53 +101,12 @@ */ IMPORT_C void SetCallId( const TInt aCallId ); - - /** - * Getter for security mode observer interface. - * - * @return Pointer to security mode interface. - */ - IMPORT_C MPhoneSecurityModeObserver* SecurityMode(); - - /** - * Setter for security mode observer interface. - * - * @param aObserver Pointer to observer interface. - */ - IMPORT_C void SetSecurityModeObserver( MPhoneSecurityModeObserver* aObserver ); - - /** - * Set security message handler for security message observations. - * - * @param aHandler Pointer to handler instance. - */ - IMPORT_C void SetSecurityMessageHandler( MPhoneSecurityMessageHandler* aHandler ); - + /** - * Handle phone engine message. - * - * @param aMessage Message - * @param aCallId Call id - */ - IMPORT_C void HandlePhoneEngineMessageL(const TInt aMessage, - TInt aCallId ); - - /** - * This function is called when there is property value change. - * @param aCategory Category of the property - * @param aKey Property key that is changed - * @param aValue New property value - */ - IMPORT_C void HandlePropertyChangedL(const TUid& aCategory, - const TUint aKey, - const TInt aValue ); - - /** - * Getter for CEikonEnv to avoid use of static system calls - * @return CEikonEnv handle - */ - IMPORT_C CEikonEnv* EikonEnv() const; - + * Instantiates phone storage. + * @return storage instance + */ + IMPORT_C MPhoneStorage* PhoneStorage(); protected: @@ -187,24 +145,9 @@ // Idle state which is hold in memory all the time MPhoneState* iIdleState; - - /** - * Security mode state - * Not own. - */ - MPhoneSecurityModeObserver* iSecurityModeObserver; - - /** - * Security message handling interface. - * Not own. - */ - MPhoneSecurityMessageHandler* iSecurityMessageHandler; - - /** Internal variable for EikonEnv to avoid use of static system calls - * Not own. - */ - CEikonEnv* iEnv; - + + // Phone's storage + MPhoneStorage* iPhoneStorage; }; #endif // CPHONESTATEMACHINE_H