diff -r 41fba8bcf7b7 -r c9b63fff5abf voicerecorder/RecViewInc/CVRRecView.h --- a/voicerecorder/RecViewInc/CVRRecView.h Wed Sep 15 12:15:47 2010 +0300 +++ b/voicerecorder/RecViewInc/CVRRecView.h Wed Oct 13 14:34:59 2010 +0300 @@ -41,11 +41,6 @@ class CVRRecViewActivationContainer; class CVRRecViewModel; -enum TDialogTypeID { - EDialogForWaitStorageCard = 0, - EDialogForWaitUSBPluggingOut - }; - // CLASS DEFINITION /** * CVRRecView is an CAknView inherited view class that implements @@ -106,47 +101,6 @@ */ TCallBack iCallback; }; - - /* - * One shot class for note pop-up - */ - NONSHARABLE_CLASS( CVRRecViewDialogActivator ) - : public CAsyncOneShot - { - public: // constructor and destructor - CVRRecViewDialogActivator( CVRRecViewModel* aModel); - ~CVRRecViewDialogActivator(); - - public: // new method - void SetDialogType(TDialogTypeID aType); - - void SetViewContexts(TVRRecViewContexts aContext); - - private: // Functions from base classes - - /** - * From CActive. - */ - void RunL(); - void DoCancel(); - - private: // Data: - - /* - * State machine model, not owned - */ - CVRRecViewModel* iModel; - - /* - * The type of dialog - */ - TDialogTypeID iType; - - /* - * Context that is used to activate model - */ - TVRRecViewContexts iContext; - }; public: // Constructors and destructor @@ -331,22 +285,6 @@ * the actual UI container and deletes the empty one. */ void ActivateContainerL(); - - /* - * Check the current state of drives - */ - void CheckDriveState(); - - /** - * This method show a dialog to warn user to insert the SD card. - * @return if user insert the SD card or not - */ - static TBool ShowDialogForWaitStorageCardL(); - - /** - * Make user insert the SD card, and choose SD card as the memo storage - */ - void SetDriveL(); public: virtual TInt HandleUsbPlugInL(); @@ -383,18 +321,8 @@ * asynchronically. Owned. */ CVRRecViewModelActivator* iModelActivator; - - /** - * One shot object that is used to pop up the note - */ - CVRRecViewDialogActivator* iDialogActivator; /** - * The type of dialog - */ - TDialogTypeID iDialogType; - - /** * The command that passed to Handlecommand * */ @@ -406,16 +334,6 @@ CVRUSBStateHanlder* iUSBStateHandler; - /* - * Context that is used to activate model - */ - TVRRecViewContexts iContext; - - /** - * Own: Indicates USB connection dialog is open or not. - * If value is ETrue, don't try to open it again. - */ - TBool iUSBConnectedDialogOpen; }; #endif // __CVRRECVIEW_H__