--- a/memspy/CommandLine/Include/MemSpyCommandLine.h	Wed Sep 15 13:53:27 2010 +0300
+++ b/memspy/CommandLine/Include/MemSpyCommandLine.h	Wed Oct 13 16:17:58 2010 +0300
@@ -22,9 +22,6 @@
 #include <e32base.h>
 #include <f32file.h>
 #include <badesca.h>
-#include <e32cons.h>
-
-#include "MemSpyCommands.h"
 
 #ifdef _DEBUG
 #   define TRACE( x ) x
@@ -39,28 +36,21 @@
 class RFs;
 class CCommandLineArguments;
 class RMemSpyEngineClientInterface;
-class CConsoleBase;
-class RMemSpySession;
 
-class CMemSpyCommandLine :  public CActive
+class CMemSpyCommandLine : public CBase
     {
 public:
-    //static CMemSpyCommandLine* NewLC();
-	static CMemSpyCommandLine* NewLC( CConsoleBase& aConsole );
+    static CMemSpyCommandLine* NewLC();
     ~CMemSpyCommandLine();
 
 private:
-    //CMemSpyCommandLine();
-    CMemSpyCommandLine( CConsoleBase& aConsole );
+    CMemSpyCommandLine();
     void ConstructL();
 
 public: // API
-    //void PerformBatchL( const TDesC& aFileName ); 	//support of the batch files removed 
+    void PerformBatchL( const TDesC& aFileName );
     void PerformOpL( const CCommandLineArguments& aCommandLine );
     void PerformSingleOpL( const TDesC& aCommand, const CDesCArray& aParameters );
-    //
-    //AO request method
-    void WaitForInput();
 
 private: // Internal methods
     void ConnectToMemSpyL();
@@ -70,26 +60,10 @@
     TInt FindBatchFile( TDes &aFileName );
     TInt FindFile( TDes &aFileName, const TDesC &aDirPath );
 
-private: // Console write methods
-    void RedrawInputPrompt();
-    void RedrawStatusMessage();
-    void RedrawStatusMessage( const TDesC& aMessage );
-    void ProcessCommandBufferL();
-    void RunL(); // from CActive
-    TInt RunError( TInt aError );
-    void DoCancel();
-    
 private: // Data members
     RFs iFsSession;
     RMemSpyEngineClientInterface* iMemSpy;
-    RMemSpySession* iMemSpySession;
     TBool iIsBatch; // For avoiding recursion
-    
-private: // Data members - console - write status messages
-    CConsoleBase& iConsole;
-    TPoint iCommandPromptPos;
-    TPoint iStatusMessagePos;
-    TBuf<KMemSpyMaxInputBufferLength> iCommandBuffer;
     };