Remove Swiften/Base/Override.h

Replaced SWIFTEN_OVERRIDE with C++11 standard override keyword. Test-Information: Tested on macOS 10.12.5 with clang trunk. Change-Id: If89c6cc2a648662522a320834c314496c943a55a
author: Tobias Markmann <tm@ayena.de> 2017-07-13 06:07:37 (GMT)
committer: Tobias Markmann <tm@ayena.de> 2017-07-13 06:07:37 (GMT)
commit: 497dfb8ab128b0bbfdb6b3045caa03f8b38bc9fc (patch)
tree: 4d69e5ce56c755cf3b61aaf78e24729130f77e2e /Swiften/FileTransfer
parent: 8f4d198c4d3aa55a5215061e84572d5faf4e4117 (diff)
download: swift-497dfb8ab128b0bbfdb6b3045caa03f8b38bc9fc.zip
swift-497dfb8ab128b0bbfdb6b3045caa03f8b38bc9fc.tar.bz2
16 files changed, 83 insertions, 95 deletions
diff --git a/Swiften/FileTransfer/DefaultFileTransferTransporter.h b/Swiften/FileTransfer/DefaultFileTransferTransporter.h
index 8843de8..1bfe799 100644
--- a/Swiften/FileTransfer/DefaultFileTransferTransporter.h
+++ b/Swiften/FileTransfer/DefaultFileTransferTransporter.h
@@ -7,7 +7,6 @@
 #pragma once
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/ErrorPayload.h>
 #include <Swiften/FileTransfer/FileTransferTransporter.h>
 
@@ -48,35 +47,35 @@ namespace Swift {
                 CryptoProvider*,
                 IQRouter*,
                 const FileTransferOptions&);
-            virtual ~DefaultFileTransferTransporter() SWIFTEN_OVERRIDE;
+            virtual ~DefaultFileTransferTransporter() override;
 
 
             virtual void initialize();
             virtual void initialize(const std::string& s5bSessionID);
 
-            virtual void startGeneratingLocalCandidates() SWIFTEN_OVERRIDE;
-            virtual void stopGeneratingLocalCandidates() SWIFTEN_OVERRIDE;
+            virtual void startGeneratingLocalCandidates() override;
+            virtual void stopGeneratingLocalCandidates() override;
 
             virtual void addRemoteCandidates(
-                    const std::vector<JingleS5BTransportPayload::Candidate>&, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void startTryingRemoteCandidates() SWIFTEN_OVERRIDE;
-            virtual void stopTryingRemoteCandidates() SWIFTEN_OVERRIDE;
+                    const std::vector<JingleS5BTransportPayload::Candidate>&, const std::string&) override;
+            virtual void startTryingRemoteCandidates() override;
+            virtual void stopTryingRemoteCandidates() override;
 
-            virtual void startActivatingProxy(const JID& jid) SWIFTEN_OVERRIDE;
-            virtual void stopActivatingProxy() SWIFTEN_OVERRIDE;
+            virtual void startActivatingProxy(const JID& jid) override;
+            virtual void stopActivatingProxy() override;
 
             virtual std::shared_ptr<TransportSession> createIBBSendSession(
-                    const std::string& sessionID, unsigned int blockSize, std::shared_ptr<ReadBytestream>) SWIFTEN_OVERRIDE;
+                    const std::string& sessionID, unsigned int blockSize, std::shared_ptr<ReadBytestream>) override;
             virtual std::shared_ptr<TransportSession> createIBBReceiveSession(
-                    const std::string& sessionID, unsigned long long size, std::shared_ptr<WriteBytestream>) SWIFTEN_OVERRIDE;
+                    const std::string& sessionID, unsigned long long size, std::shared_ptr<WriteBytestream>) override;
             virtual std::shared_ptr<TransportSession> createRemoteCandidateSession(
-                    std::shared_ptr<ReadBytestream>, const JingleS5BTransportPayload::Candidate& candidate) SWIFTEN_OVERRIDE;
+                    std::shared_ptr<ReadBytestream>, const JingleS5BTransportPayload::Candidate& candidate) override;
             virtual std::shared_ptr<TransportSession> createRemoteCandidateSession(
-                    std::shared_ptr<WriteBytestream>, const JingleS5BTransportPayload::Candidate& candidate) SWIFTEN_OVERRIDE;
+                    std::shared_ptr<WriteBytestream>, const JingleS5BTransportPayload::Candidate& candidate) override;
             virtual std::shared_ptr<TransportSession> createLocalCandidateSession(
-                    std::shared_ptr<ReadBytestream>, const JingleS5BTransportPayload::Candidate& candidate) SWIFTEN_OVERRIDE;
+                    std::shared_ptr<ReadBytestream>, const JingleS5BTransportPayload::Candidate& candidate) override;
             virtual std::shared_ptr<TransportSession> createLocalCandidateSession(
-                    std::shared_ptr<WriteBytestream>, const JingleS5BTransportPayload::Candidate& candidate) SWIFTEN_OVERRIDE;
+                    std::shared_ptr<WriteBytestream>, const JingleS5BTransportPayload::Candidate& candidate) override;
 
         private:
             void handleLocalCandidatesGenerated(const std::vector<JingleS5BTransportPayload::Candidate>&);
