Swiftdiff options
Diffstat (limited to 'Swiften/FileTransfer/SOCKS5BytestreamClientSession.h')
| -rw-r--r-- | Swiften/FileTransfer/SOCKS5BytestreamClientSession.h | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/Swiften/FileTransfer/SOCKS5BytestreamClientSession.h b/Swiften/FileTransfer/SOCKS5BytestreamClientSession.h index cf731c1..1c0563a 100644 --- a/Swiften/FileTransfer/SOCKS5BytestreamClientSession.h +++ b/Swiften/FileTransfer/SOCKS5BytestreamClientSession.h @@ -1,22 +1,28 @@ /* * Copyright (c) 2011 Tobias Markmann * Licensed under the simplified BSD license. * See Documentation/Licenses/BSD-simplified.txt for more information. */ +/* + * Copyright (c) 2015 Isode Limited. + * All rights reserved. + * See the COPYING file for more information. + */ + #pragma once -#include <boost/shared_ptr.hpp> #include <boost/optional.hpp> +#include <boost/shared_ptr.hpp> #include <Swiften/Base/API.h> #include <Swiften/Base/ByteArray.h> #include <Swiften/FileTransfer/FileTransferError.h> -#include <Swiften/FileTransfer/WriteBytestream.h> #include <Swiften/FileTransfer/ReadBytestream.h> +#include <Swiften/FileTransfer/WriteBytestream.h> #include <Swiften/JID/JID.h> #include <Swiften/Network/Connection.h> #include <Swiften/Network/HostAddressPort.h> #include <Swiften/Network/Timer.h> namespace Swift { @@ -93,13 +99,13 @@ private: int chunkSize; boost::shared_ptr<WriteBytestream> writeBytestream; boost::shared_ptr<ReadBytestream> readBytestream; Timer::ref weFailedTimeout; - boost::bsignals::connection connectFinishedConnection; - boost::bsignals::connection dataWrittenConnection; - boost::bsignals::connection dataReadConnection; - boost::bsignals::connection disconnectedConnection; + boost::bsignals::scoped_connection connectFinishedConnection; + boost::bsignals::scoped_connection dataWrittenConnection; + boost::bsignals::scoped_connection dataReadConnection; + boost::bsignals::scoped_connection disconnectedConnection; }; } |