1 files changed, 3 insertions, 4 deletions
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
@@ -1,103 +1,102 @@
 /*
  * Copyright (c) 2011 Tobias Markmann
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/filesystem/path.hpp>
 #include <boost/optional.hpp>
 #include <boost/signals2.hpp>
 
 #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>
 #include <Swiften/FileTransfer/IncomingFileTransfer.h>
 #include <Swiften/FileTransfer/OutgoingFileTransfer.h>
 
 namespace Swift {
     class ConnectionFactory;
     class ConnectionServerFactory;
     class CryptoProvider;
     class DomainNameResolver;
     class EntityCapsProvider;
     class FileTransferTransporterFactory;
     class IQRouter;
     class IncomingFileTransferManager;
     class JID;
     class JingleSessionManager;
     class NATTraverser;
     class NetworkEnvironment;
     class OutgoingFileTransferManager;
     class PresenceOracle;
     class ReadBytestream;
     class SOCKS5BytestreamProxiesManager;
     class SOCKS5BytestreamRegistry;
     class SOCKS5BytestreamServerManager;
     class TimerFactory;
 
     class SWIFTEN_API FileTransferManagerImpl : public FileTransferManager {
         public:
             FileTransferManagerImpl(
                     const JID& ownFullJID,
                     JingleSessionManager* jingleSessionManager,
                     IQRouter* router,
                     EntityCapsProvider* capsProvider,
                     PresenceOracle* presOracle,
                     ConnectionFactory* connectionFactory,
                     ConnectionServerFactory* connectionServerFactory,
                     TimerFactory* timerFactory,
                     DomainNameResolver* domainNameResolver,
                     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,
                     const std::string& description,
                     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();
 
         private:
             boost::optional<JID> highestPriorityJIDSupportingFileTransfer(const JID& bareJID);
 
         private:
             OutgoingFileTransferManager* outgoingFTManager;
             IncomingFileTransferManager* incomingFTManager;
             FileTransferTransporterFactory* transporterFactory;
             IQRouter* iqRouter;
             EntityCapsProvider* capsProvider;
             PresenceOracle* presenceOracle;
             IDGenerator idGenerator;
             SOCKS5BytestreamRegistry* bytestreamRegistry;
             SOCKS5BytestreamProxiesManager* bytestreamProxy;
             SOCKS5BytestreamServerManager* s5bServerManager;
     };
 }