diff --git a/Swiften/FileTransfer/DefaultFileTransferTransporterFactory.h b/Swiften/FileTransfer/DefaultFileTransferTransporterFactory.h
index 774747a..fe4f6ea 100644
--- a/Swiften/FileTransfer/DefaultFileTransferTransporterFactory.h
+++ b/Swiften/FileTransfer/DefaultFileTransferTransporterFactory.h
@@ -7,7 +7,6 @@
 #pragma once
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/FileTransfer/FileTransferTransporterFactory.h>
 
 namespace Swift {
@@ -31,12 +30,12 @@ namespace Swift {
                 TimerFactory*,
                 CryptoProvider*,
                 IQRouter*);
-            virtual ~DefaultFileTransferTransporterFactory() SWIFTEN_OVERRIDE;
+            virtual ~DefaultFileTransferTransporterFactory() override;
 
             virtual FileTransferTransporter* createInitiatorTransporter(
-                    const JID& initiator, const JID& responder, const FileTransferOptions&) SWIFTEN_OVERRIDE;
+                    const JID& initiator, const JID& responder, const FileTransferOptions&) override;
             virtual FileTransferTransporter* createResponderTransporter(
-                    const JID& initiator, const JID& responder, const std::string& s5bSessionID, const FileTransferOptions&) SWIFTEN_OVERRIDE;
+                    const JID& initiator, const JID& responder, const std::string& s5bSessionID, const FileTransferOptions&) override;
 
         private:
             SOCKS5BytestreamRegistry* s5bRegistry;
diff --git a/Swiften/FileTransfer/FailingTransportSession.h b/Swiften/FileTransfer/FailingTransportSession.h
index 28d9d07..489786b 100644
--- a/Swiften/FileTransfer/FailingTransportSession.h
+++ b/Swiften/FileTransfer/FailingTransportSession.h
@@ -13,10 +13,10 @@ namespace Swift {
 
 class SWIFTEN_API FailingTransportSession : public TransportSession {
     public:
-        virtual ~FailingTransportSession() SWIFTEN_OVERRIDE;
+        virtual ~FailingTransportSession() override;
 
-        virtual void start() SWIFTEN_OVERRIDE;
-        virtual void stop() SWIFTEN_OVERRIDE;
+        virtual void start() override;
+        virtual void stop() override;
 };
 
 }
diff --git a/Swiften/FileTransfer/FileTransferManagerImpl.h b/Swiften/FileTransfer/FileTransferManagerImpl.h
index e02dfc6..d3d55f0 100644
--- a/Swiften/FileTransfer/FileTransferManagerImpl.h
+++ b/Swiften/FileTransfer/FileTransferManagerImpl.h
@@ -22,7 +22,6 @@
 
 #include <Swiften/Base/API.h>
 #include <Swiften/Base/IDGenerator.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/S5BProxyRequest.h>
 #include <Swiften/FileTransfer/FileTransferManager.h>
 #include <Swiften/FileTransfer/FileTransferOptions.h>
