1 files changed, 3 insertions, 18 deletions
diff --git a/Swiften/FileTransfer/ByteArrayReadBytestream.h b/Swiften/FileTransfer/ByteArrayReadBytestream.h
index 9311099..664698a 100644
--- a/Swiften/FileTransfer/ByteArrayReadBytestream.h
+++ b/Swiften/FileTransfer/ByteArrayReadBytestream.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2013 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
@@ -7,9 +7,7 @@
 #pragma once
 
 #include <vector>
-#include <boost/smart_ptr/make_shared.hpp>
 
-#include <Swiften/Base/Algorithm.h>
 #include <Swiften/FileTransfer/ReadBytestream.h>
 #include <Swiften/Base/ByteArray.h>
 
@@ -19,17 +17,7 @@ namespace Swift {
 			ByteArrayReadBytestream(const std::vector<unsigned char>& data) : data(data), position(0), dataComplete(true) {
 			}
 
-			virtual boost::shared_ptr<ByteArray> read(size_t size) {
-				size_t readSize = size;
-				if (position + readSize > data.size()) {
-					readSize = data.size() - position;
-				}
-				boost::shared_ptr<ByteArray> result = boost::make_shared<ByteArray>(data.begin() + position, data.begin() + position + readSize);
-
-				onRead(*result);
-				position += readSize;
-				return result;
-			}
+			virtual boost::shared_ptr<ByteArray> read(size_t size);
 
 			virtual bool isFinished() const {
 				return position >= data.size() && dataComplete;
@@ -39,10 +27,7 @@ namespace Swift {
 				dataComplete = b;
 			}
 
-			void addData(const std::vector<unsigned char>& moreData) {
-				append(data, moreData);
-				onDataAvailable();
-			}
+			void addData(const std::vector<unsigned char>& moreData);
 
 		private:
 			std::vector<unsigned char> data;