Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-10-29 10:12:03 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2015-10-30 12:49:14 (GMT) |
| commit | cb62de17d1e17fd3049a6bc8155a100574a42a85 (patch) | |
| tree | ddbabd81818f1dd16ba2ebc96b45267a1d2e4bf2 /Swiften/FileTransfer/OutgoingJingleFileTransfer.h | |
| parent | 1d921f3d39ed134ca7f1d40011c1a07a5835b73c (diff) | |
| download | swift-cb62de17d1e17fd3049a6bc8155a100574a42a85.zip swift-cb62de17d1e17fd3049a6bc8155a100574a42a85.tar.bz2 | |
Add FileTransfer::getState() method
In addition, this adds the file-transfer classes to the
Doxygen documentation.
Test-Information:
Unit and integration tests still pass.
Change-Id: Ib6c16078c90ed56fae835cb2abfea8a564c3afa3
Diffstat (limited to 'Swiften/FileTransfer/OutgoingJingleFileTransfer.h')
| -rw-r--r-- | Swiften/FileTransfer/OutgoingJingleFileTransfer.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Swiften/FileTransfer/OutgoingJingleFileTransfer.h b/Swiften/FileTransfer/OutgoingJingleFileTransfer.h index 4cb2685..96b465b 100644 --- a/Swiften/FileTransfer/OutgoingJingleFileTransfer.h +++ b/Swiften/FileTransfer/OutgoingJingleFileTransfer.h | |||
| @@ -10,31 +10,31 @@ | |||
| 10 | * See the COPYING file for more information. | 10 | * See the COPYING file for more information. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #pragma once | 13 | #pragma once |
| 14 | 14 | ||
| 15 | #include <boost/shared_ptr.hpp> | ||
| 16 | #include <boost/optional/optional.hpp> | 15 | #include <boost/optional/optional.hpp> |
| 16 | #include <boost/shared_ptr.hpp> | ||
| 17 | 17 | ||
| 18 | #include <Swiften/Base/API.h> | 18 | #include <Swiften/Base/API.h> |
| 19 | #include <Swiften/Base/Override.h> | 19 | #include <Swiften/Base/Override.h> |
| 20 | #include <Swiften/Jingle/JingleContentID.h> | ||
| 21 | #include <Swiften/Elements/JingleFileTransferFileInfo.h> | 20 | #include <Swiften/Elements/JingleFileTransferFileInfo.h> |
| 22 | #include <Swiften/FileTransfer/OutgoingFileTransfer.h> | ||
| 23 | #include <Swiften/FileTransfer/JingleFileTransfer.h> | ||
| 24 | #include <Swiften/FileTransfer/FileTransferOptions.h> | 21 | #include <Swiften/FileTransfer/FileTransferOptions.h> |
| 22 | #include <Swiften/FileTransfer/JingleFileTransfer.h> | ||
| 23 | #include <Swiften/FileTransfer/OutgoingFileTransfer.h> | ||
| 24 | #include <Swiften/Jingle/JingleContentID.h> | ||
| 25 | #include <Swiften/Network/Timer.h> | 25 | #include <Swiften/Network/Timer.h> |
| 26 | 26 | ||
| 27 | namespace Swift { | 27 | namespace Swift { |
| 28 | class ReadBytestream; | ||
| 29 | class IDGenerator; | ||
| 30 | class IncrementalBytestreamHashCalculator; | ||
| 31 | class CryptoProvider; | 28 | class CryptoProvider; |
| 32 | class FileTransferTransporter; | 29 | class FileTransferTransporter; |
| 33 | class FileTransferTransporterFactory; | 30 | class FileTransferTransporterFactory; |
| 34 | class TransportSession; | 31 | class IDGenerator; |
| 32 | class IncrementalBytestreamHashCalculator; | ||
| 33 | class ReadBytestream; | ||
| 35 | class TimerFactory; | 34 | class TimerFactory; |
| 35 | class TransportSession; | ||
| 36 | 36 | ||
| 37 | class SWIFTEN_API OutgoingJingleFileTransfer : public OutgoingFileTransfer, public JingleFileTransfer { | 37 | class SWIFTEN_API OutgoingJingleFileTransfer : public OutgoingFileTransfer, public JingleFileTransfer { |
| 38 | public: | 38 | public: |
| 39 | OutgoingJingleFileTransfer( | 39 | OutgoingJingleFileTransfer( |
| 40 | const JID& to, | 40 | const JID& to, |
| @@ -96,11 +96,11 @@ namespace Swift { | |||
| 96 | virtual boost::shared_ptr<TransportSession> createRemoteCandidateSession() SWIFTEN_OVERRIDE; | 96 | virtual boost::shared_ptr<TransportSession> createRemoteCandidateSession() SWIFTEN_OVERRIDE; |
| 97 | 97 | ||
| 98 | void handleWaitForRemoteTerminationTimeout(); | 98 | void handleWaitForRemoteTerminationTimeout(); |
| 99 | 99 | ||
| 100 | void stopAll(); | 100 | void stopAll(); |
| 101 | void setState(State state); | 101 | void setInternalState(State state); |
| 102 | void setFinishedState(FileTransfer::State::Type, const boost::optional<FileTransferError>& error); | 102 | void setFinishedState(FileTransfer::State::Type, const boost::optional<FileTransferError>& error); |
| 103 | 103 | ||
| 104 | static FileTransfer::State::Type getExternalState(State state); | 104 | static FileTransfer::State::Type getExternalState(State state); |
| 105 | 105 | ||
| 106 | private: | 106 | private: |