1 files changed, 26 insertions, 23 deletions
diff --git a/Swiften/FileTransfer/FileReadBytestream.cpp b/Swiften/FileTransfer/FileReadBytestream.cpp
index 4257f8b..2ff00dc 100644
--- a/Swiften/FileTransfer/FileReadBytestream.cpp
+++ b/Swiften/FileTransfer/FileReadBytestream.cpp
@@ -1,44 +1,47 @@
 /*
- * Copyright (c) 2010-2013 Remko Tronçon
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
+ * Copyright (c) 2010-2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
  */
 
-#include <boost/filesystem/fstream.hpp>
+#include <Swiften/FileTransfer/FileReadBytestream.h>
+
 #include <cassert>
-#include <boost/smart_ptr/make_shared.hpp>
+#include <memory>
+
+#include <boost/filesystem/fstream.hpp>
 #include <boost/numeric/conversion/cast.hpp>
 
-#include <Swiften/FileTransfer/FileReadBytestream.h>
 #include <Swiften/Base/ByteArray.h>
 
 namespace Swift {
 
-FileReadBytestream::FileReadBytestream(const boost::filesystem::path& file) : file(file), stream(NULL) {
+FileReadBytestream::FileReadBytestream(const boost::filesystem::path& file) : file(file), stream(nullptr) {
 }
 
 FileReadBytestream::~FileReadBytestream() {
-	if (stream) {
-		stream->close();
-		stream = NULL;
-	}
+    if (stream) {
+        stream->close();
+        delete stream;
+        stream = nullptr;
+    }
 }
 
-boost::shared_ptr<ByteArray> FileReadBytestream::read(size_t size)  {
-	if (!stream) {
-		stream = new boost::filesystem::ifstream(file, std::ios_base::in|std::ios_base::binary);
-	}
-	boost::shared_ptr<ByteArray> result = boost::make_shared<ByteArray>();
-	result->resize(size);
-	assert(stream->good());
-	stream->read(reinterpret_cast<char*>(vecptr(*result)), boost::numeric_cast<std::streamsize>(size));
-	result->resize(boost::numeric_cast<size_t>(stream->gcount()));
-	onRead(*result);
-	return result;
+std::shared_ptr<ByteArray> FileReadBytestream::read(size_t size)  {
+    if (!stream) {
+        stream = new boost::filesystem::ifstream(file, std::ios_base::in|std::ios_base::binary);
+    }
+    std::shared_ptr<ByteArray> result = std::make_shared<ByteArray>();
+    result->resize(size);
+    assert(stream->good());
+    stream->read(reinterpret_cast<char*>(vecptr(*result)), boost::numeric_cast<std::streamsize>(size));
+    result->resize(boost::numeric_cast<size_t>(stream->gcount()));
+    onRead(*result);
+    return result;
 }
 
 bool FileReadBytestream::isFinished() const {
-	return stream && !stream->good();
+    return stream && !stream->good();
 }
 
 }