--- a/creator/engine/inc/creator_file.h	Fri Jun 11 16:29:34 2010 +0100
+++ b/creator/engine/inc/creator_file.h	Thu Jul 22 16:33:59 2010 +0100
@@ -38,8 +38,16 @@
 class CDRMPermission;
 class CDRMConstraint;
 
-class CCreatorFiles : public CBase, public MCreatorModuleBase
+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);
@@ -50,7 +58,8 @@
     void ConstructL(CCreatorEngine* aEngine); // from MCreatorModuleBase
 
 public:
-    TBool AskDataFromUserL(TInt aCommand, TInt& aNumberOfEntries); // from MCreatorModuleBase
+    TBool AskDataFromUserL( TInt aCommand ); // from MCreatorModuleBase
+    void QueryDialogClosedL(TBool aPositiveAction, TInt aUserData); //from MUIObserver
     TInt CreateFileEntryL(CFilesParameters *aParameters, TInt aCommand);    
     void DeleteAllL();
     void DeleteAllCreatedByCreatorL();
@@ -61,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;