Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2014-10-28 23:15:59 (GMT) |
|---|---|---|
| committer | Swift Review <review@swift.im> | 2014-10-30 14:55:11 (GMT) |
| commit | 4041cc4dd4f0abc6641fed5890120efa691a27ca (patch) | |
| tree | 8c9eb101469f453556314c23bcec57f680419c4e /Swiften | |
| parent | 6e87ef3a842094483105df4e6333c90964a69a47 (diff) | |
| download | swift-4041cc4dd4f0abc6641fed5890120efa691a27ca.zip swift-4041cc4dd4f0abc6641fed5890120efa691a27ca.tar.bz2 | |
Add missing virtual and SWIFTEN_OVERRIDE annotations to reduce warnings with C++11.
Test-Information:
Tested with Clang 3.6.0.
Change-Id: I1f9ae8ae535d90f92b7263e86b51fe64b15524b4
Diffstat (limited to 'Swiften')
| -rw-r--r-- | Swiften/Crypto/CommonCryptoCryptoProvider.cpp | 4 | ||||
| -rw-r--r-- | Swiften/Crypto/OpenSSLCryptoProvider.cpp | 4 | ||||
| -rw-r--r-- | Swiften/FileTransfer/DefaultFileTransferTransporter.h | 4 | ||||
| -rw-r--r-- | Swiften/FileTransfer/IncomingJingleFileTransfer.h | 6 | ||||
| -rw-r--r-- | Swiften/FileTransfer/OutgoingJingleFileTransfer.h | 8 |
5 files changed, 13 insertions, 13 deletions
diff --git a/Swiften/Crypto/CommonCryptoCryptoProvider.cpp b/Swiften/Crypto/CommonCryptoCryptoProvider.cpp index 14f9284..4cb746f 100644 --- a/Swiften/Crypto/CommonCryptoCryptoProvider.cpp +++ b/Swiften/Crypto/CommonCryptoCryptoProvider.cpp @@ -33,13 +33,13 @@ namespace { } virtual Hash& update(const SafeByteArray& data) SWIFTEN_OVERRIDE { return updateInternal(data); } - virtual std::vector<unsigned char> getHash() { + virtual std::vector<unsigned char> getHash() SWIFTEN_OVERRIDE { assert(!finalized); std::vector<unsigned char> result(CC_SHA1_DIGEST_LENGTH); CC_SHA1_Final(vecptr(result), &context); return result; } @@ -74,13 +74,13 @@ namespace { } virtual Hash& update(const SafeByteArray& data) SWIFTEN_OVERRIDE { return updateInternal(data); } - virtual std::vector<unsigned char> getHash() { + virtual std::vector<unsigned char> getHash() SWIFTEN_OVERRIDE { assert(!finalized); std::vector<unsigned char> result(CC_MD5_DIGEST_LENGTH); CC_MD5_Final(vecptr(result), &context); return result; } diff --git a/Swiften/Crypto/OpenSSLCryptoProvider.cpp b/Swiften/Crypto/OpenSSLCryptoProvider.cpp index 9b1d544..41b4564 100644 --- a/Swiften/Crypto/OpenSSLCryptoProvider.cpp +++ b/Swiften/Crypto/OpenSSLCryptoProvider.cpp @@ -36,13 +36,13 @@ namespace { } virtual Hash& update(const SafeByteArray& data) SWIFTEN_OVERRIDE { return updateInternal(data); } - virtual std::vector<unsigned char> getHash() { + virtual std::vector<unsigned char> getHash() SWIFTEN_OVERRIDE { assert(!finalized); std::vector<unsigned char> result(SHA_DIGEST_LENGTH); SHA1_Final(vecptr(result), &context); return result; } @@ -77,13 +77,13 @@ namespace { } virtual Hash& update(const SafeByteArray& data) SWIFTEN_OVERRIDE { return updateInternal(data); } - virtual std::vector<unsigned char> getHash() { + virtual std::vector<unsigned char> getHash() SWIFTEN_OVERRIDE { assert(!finalized); std::vector<unsigned char> result(MD5_DIGEST_LENGTH); MD5_Final(vecptr(result), &context); return result; } diff --git a/Swiften/FileTransfer/DefaultFileTransferTransporter.h b/Swiften/FileTransfer/DefaultFileTransferTransporter.h index ef982c0..80f8bee 100644 --- a/Swiften/FileTransfer/DefaultFileTransferTransporter.h +++ b/Swiften/FileTransfer/DefaultFileTransferTransporter.h @@ -56,14 +56,14 @@ namespace Swift { virtual void addRemoteCandidates( const std::vector<JingleS5BTransportPayload::Candidate>&) SWIFTEN_OVERRIDE; virtual void startTryingRemoteCandidates() SWIFTEN_OVERRIDE; virtual void stopTryingRemoteCandidates() SWIFTEN_OVERRIDE; - virtual void startActivatingProxy(const JID& jid); - virtual void stopActivatingProxy(); + virtual void startActivatingProxy(const JID& jid) SWIFTEN_OVERRIDE; + virtual void stopActivatingProxy() SWIFTEN_OVERRIDE; virtual boost::shared_ptr<TransportSession> createIBBSendSession( const std::string& sessionID, unsigned int blockSize, boost::shared_ptr<ReadBytestream>) SWIFTEN_OVERRIDE; virtual boost::shared_ptr<TransportSession> createIBBReceiveSession( const std::string& sessionID, unsigned long long size, boost::shared_ptr<WriteBytestream>) SWIFTEN_OVERRIDE; virtual boost::shared_ptr<TransportSession> createRemoteCandidateSession( diff --git a/Swiften/FileTransfer/IncomingJingleFileTransfer.h b/Swiften/FileTransfer/IncomingJingleFileTransfer.h index a691d5b..66dade7 100644 --- a/Swiften/FileTransfer/IncomingJingleFileTransfer.h +++ b/Swiften/FileTransfer/IncomingJingleFileTransfer.h @@ -41,13 +41,13 @@ namespace Swift { FileTransferTransporterFactory*, TimerFactory*, CryptoProvider*); ~IncomingJingleFileTransfer(); virtual void accept(boost::shared_ptr<WriteBytestream>, const FileTransferOptions&) SWIFTEN_OVERRIDE; - void cancel(); + virtual void cancel() SWIFTEN_OVERRIDE; private: enum State { Initial, GeneratingInitialLocalCandidates, TryingCandidates, @@ -76,14 +76,14 @@ namespace Swift { void checkIfAllDataReceived(); bool verifyData(); void handleWaitOnHashTimerTicked(); void handleTransferFinished(boost::optional<FileTransferError>); private: - void startTransferViaRemoteCandidate(); - void startTransferViaLocalCandidate(); + virtual void startTransferViaRemoteCandidate() SWIFTEN_OVERRIDE; + virtual void startTransferViaLocalCandidate() SWIFTEN_OVERRIDE; void checkHashAndTerminate(); void stopAll(); void setState(State state); void setFinishedState(FileTransfer::State::Type, const boost::optional<FileTransferError>& error); const JID& getSender() const SWIFTEN_OVERRIDE; const JID& getRecipient() const SWIFTEN_OVERRIDE; diff --git a/Swiften/FileTransfer/OutgoingJingleFileTransfer.h b/Swiften/FileTransfer/OutgoingJingleFileTransfer.h index d1f4dc4..98b585e 100644 --- a/Swiften/FileTransfer/OutgoingJingleFileTransfer.h +++ b/Swiften/FileTransfer/OutgoingJingleFileTransfer.h @@ -42,14 +42,14 @@ namespace Swift { IDGenerator*, const StreamInitiationFileInfo&, const FileTransferOptions&, CryptoProvider*); virtual ~OutgoingJingleFileTransfer(); - void start(); - void cancel(); + virtual void start() SWIFTEN_OVERRIDE; + virtual void cancel() SWIFTEN_OVERRIDE; private: enum State { Initial, GeneratingInitialLocalCandidates, WaitingForAccept, @@ -62,14 +62,14 @@ namespace Swift { Finished }; virtual void handleSessionAcceptReceived(const JingleContentID&, boost::shared_ptr<JingleDescription>, boost::shared_ptr<JingleTransportPayload>) SWIFTEN_OVERRIDE; virtual void handleSessionTerminateReceived(boost::optional<JinglePayload::Reason> reason) SWIFTEN_OVERRIDE; virtual void handleTransportAcceptReceived(const JingleContentID&, boost::shared_ptr<JingleTransportPayload>) SWIFTEN_OVERRIDE; - void startTransferViaRemoteCandidate(); - void startTransferViaLocalCandidate(); + virtual void startTransferViaRemoteCandidate() SWIFTEN_OVERRIDE; + virtual void startTransferViaLocalCandidate() SWIFTEN_OVERRIDE; void startTransferringIfCandidateAcknowledged(); virtual void handleLocalTransportCandidatesGenerated(const std::string& s5bSessionID, const std::vector<JingleS5BTransportPayload::Candidate>&) SWIFTEN_OVERRIDE; virtual void handleTransportInfoAcknowledged(const std::string& id) SWIFTEN_OVERRIDE; virtual JingleContentID getContentID() const SWIFTEN_OVERRIDE; |