diff -r 4b22a598b890 -r c9bf25a20c9f creator/engine/inc/creator_file.h --- a/creator/engine/inc/creator_file.h Thu May 27 12:52:19 2010 +0300 +++ b/creator/engine/inc/creator_file.h Fri Jun 11 13:39:09 2010 +0300 @@ -40,6 +40,14 @@ class CCreatorFiles : public CCreatorModuleBase { +enum TCreatorFilesState{ + ECreatorFilesDelete, + ECreatorFilesStart, + ECreatorFilesGetDirectory, + ECreatorFilesAskDRMData, + ECreatorFilesAskDRM_CD_Counts, + ECreatorFilesAskDRM_CD_Minutes +}; public: static CCreatorFiles* NewL(CCreatorEngine* aEngine); static CCreatorFiles* NewLC(CCreatorEngine* aEngine); @@ -51,8 +59,7 @@ public: TBool AskDataFromUserL( TInt aCommand ); // from MCreatorModuleBase -// void QueryDialogClosedL(TBool aPositiveAction, TInt aUserData); //from MUIObserver - void QueryDialogClosedL(TBool, TInt){/*TODO: DialogClosed*/}; + void QueryDialogClosedL(TBool aPositiveAction, TInt aUserData); //from MUIObserver TInt CreateFileEntryL(CFilesParameters *aParameters, TInt aCommand); void DeleteAllL(); void DeleteAllCreatedByCreatorL(); @@ -63,14 +70,13 @@ void SetPermissionsL( CMetaDataArray* aMetaData, const TDesC& aOutFileName, CFilesParameters *aParameters ); void SetMimeTypeL( const TDesC& aFileName, TDes8& aMime, CFilesParameters *aParameters ); TBool AskDRMDataFromUserL(); - TBool AskDRMCDDataFromUserL(); void StorePathsForDeleteL( CDesCArray& aPaths ); void GenerateFileNameL( TFileName& aRootName ); private: CFilesParameters* iParameters; CFilesParameters* iUserParameters; - HBufC* iDirectoryQueriedFromUser; + TFileName iDirectoryQueriedFromUser; RFs& iFs; RApaLsSession iApaLs; CDesCArray* iFilePaths;