Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-10-29 16:15:20 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2015-10-30 12:50:06 (GMT) |
| commit | efb98f5c83fc5e0fb598a88e04c8bf6f642b5e2a (patch) | |
| tree | 0f520a39713370f711c82610c089e966beb70412 /Swiften | |
| parent | 8719b25e0dda4c8dae30c86ff88315e0e7fa9e1c (diff) | |
| download | swift-efb98f5c83fc5e0fb598a88e04c8bf6f642b5e2a.zip swift-efb98f5c83fc5e0fb598a88e04c8bf6f642b5e2a.tar.bz2 | |
Fix code in response to unused macro and private field warnings
Test-Information:
Build and tests pass successfully on OS X 10.10.5.
Change-Id: I614586660796f9ef043156d09d998d39934a6eca
Diffstat (limited to 'Swiften')
| -rw-r--r-- | Swiften/FileTransfer/FileTransferManagerImpl.cpp | 1 | ||||
| -rw-r--r-- | Swiften/FileTransfer/IncomingFileTransferManager.cpp | 8 | ||||
| -rw-r--r-- | Swiften/FileTransfer/IncomingFileTransferManager.h | 5 |
3 files changed, 4 insertions, 10 deletions
diff --git a/Swiften/FileTransfer/FileTransferManagerImpl.cpp b/Swiften/FileTransfer/FileTransferManagerImpl.cpp index f4f9517..9dc9d0d 100644 --- a/Swiften/FileTransfer/FileTransferManagerImpl.cpp +++ b/Swiften/FileTransfer/FileTransferManagerImpl.cpp @@ -77,7 +77,6 @@ FileTransferManagerImpl::FileTransferManagerImpl( crypto); incomingFTManager = new IncomingFileTransferManager( jingleSessionManager, - iqRouter, transporterFactory, timerFactory, crypto); diff --git a/Swiften/FileTransfer/IncomingFileTransferManager.cpp b/Swiften/FileTransfer/IncomingFileTransferManager.cpp index 239c4a8..c1cc757 100644 --- a/Swiften/FileTransfer/IncomingFileTransferManager.cpp +++ b/Swiften/FileTransfer/IncomingFileTransferManager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2014 Isode Limited. + * Copyright (c) 2010-2015 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -13,20 +13,18 @@ #include <Swiften/Elements/JingleFileTransferDescription.h> #include <Swiften/Elements/JingleIBBTransportPayload.h> #include <Swiften/Elements/JingleS5BTransportPayload.h> -#include <Swiften/Jingle/JingleSessionManager.h> -#include <Swiften/Jingle/Jingle.h> #include <Swiften/FileTransfer/IncomingJingleFileTransfer.h> +#include <Swiften/Jingle/Jingle.h> +#include <Swiften/Jingle/JingleSessionManager.h> namespace Swift { IncomingFileTransferManager::IncomingFileTransferManager( JingleSessionManager* jingleSessionManager, - IQRouter* router, FileTransferTransporterFactory* transporterFactory, TimerFactory* timerFactory, CryptoProvider* crypto) : jingleSessionManager(jingleSessionManager), - router(router), transporterFactory(transporterFactory), timerFactory(timerFactory), crypto(crypto) { diff --git a/Swiften/FileTransfer/IncomingFileTransferManager.h b/Swiften/FileTransfer/IncomingFileTransferManager.h index 6edf53b..285ff3f 100644 --- a/Swiften/FileTransfer/IncomingFileTransferManager.h +++ b/Swiften/FileTransfer/IncomingFileTransferManager.h @@ -14,7 +14,6 @@ #include <Swiften/Jingle/IncomingJingleSessionHandler.h> namespace Swift { - class IQRouter; class JingleSessionManager; class FileTransferTransporterFactory; class TimerFactory; @@ -24,11 +23,10 @@ namespace Swift { public: IncomingFileTransferManager( JingleSessionManager* jingleSessionManager, - IQRouter* router, FileTransferTransporterFactory* transporterFactory, TimerFactory* timerFactory, CryptoProvider* crypto); - ~IncomingFileTransferManager(); + virtual ~IncomingFileTransferManager(); boost::signal<void (IncomingFileTransfer::ref)> onIncomingFileTransfer; @@ -40,7 +38,6 @@ namespace Swift { private: JingleSessionManager* jingleSessionManager; - IQRouter* router; FileTransferTransporterFactory* transporterFactory; TimerFactory* timerFactory; CryptoProvider* crypto; |