Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-11-28 12:08:54 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-11-28 12:18:04 (GMT) |
| commit | f4e2f1deecd322e859bfb27bc5a9ab97726481c5 (patch) | |
| tree | b50dc4515108f5a19cbbd4b615cff01c13c5866c /Swiften/FileTransfer | |
| parent | 5caf2316dad81d6c02ff3e886a65121011ccc9fe (diff) | |
| download | swift-contrib-f4e2f1deecd322e859bfb27bc5a9ab97726481c5.zip swift-contrib-f4e2f1deecd322e859bfb27bc5a9ab97726481c5.tar.bz2 | |
Change error from optional to shared_ptr in GenericRequest
Resolves: #692
Diffstat (limited to 'Swiften/FileTransfer')
| -rw-r--r-- | Swiften/FileTransfer/IBBSendSession.cpp | 2 | ||||
| -rw-r--r-- | Swiften/FileTransfer/IBBSendSession.h | 2 | ||||
| -rw-r--r-- | Swiften/FileTransfer/OutgoingFileTransfer.cpp | 4 | ||||
| -rw-r--r-- | Swiften/FileTransfer/OutgoingFileTransfer.h | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/Swiften/FileTransfer/IBBSendSession.cpp b/Swiften/FileTransfer/IBBSendSession.cpp index 7246187..30f8836 100644 --- a/Swiften/FileTransfer/IBBSendSession.cpp +++ b/Swiften/FileTransfer/IBBSendSession.cpp @@ -34,7 +34,7 @@ void IBBSendSession::stop() { finish(boost::optional<FileTransferError>()); } -void IBBSendSession::handleIBBResponse(IBB::ref, const boost::optional<ErrorPayload>& error) { +void IBBSendSession::handleIBBResponse(IBB::ref, ErrorPayload::ref error) { if (!error) { if (!bytestream->isFinished()) { try { diff --git a/Swiften/FileTransfer/IBBSendSession.h b/Swiften/FileTransfer/IBBSendSession.h index 102bae2..e114b23 100644 --- a/Swiften/FileTransfer/IBBSendSession.h +++ b/Swiften/FileTransfer/IBBSendSession.h @@ -34,7 +34,7 @@ namespace Swift { boost::signal<void (boost::optional<FileTransferError>)> onFinished; private: - void handleIBBResponse(IBB::ref, const boost::optional<ErrorPayload>&); + void handleIBBResponse(IBB::ref, ErrorPayload::ref); void finish(boost::optional<FileTransferError>); private: diff --git a/Swiften/FileTransfer/OutgoingFileTransfer.cpp b/Swiften/FileTransfer/OutgoingFileTransfer.cpp index 9f1dd1b..4fa8d94 100644 --- a/Swiften/FileTransfer/OutgoingFileTransfer.cpp +++ b/Swiften/FileTransfer/OutgoingFileTransfer.cpp @@ -32,7 +32,7 @@ void OutgoingFileTransfer::start() { void OutgoingFileTransfer::stop() { } -void OutgoingFileTransfer::handleStreamInitiationRequestResponse(StreamInitiation::ref response, const boost::optional<ErrorPayload>& error) { +void OutgoingFileTransfer::handleStreamInitiationRequestResponse(StreamInitiation::ref response, ErrorPayload::ref error) { if (error) { finish(FileTransferError()); } @@ -55,7 +55,7 @@ void OutgoingFileTransfer::handleStreamInitiationRequestResponse(StreamInitiatio } } -void OutgoingFileTransfer::handleBytestreamsRequestResponse(Bytestreams::ref, const boost::optional<ErrorPayload>& error) { +void OutgoingFileTransfer::handleBytestreamsRequestResponse(Bytestreams::ref, ErrorPayload::ref error) { if (error) { finish(FileTransferError()); } diff --git a/Swiften/FileTransfer/OutgoingFileTransfer.h b/Swiften/FileTransfer/OutgoingFileTransfer.h index cfbfe21..3ecef5d 100644 --- a/Swiften/FileTransfer/OutgoingFileTransfer.h +++ b/Swiften/FileTransfer/OutgoingFileTransfer.h @@ -32,8 +32,8 @@ namespace Swift { boost::signal<void (const boost::optional<FileTransferError>&)> onFinished; private: - void handleStreamInitiationRequestResponse(StreamInitiation::ref, const boost::optional<ErrorPayload>&); - void handleBytestreamsRequestResponse(Bytestreams::ref, const boost::optional<ErrorPayload>&); + void handleStreamInitiationRequestResponse(StreamInitiation::ref, ErrorPayload::ref); + void handleBytestreamsRequestResponse(Bytestreams::ref, ErrorPayload::ref); void finish(boost::optional<FileTransferError> error); void handleIBBSessionFinished(boost::optional<FileTransferError> error); |