1 files changed, 3 insertions, 109 deletions
diff --git a/engines/tony/utils.h b/engines/tony/utils.h
index 50b18d8aa7..d3f93e06ef 100644
--- a/engines/tony/utils.h
+++ b/engines/tony/utils.h
@@ -39,113 +39,7 @@ namespace Tony {
 
 using namespace ::Tony::MPAL;
 
-/**
- * Data stream for reading data
- */
-class RMDataStream {
-protected:
-	const byte *_buf;
-	int _length;
-	int _pos;
-	bool _bError;
-	int _ecode;
-
-public:
-	enum RMDSPos {
-		CUR,
-		START,
-		END
-	};
-
-private:
-	enum {
-		SIZENOTKNOWN = 0x7FFFFFFF
-	};
-
-public:
-	// Constructor and destructor
-	RMDataStream();
-	virtual ~RMDataStream();
-
-	// Loading buffer
-	void openBuffer(const byte *buf, int size = SIZENOTKNOWN);
-	void close();
-
-	// Attributei
-	int length();
-	virtual int pos();
-
-	// EOF
-	virtual bool isEOF();
-
-	// Read methods
-	friend RMDataStream &operator>>(RMDataStream &df, char &var);
-	friend RMDataStream &operator>>(RMDataStream &df, byte &var);
-	friend RMDataStream &operator>>(RMDataStream &df, uint16 &var);
-	friend RMDataStream &operator>>(RMDataStream &df, int16 &var);
-	friend RMDataStream &operator>>(RMDataStream &df, int &var);
-	friend RMDataStream &operator>>(RMDataStream &df, uint32 &var);
-
-	// General read
-	virtual bool read(void *buf, int size);
-
-	// Skipping & Seeking
-	virtual RMDataStream &operator+=(int nBytes);
-	virtual int seek(int nBytes, RMDSPos origin = CUR);
-
-	// Error handling
-	void setError(int ecode);
-	int getError();
-	bool isError();
-};
-
-/**
- * Data stream per lettura di dati aperto da file
- */
-class RMFileStream : public RMDataStream {
-private:
-	byte *_buf;
-
-public:
-	RMFileStream();
-	virtual ~RMFileStream();
-
-	// Methods for opening file
-	bool openFile(const char *lpFN);
-	bool openFile(Common::File &file);
-
-	void close();
-};
-
-class RMFileStreamSlow : public RMDataStream {
-private:
-	Common::SeekableReadStream *_stream;
-public:
-	RMFileStreamSlow();
-	virtual ~RMFileStreamSlow();
-
-	bool openFile(const char *lpFN);
-	bool openFile(Common::File &file);
-
-	void close();
-
-	RMDataStream &operator+=(int nBytes);
-	int seek(int nBytes, RMDSPos where = CUR);
-
-	int pos();
-	virtual bool isEOF();
-
-	bool read(void *buf, int size);
-
-	friend RMFileStreamSlow &operator>>(RMFileStreamSlow &df, char &var);
-	friend RMFileStreamSlow &operator>>(RMFileStreamSlow &df, byte &var);
-	friend RMFileStreamSlow &operator>>(RMFileStreamSlow &df, uint16 &var);
-	friend RMFileStreamSlow &operator>>(RMFileStreamSlow &df, int16 &var);
-	friend RMFileStreamSlow &operator>>(RMFileStreamSlow &df, int &var);
-	friend RMFileStreamSlow &operator>>(RMFileStreamSlow &df, uint32 &var);
-};
-
-RMDataStream &operator>>(RMDataStream &df, Common::String &var);
+Common::String readString(Common::ReadStream &ds);
 
 /**
  * Point class
@@ -186,7 +80,7 @@ public:
 	operator Common::Point() const;
 
 	// Extraction from data streams
-	friend RMDataStream &operator>>(RMDataStream &ds, RMPoint &p);
+	void readFromStream(Common::ReadStream &ds);
 };
 
 class RMPointReference {
@@ -256,7 +150,7 @@ public:
 	}
 
 	// Extract from data stream
-	friend RMDataStream &operator>>(RMDataStream &ds, RMRect &rc);
+	void readFromStream(Common::ReadStream &ds);
 };
 
 /**