diff options
author | Remko Tronçon <git@el-tramo.be> | 2011-03-26 10:09:46 (GMT) |
---|---|---|
committer | Remko Tronçon <git@el-tramo.be> | 2011-04-18 19:11:40 (GMT) |
commit | bb37c9f89e4135f3128fc98c23ea19eea945c4cd (patch) | |
tree | 92e9504a27d6eaa8182bb0bab8a7556825a46ad7 /Swiften/FileTransfer/ByteArrayReadBytestream.h | |
parent | 039636edc1b151431cba21a28986ff2be66b5349 (diff) | |
download | swift-contrib-bb37c9f89e4135f3128fc98c23ea19eea945c4cd.zip swift-contrib-bb37c9f89e4135f3128fc98c23ea19eea945c4cd.tar.bz2 |
Jingle refactoring.
Diffstat (limited to 'Swiften/FileTransfer/ByteArrayReadBytestream.h')
-rw-r--r-- | Swiften/FileTransfer/ByteArrayReadBytestream.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/Swiften/FileTransfer/ByteArrayReadBytestream.h b/Swiften/FileTransfer/ByteArrayReadBytestream.h index d459658..4704db6 100644 --- a/Swiften/FileTransfer/ByteArrayReadBytestream.h +++ b/Swiften/FileTransfer/ByteArrayReadBytestream.h @@ -6,31 +6,32 @@ #pragma once -#include "Swiften/FileTransfer/ReadBytestream.h" -#include "Swiften/Base/ByteArray.h" +#include <vector> + +#include <Swiften/FileTransfer/ReadBytestream.h> namespace Swift { class ByteArrayReadBytestream : public ReadBytestream { public: - ByteArrayReadBytestream(const ByteArray& data) : data(data), position(0) { + ByteArrayReadBytestream(const std::vector<unsigned char>& data) : data(data), position(0) { } - virtual ByteArray read(size_t size) { + virtual std::vector<unsigned char> read(size_t size) { size_t readSize = size; - if (position + readSize > data.getSize()) { - readSize = data.getSize() - position; + if (position + readSize > data.size()) { + readSize = data.size() - position; } - ByteArray result(data.getData() + position, readSize); + std::vector<unsigned char> result(data.begin() + position, data.begin() + position + readSize); position += readSize; return result; } virtual bool isFinished() const { - return position >= data.getSize(); + return position >= data.size(); } private: - ByteArray data; + std::vector<unsigned char> data; size_t position; }; } |