Index: src/libchcore/TOverlappedReaderWriter.h
===================================================================
diff -u -N -r593ca68706f3a3c7c2a3820b02a56fc24d5bea11 -rb941384e121190b6107f1c99b3233667e3daf4ce
--- src/libchcore/TOverlappedReaderWriter.h	(.../TOverlappedReaderWriter.h)	(revision 593ca68706f3a3c7c2a3820b02a56fc24d5bea11)
+++ src/libchcore/TOverlappedReaderWriter.h	(.../TOverlappedReaderWriter.h)	(revision b941384e121190b6107f1c99b3233667e3daf4ce)
@@ -19,7 +19,6 @@
 #ifndef __TOVERLAPPEDREADERWRITER_H__
 #define __TOVERLAPPEDREADERWRITER_H__
 
-#include "TEvent.h"
 #include "../liblogger/TLogFileData.h"
 #include "../liblogger/TLogger.h"
 #include "TOverlappedMemoryPool.h"
@@ -30,9 +29,6 @@
 {
 	class TOverlappedReaderWriter
 	{
-	private:
-		static const unsigned long long NoIoError = 0xffffffffffffffff;
-
 	public:
 		explicit TOverlappedReaderWriter(const logger::TLogFileDataPtr& spLogFileData, const TOverlappedMemoryPoolPtr& spBuffers,
 			unsigned long long ullFilePos, DWORD dwChunkSize);
@@ -41,49 +37,19 @@
 
 		TOverlappedReaderWriter& operator=(const TOverlappedReaderWriter&) = delete;
 
-		// buffer management - reader
-		TOverlappedDataBuffer* GetEmptyBuffer();
-		void AddEmptyBuffer(TOverlappedDataBuffer* pBuffer, bool bKeepPosition);
+		// reader/writer
+		TOverlappedReaderPtr GetReader() const { return m_spReader; }
+		TOverlappedWriterPtr GetWriter() const { return m_spWriter; }
 
-		TOverlappedDataBuffer* GetFailedReadBuffer();
-		void AddFailedReadBuffer(TOverlappedDataBuffer* pBuffer);
-
-		void AddFinishedReadBuffer(TOverlappedDataBuffer* pBuffer);
-
-		// buffer management - writer
-		TOverlappedDataBuffer* GetWriteBuffer();
-
-		TOverlappedDataBuffer* GetFailedWriteBuffer();
-		void AddFailedWriteBuffer(TOverlappedDataBuffer* pBuffer);
-
-		void AddFinishedWriteBuffer(TOverlappedDataBuffer* pBuffer);
-		TOverlappedDataBuffer* GetFinishedWriteBuffer();
-
-		void MarkFinishedBufferAsComplete(TOverlappedDataBuffer* pBuffer);
-
-		// processing info
-		bool IsDataSourceFinished() const { return m_tReader.IsDataSourceFinished(); }
-
 		// event access
-		HANDLE GetEventReadPossibleHandle() const { return m_tReader.GetEventReadPossibleHandle(); }
-		HANDLE GetEventReadFailedHandle() const { return m_tReader.GetEventReadFailedHandle(); }
-		HANDLE GetEventWritePossibleHandle() const { return m_tReader.GetEventReadFinishedHandle(); }
-
-		HANDLE GetEventWriteFailedHandle() const { return m_tWriter.GetEventWriteFailedHandle(); }
-		HANDLE GetEventWriteFinishedHandle() const { return m_tWriter.GetEventWriteFinishedHandle(); }
-
-		HANDLE GetEventAllBuffersAccountedFor() const { return m_eventAllBuffersAccountedFor.Handle(); }
-
 		void WaitForMissingBuffersAndResetState(HANDLE hKillEvent);
 
 	private:
 		logger::TLoggerPtr m_spLog;
 
 		TOverlappedMemoryPoolPtr m_spMemoryPool;
-		TOverlappedReader m_tReader;
-		TOverlappedWriter m_tWriter;
-
-		TEvent m_eventAllBuffersAccountedFor;
+		TOverlappedReaderPtr m_spReader;
+		TOverlappedWriterPtr m_spWriter;
 	};
 }