summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swiften/FileTransfer/JingleFileTransfer.cpp')
-rw-r--r--Swiften/FileTransfer/JingleFileTransfer.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/Swiften/FileTransfer/JingleFileTransfer.cpp b/Swiften/FileTransfer/JingleFileTransfer.cpp
index 62c3a53..cc1cd1c 100644
--- a/Swiften/FileTransfer/JingleFileTransfer.cpp
+++ b/Swiften/FileTransfer/JingleFileTransfer.cpp
@@ -1,15 +1,13 @@
/*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2018 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <Swiften/FileTransfer/JingleFileTransfer.h>
-#include <boost/typeof/typeof.hpp>
-
#include <Swiften/Base/Log.h>
#include <Swiften/Crypto/CryptoProvider.h>
#include <Swiften/FileTransfer/FileTransferTransporter.h>
#include <Swiften/JID/JID.h>
#include <Swiften/Jingle/JingleSession.h>
@@ -27,11 +25,10 @@ JingleFileTransfer::JingleFileTransfer(
transporter(nullptr),
ourCandidateSelectFinished(false),
theirCandidateSelectFinished(false) {
session->addListener(this);
-
}
JingleFileTransfer::~JingleFileTransfer() {
session->removeListener(this);
}
@@ -174,11 +171,11 @@ void JingleFileTransfer::handleTransportInfoReceived(
SWIFT_LOG(debug) << "Received candidate decision from peer" << std::endl;
if (!isTryingCandidates()) { SWIFT_LOG(warning) << "Incorrect state" << std::endl; return; }
theirCandidateSelectFinished = true;
if (!s5bPayload->hasCandidateError()) {
- BOOST_AUTO(theirCandidate, localCandidates.find(s5bPayload->getCandidateUsed()));
+ auto theirCandidate = localCandidates.find(s5bPayload->getCandidateUsed());
if (theirCandidate == localCandidates.end()) {
SWIFT_LOG(warning) << "Got invalid candidate" << std::endl;
terminate(JinglePayload::Reason::GeneralError);
return;
}
@@ -229,6 +226,5 @@ void JingleFileTransfer::removeTransporter() {
proxyActivatedConnection.release();
delete transporter;
transporter = nullptr;
}
}
-