@@ -65,14 +64,14 @@ namespace Swift {
                     NetworkEnvironment* networkEnvironment,
                     NATTraverser* natTraverser,
                     CryptoProvider* crypto);
-            virtual ~FileTransferManagerImpl() SWIFTEN_OVERRIDE;
+            virtual ~FileTransferManagerImpl() override;
 
             OutgoingFileTransfer::ref createOutgoingFileTransfer(
                     const JID& to,
                     const boost::filesystem::path& filepath,
                     const std::string& description,
                     std::shared_ptr<ReadBytestream> bytestream,
-                    const FileTransferOptions&) SWIFTEN_OVERRIDE;
+                    const FileTransferOptions&) override;
             OutgoingFileTransfer::ref createOutgoingFileTransfer(
                     const JID& to,
                     const std::string& filename,
@@ -80,7 +79,7 @@ namespace Swift {
                     const boost::uintmax_t sizeInBytes,
                     const boost::posix_time::ptime& lastModified,
                     std::shared_ptr<ReadBytestream> bytestream,
-                    const FileTransferOptions&) SWIFTEN_OVERRIDE;
+                    const FileTransferOptions&) override;
 
             void start();
             void stop();
diff --git a/Swiften/FileTransfer/FileTransferOptions.h b/Swiften/FileTransfer/FileTransferOptions.h
index 2bc4ee1..aa9aa97 100644
--- a/Swiften/FileTransfer/FileTransferOptions.h
+++ b/Swiften/FileTransfer/FileTransferOptions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -7,7 +7,6 @@
 #pragma once
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 
 namespace Swift {
     class SWIFTEN_API FileTransferOptions {
diff --git a/Swiften/FileTransfer/IBBReceiveTransportSession.h b/Swiften/FileTransfer/IBBReceiveTransportSession.h
index 7529274..5b1fd8d 100644
--- a/Swiften/FileTransfer/IBBReceiveTransportSession.h
+++ b/Swiften/FileTransfer/IBBReceiveTransportSession.h
@@ -17,10 +17,10 @@ namespace Swift {
 class SWIFTEN_API IBBReceiveTransportSession : public TransportSession {
     public:
         IBBReceiveTransportSession(std::shared_ptr<IBBReceiveSession> session);
-        virtual ~IBBReceiveTransportSession() SWIFTEN_OVERRIDE;
+        virtual ~IBBReceiveTransportSession() override;
 
-        virtual void start() SWIFTEN_OVERRIDE;
-        virtual void stop() SWIFTEN_OVERRIDE;
+        virtual void start() override;
+        virtual void stop() override;
 
     private:
         std::shared_ptr<IBBReceiveSession> session;
diff --git a/Swiften/FileTransfer/IBBSendTransportSession.h b/Swiften/FileTransfer/IBBSendTransportSession.h
index f9bf8fb..7deaaac 100644
--- a/Swiften/FileTransfer/IBBSendTransportSession.h
+++ b/Swiften/FileTransfer/IBBSendTransportSession.h
@@ -17,10 +17,10 @@ namespace Swift {
 class SWIFTEN_API IBBSendTransportSession : public TransportSession {
     public:
         IBBSendTransportSession(std::shared_ptr<IBBSendSession> session);
-        virtual ~IBBSendTransportSession() SWIFTEN_OVERRIDE;
+        virtual ~IBBSendTransportSession() override;
 
-        virtual void start() SWIFTEN_OVERRIDE;
-        virtual void stop() SWIFTEN_OVERRIDE;
+        virtual void start() override;
+        virtual void stop() override;
 
     private:
         std::shared_ptr<IBBSendSession> session;
diff --git a/Swiften/FileTransfer/IncomingJingleFileTransfer.h b/Swiften/FileTransfer/IncomingJingleFileTransfer.h
index e71126b..f42004d 100644
--- a/Swiften/FileTransfer/IncomingJingleFileTransfer.h
+++ b/Swiften/FileTransfer/IncomingJingleFileTransfer.h
@@ -13,7 +13,6 @@
 
 #include <Swiften/Base/API.h>
 #include <Swiften/Base/ByteArray.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/JingleS5BTransportPayload.h>
 #include <Swiften/FileTransfer/FileTransferOptions.h>
 #include <Swiften/FileTransfer/IncomingFileTransfer.h>
@@ -49,10 +48,10 @@ namespace Swift {
                 FileTransferTransporterFactory*,
                 TimerFactory*,
                 CryptoProvider*);
-            virtual ~IncomingJingleFileTransfer() SWIFTEN_OVERRIDE;
+            virtual ~IncomingJingleFileTransfer() override;
 
-            virtual void accept(std::shared_ptr<WriteBytestream>, const FileTransferOptions& = FileTransferOptions()) SWIFTEN_OVERRIDE;
-            virtual void cancel() SWIFTEN_OVERRIDE;
+            virtual void accept(std::shared_ptr<WriteBytestream>, const FileTransferOptions& = FileTransferOptions()) override;
+            virtual void cancel() override;
 
         private:
             enum State {
@@ -68,44 +67,44 @@ namespace Swift {
             };
 
             virtual void handleSessionTerminateReceived(
-                    boost::optional<JinglePayload::Reason> reason) SWIFTEN_OVERRIDE;
-            virtual void handleSessionInfoReceived(std::shared_ptr<JinglePayload>) SWIFTEN_OVERRIDE;
+                    boost::optional<JinglePayload::Reason> reason) override;
+            virtual void handleSessionInfoReceived(std::shared_ptr<JinglePayload>) override;
             virtual void handleTransportReplaceReceived(
-                    const JingleContentID&, std::shared_ptr<JingleTransportPayload>) SWIFTEN_OVERRIDE;
+                    const JingleContentID&, std::shared_ptr<JingleTransportPayload>) override;
 
             virtual void handleLocalTransportCandidatesGenerated(
                     const std::string& s5bSessionID,
                     const std::vector<JingleS5BTransportPayload::Candidate>&,
-                    const std::string& dstAddr) SWIFTEN_OVERRIDE;
+                    const std::string& dstAddr) override;
 
             void handleWriteStreamDataReceived(const std::vector<unsigned char>& data);
             void stopActiveTransport();
             void checkCandidateSelected();
-            virtual JingleContentID getContentID() const SWIFTEN_OVERRIDE;
+            virtual JingleContentID getContentID() const override;
             void checkIfAllDataReceived();
             bool verifyData();
             void handleWaitOnHashTimerTicked();
             void handleTransferFinished(boost::optional<FileTransferError>);
 
         private:
-            virtual void startTransferViaRemoteCandidate() SWIFTEN_OVERRIDE;
-            virtual void startTransferViaLocalCandidate() SWIFTEN_OVERRIDE;
+            virtual void startTransferViaRemoteCandidate() override;
+            virtual void startTransferViaLocalCandidate() 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;
+            const JID& getSender() const override;
+            const JID& getRecipient() const override;
             static FileTransfer::State::Type getExternalState(State state);
-            virtual bool hasPriorityOnCandidateTie() const SWIFTEN_OVERRIDE;
-            virtual void fallback() SWIFTEN_OVERRIDE;
-            virtual void startTransferring(std::shared_ptr<TransportSession>) SWIFTEN_OVERRIDE;
-            virtual bool isWaitingForPeerProxyActivate() const SWIFTEN_OVERRIDE;
-            virtual bool isWaitingForLocalProxyActivate() const SWIFTEN_OVERRIDE;
-            virtual bool isTryingCandidates() const SWIFTEN_OVERRIDE;
-            virtual std::shared_ptr<TransportSession> createLocalCandidateSession() SWIFTEN_OVERRIDE;
-            virtual std::shared_ptr<TransportSession> createRemoteCandidateSession() SWIFTEN_OVERRIDE;
-            virtual void terminate(JinglePayload::Reason::Type reason) SWIFTEN_OVERRIDE;
+            virtual bool hasPriorityOnCandidateTie() const override;
+            virtual void fallback() override;
+            virtual void startTransferring(std::shared_ptr<TransportSession>) override;
+            virtual bool isWaitingForPeerProxyActivate() const override;
+            virtual bool isWaitingForLocalProxyActivate() const override;
+            virtual bool isTryingCandidates() const override;
+            virtual std::shared_ptr<TransportSession> createLocalCandidateSession() override;
+            virtual std::shared_ptr<TransportSession> createRemoteCandidateSession() override;
+            virtual void terminate(JinglePayload::Reason::Type reason) override;
 
 
         private:
diff --git a/Swiften/FileTransfer/LocalJingleTransportCandidateGenerator.h b/Swiften/FileTransfer/LocalJingleTransportCandidateGenerator.h
index 2159063..8c53d16 100644
--- a/Swiften/FileTransfer/LocalJingleTransportCandidateGenerator.h
+++ b/Swiften/FileTransfer/LocalJingleTransportCandidateGenerator.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -17,7 +17,6 @@
 #include <boost/signals2.hpp>
 
 #include <Swiften/Base/IDGenerator.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/JingleS5BTransportPayload.h>
 #include <Swiften/FileTransfer/FileTransferOptions.h>
 #include <Swiften/FileTransfer/SOCKS5BytestreamProxyFinder.h>
diff --git a/Swiften/FileTransfer/OutgoingJingleFileTransfer.h b/Swiften/FileTransfer/OutgoingJingleFileTransfer.h
index 0ab4e2b..6db4e40 100644
--- a/Swiften/FileTransfer/OutgoingJingleFileTransfer.h
+++ b/Swiften/FileTransfer/OutgoingJingleFileTransfer.h
@@ -17,7 +17,6 @@
 #include <boost/optional/optional.hpp>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/JingleFileTransferFileInfo.h>
 #include <Swiften/FileTransfer/FileTransferOptions.h>
 #include <Swiften/FileTransfer/JingleFileTransfer.h>
@@ -46,10 +45,10 @@ namespace Swift {
                 const JingleFileTransferFileInfo&,
                 const FileTransferOptions&,
                 CryptoProvider*);
-            virtual ~OutgoingJingleFileTransfer() SWIFTEN_OVERRIDE;
+            virtual ~OutgoingJingleFileTransfer() override;
 
-            virtual void start() SWIFTEN_OVERRIDE;
-            virtual void cancel() SWIFTEN_OVERRIDE;
+            virtual void start() override;
+            virtual void cancel() override;
 
         private:
             enum State {
@@ -66,34 +65,34 @@ namespace Swift {
                 Finished
             };
 
-            virtual void handleSessionAcceptReceived(const JingleContentID&, std::shared_ptr<JingleDescription>, std::shared_ptr<JingleTransportPayload>) SWIFTEN_OVERRIDE;
-            virtual void handleSessionTerminateReceived(boost::optional<JinglePayload::Reason> reason) SWIFTEN_OVERRIDE;
-            virtual void handleTransportAcceptReceived(const JingleContentID&, std::shared_ptr<JingleTransportPayload>) SWIFTEN_OVERRIDE;
-            virtual void handleTransportRejectReceived(const JingleContentID &, std::shared_ptr<JingleTransportPayload>) SWIFTEN_OVERRIDE;
-            virtual void startTransferViaRemoteCandidate() SWIFTEN_OVERRIDE;
-            virtual void startTransferViaLocalCandidate() SWIFTEN_OVERRIDE;
+            virtual void handleSessionAcceptReceived(const JingleContentID&, std::shared_ptr<JingleDescription>, std::shared_ptr<JingleTransportPayload>) override;
+            virtual void handleSessionTerminateReceived(boost::optional<JinglePayload::Reason> reason) override;
+            virtual void handleTransportAcceptReceived(const JingleContentID&, std::shared_ptr<JingleTransportPayload>) override;
+            virtual void handleTransportRejectReceived(const JingleContentID &, std::shared_ptr<JingleTransportPayload>) override;
+            virtual void startTransferViaRemoteCandidate() override;
+            virtual void startTransferViaLocalCandidate() override;
             void startTransferringIfCandidateAcknowledged();
 
-            virtual void handleLocalTransportCandidatesGenerated(const std::string& s5bSessionID, const std::vector<JingleS5BTransportPayload::Candidate>&, const std::string& dstAddr) SWIFTEN_OVERRIDE;
-            virtual void handleTransportInfoAcknowledged(const std::string& id) SWIFTEN_OVERRIDE;
+            virtual void handleLocalTransportCandidatesGenerated(const std::string& s5bSessionID, const std::vector<JingleS5BTransportPayload::Candidate>&, const std::string& dstAddr) override;
+            virtual void handleTransportInfoAcknowledged(const std::string& id) override;
 
-            virtual JingleContentID getContentID() const SWIFTEN_OVERRIDE;
+            virtual JingleContentID getContentID() const override;
 
-            virtual void terminate(JinglePayload::Reason::Type reason) SWIFTEN_OVERRIDE;
+            virtual void terminate(JinglePayload::Reason::Type reason) override;
 
-            virtual void fallback() SWIFTEN_OVERRIDE;
+            virtual void fallback() override;
             void handleTransferFinished(boost::optional<FileTransferError>);
 
             void sendSessionInfoHash();
 
-            virtual void startTransferring(std::shared_ptr<TransportSession>) SWIFTEN_OVERRIDE;
+            virtual void startTransferring(std::shared_ptr<TransportSession>) override;
 
-            virtual bool hasPriorityOnCandidateTie() const SWIFTEN_OVERRIDE;
-            virtual bool isWaitingForPeerProxyActivate() const SWIFTEN_OVERRIDE;
-            virtual bool isWaitingForLocalProxyActivate() const SWIFTEN_OVERRIDE;
-            virtual bool isTryingCandidates() const SWIFTEN_OVERRIDE;
-            virtual std::shared_ptr<TransportSession> createLocalCandidateSession() SWIFTEN_OVERRIDE;
-            virtual std::shared_ptr<TransportSession> createRemoteCandidateSession() SWIFTEN_OVERRIDE;
+            virtual bool hasPriorityOnCandidateTie() const override;
+            virtual bool isWaitingForPeerProxyActivate() const override;
+            virtual bool isWaitingForLocalProxyActivate() const override;
+            virtual bool isTryingCandidates() const override;
+            virtual std::shared_ptr<TransportSession> createLocalCandidateSession() override;
+            virtual std::shared_ptr<TransportSession> createRemoteCandidateSession() override;
 
             void handleWaitForRemoteTerminationTimeout();
 
diff --git a/Swiften/FileTransfer/RemoteJingleTransportCandidateSelector.h b/Swiften/FileTransfer/RemoteJingleTransportCandidateSelector.h
index c4257f6..c205516 100644
--- a/Swiften/FileTransfer/RemoteJingleTransportCandidateSelector.h
+++ b/Swiften/FileTransfer/RemoteJingleTransportCandidateSelector.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -18,7 +18,6 @@
 #include <queue>
 #include <vector>
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/JingleS5BTransportPayload.h>
 #include <Swiften/FileTransfer/FileTransferOptions.h>
 #include <Swiften/FileTransfer/SOCKS5BytestreamClientSession.h>
diff --git a/Swiften/FileTransfer/S5BTransportSession.h b/Swiften/FileTransfer/S5BTransportSession.h
index 87fc5c1..fd92f2e 100644
--- a/Swiften/FileTransfer/S5BTransportSession.h
+++ b/Swiften/FileTransfer/S5BTransportSession.h
@@ -35,10 +35,10 @@ class SWIFTEN_API S5BTransportSession : public TransportSession {
             initialize();
         }
 
-        virtual ~S5BTransportSession() SWIFTEN_OVERRIDE {
+        virtual ~S5BTransportSession() override {
         }
 
-        virtual void start() SWIFTEN_OVERRIDE {
+        virtual void start() override {
             if (readStream) {
                 session->startSending(readStream);
             }
@@ -47,7 +47,7 @@ class SWIFTEN_API S5BTransportSession : public TransportSession {
             }
         }
 
-        virtual void stop() SWIFTEN_OVERRIDE {
+        virtual void stop() override {
             session->stop();
         }
 
diff --git a/Swiften/FileTransfer/TransportSession.h b/Swiften/FileTransfer/TransportSession.h
index dc6e59a..2d56517 100644
--- a/Swiften/FileTransfer/TransportSession.h
+++ b/Swiften/FileTransfer/TransportSession.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -9,7 +9,6 @@
 #include <boost/signals2.hpp>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/FileTransfer/FileTransferError.h>
 
 namespace Swift {
diff --git a/Swiften/FileTransfer/UnitTest/DummyFileTransferManager.h b/Swiften/FileTransfer/UnitTest/DummyFileTransferManager.h
index 03e2476..6119658 100644
--- a/Swiften/FileTransfer/UnitTest/DummyFileTransferManager.h
+++ b/Swiften/FileTransfer/UnitTest/DummyFileTransferManager.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2016 Isode Limited.
+ * Copyright (c) 2016-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -17,7 +17,6 @@
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/filesystem/path.hpp>
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/FileTransfer/FileTransferManager.h>
 
 namespace Swift {
@@ -34,7 +33,7 @@ namespace Swift {
                     const boost::filesystem::path&,
                     const std::string&,
                     std::shared_ptr<ReadBytestream>,
-                    const FileTransferOptions&) SWIFTEN_OVERRIDE {
+                    const FileTransferOptions&) override {
                 return OutgoingFileTransfer::ref();
             }
 
@@ -45,7 +44,7 @@ namespace Swift {
                     const boost::uintmax_t,
                     const boost::posix_time::ptime&,
                     std::shared_ptr<ReadBytestream>,
-                    const FileTransferOptions&) SWIFTEN_OVERRIDE {
+                    const FileTransferOptions&) override {
                 return OutgoingFileTransfer::ref();
             }
 
diff --git a/Swiften/FileTransfer/UnitTest/IncomingJingleFileTransferTest.cpp b/Swiften/FileTransfer/UnitTest/IncomingJingleFileTransferTest.cpp
index 72b933d..9793b87 100644
--- a/Swiften/FileTransfer/UnitTest/IncomingJingleFileTransferTest.cpp
+++ b/Swiften/FileTransfer/UnitTest/IncomingJingleFileTransferTest.cpp
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -18,7 +18,6 @@
 
 #include <Swiften/Base/ByteArray.h>
 #include <Swiften/Base/Log.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Client/DummyStanzaChannel.h>
 #include <Swiften/Crypto/CryptoProvider.h>
 #include <Swiften/Crypto/PlatformCryptoProvider.h>
diff --git a/Swiften/FileTransfer/UnitTest/OutgoingJingleFileTransferTest.cpp b/Swiften/FileTransfer/UnitTest/OutgoingJingleFileTransferTest.cpp
index 3f4d20f..a0fe057 100644
--- a/Swiften/FileTransfer/UnitTest/OutgoingJingleFileTransferTest.cpp
+++ b/Swiften/FileTransfer/UnitTest/OutgoingJingleFileTransferTest.cpp
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -21,7 +21,6 @@
 
 #include <Swiften/Base/ByteArray.h>
 #include <Swiften/Base/IDGenerator.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Client/DummyStanzaChannel.h>
 #include <Swiften/Crypto/CryptoProvider.h>
 #include <Swiften/Crypto/PlatformCryptoProvider.h>
author	Tobias Markmann <tm@ayena.de>	2017-07-13 06:07:37 (GMT)
committer	Tobias Markmann <tm@ayena.de>	2017-07-13 06:07:37 (GMT)
commit	497dfb8ab128b0bbfdb6b3045caa03f8b38bc9fc (patch)
tree	4d69e5ce56c755cf3b61aaf78e24729130f77e2e /Swiften/FileTransfer
parent	8f4d198c4d3aa55a5215061e84572d5faf4e4117 (diff)
download	swift-497dfb8ab128b0bbfdb6b3045caa03f8b38bc9fc.zip swift-497dfb8ab128b0bbfdb6b3045caa03f8b38bc9fc.tar.bz2