diff -r f0c0788c4de2 -r 756ad29ed18e camerauis/cameraapp/generic/inc/CamAppUi.h --- a/camerauis/cameraapp/generic/inc/CamAppUi.h Wed Sep 15 11:51:19 2010 +0300 +++ b/camerauis/cameraapp/generic/inc/CamAppUi.h Wed Oct 13 14:09:54 2010 +0300 @@ -68,8 +68,6 @@ class CCamStillPreCaptureView; class CCamVideoPreCaptureView; class CCamMemoryMonitor; -//FTU message display class -class CCamFtuDisplay; class CCamStartupLogoController; @@ -200,36 +198,16 @@ */ void FileCheckingCompleteL( TInt aStatus, TInt aError ); - // ------------------------------------------------------- - // New functions -public: - /* - * HyperlinkCallback - * static methode to be called from TCallback - */ - - static TInt HyperlinkCallback( TAny* aAny ); - - /** - * CamFtuDisplayL - * Check if camera is launching for first time , - * accordingly FTU Message will be displayed. - */ - void CamFtuDisplayL(); - - /** - * OpenSettingView - * Non static public method , to launch the settings view - */ - void OpenSettingView(); - - /** - * Returns whether or the toolbar has been activated/visible - * Will return ETrue when when the toolbar is active/visible - * @since 3.2 - * @return ETrue if toolbar is active/visible, else returns EFalse - */ - virtual TBool IsToolBarVisible() const; + // ------------------------------------------------------- + // New functions + public: + /** + * Returns whether or the toolbar has been activated/visible + * Will return ETrue when when the toolbar is active/visible + * @since 3.2 + * @return ETrue if toolbar is active/visible, else returns EFalse + */ + virtual TBool IsToolBarVisible() const; /** * Check if given view state indicates that "internal", @@ -1470,7 +1448,7 @@ * Status of the operation are returned using aStatus * e.g. KErrNone */ - void AddToAlbumIdOperationCompleteL() {}; + void AddToAlbumIdOperationComplete() {}; /** * From MCamAddToAlbumObserver @@ -1896,12 +1874,6 @@ CCamStartupLogoController* iStartupLogoController; TBool iVideoClipPlayInProgress; - - /** - * iCamFtuDisplay - * An instance of the CCamFtuDisplay class - */ - CCamFtuDisplay* iCamFtuDisplay; }; // ===========================================================================