--- a/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpmoveobject.h	Fri Mar 19 09:40:39 2010 +0200
+++ b/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpmoveobject.h	Fri Apr 16 15:51:48 2010 +0300
@@ -21,6 +21,7 @@
 #ifndef CMTPMOVEOBJECT_H
 #define CMTPMOVEOBJECT_H
 
+#include "rmtpframework.h"
 #include "cmtprequestprocessor.h"
 #include "mtpdebug.h"
 
@@ -47,10 +48,7 @@
 
 private:	//from CMTPRequestProcessor
 	virtual void ServiceL();
-	
-private:	//from CActive
-	void RunL();
-	TInt RunError(TInt aError);
+    TMTPResponseCode CheckRequestL();
 	
 private:
 	void ConstructL();
@@ -62,8 +60,6 @@
 	void SetPreviousPropertiesL(const TDesC& aFileName);
 	void MoveFileL(const TDesC& aNewFileName);
 	void MoveFolderL();
-	TMTPResponseCode FinalPhaseMove();
-	void MoveAndUpdateL(TUint32 objectHandle);
 	
 private:	
 	CFileMan*				iFileMan;
@@ -76,7 +72,7 @@
 	HBufC*					iPathToMove;
 	RArray<TUint>           iObjectHandles;
 	TInt                    iMoveObjectIndex;
-	
+    RMTPFramework           iSingletons;
 	/**
     FLOGGER debug trace member variable.
     */