Swiftdiff options
| 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/DefaultFileTransferTransporterFactory.h | |
| parent | 8f4d198c4d3aa55a5215061e84572d5faf4e4117 (diff) | |
| download | swift-497dfb8ab128b0bbfdb6b3045caa03f8b38bc9fc.zip swift-497dfb8ab128b0bbfdb6b3045caa03f8b38bc9fc.tar.bz2 | |
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
Diffstat (limited to 'Swiften/FileTransfer/DefaultFileTransferTransporterFactory.h')
| -rw-r--r-- | Swiften/FileTransfer/DefaultFileTransferTransporterFactory.h | 7 |
1 files changed, 3 insertions, 4 deletions
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 @@ -1,51 +1,50 @@ /* * Copyright (c) 2013-2017 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once #include <Swiften/Base/API.h> -#include <Swiften/Base/Override.h> #include <Swiften/FileTransfer/FileTransferTransporterFactory.h> namespace Swift { class SOCKS5BytestreamRegistry; class SOCKS5BytestreamServerManager; class SOCKS5BytestreamProxiesManager; class IDGenerator; class ConnectionFactory; class TimerFactory; class CryptoProvider; class IQRouter; class SWIFTEN_API DefaultFileTransferTransporterFactory : public FileTransferTransporterFactory { public: DefaultFileTransferTransporterFactory( SOCKS5BytestreamRegistry*, SOCKS5BytestreamServerManager* s5bServerManager, SOCKS5BytestreamProxiesManager* s5bProxy, IDGenerator* idGenerator, ConnectionFactory*, 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; SOCKS5BytestreamServerManager* s5bServerManager; SOCKS5BytestreamProxiesManager* s5bProxiesManager; IDGenerator* idGenerator; ConnectionFactory* connectionFactory; TimerFactory* timerFactory; CryptoProvider* cryptoProvider; IQRouter* iqRouter; }; } |