summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swiften/FileTransfer/JingleFileTransfer.cpp')
-rw-r--r--Swiften/FileTransfer/JingleFileTransfer.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Swiften/FileTransfer/JingleFileTransfer.cpp b/Swiften/FileTransfer/JingleFileTransfer.cpp
index 55296f9..53977ec 100644
--- a/Swiften/FileTransfer/JingleFileTransfer.cpp
+++ b/Swiften/FileTransfer/JingleFileTransfer.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013-2015 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -25,7 +25,7 @@ JingleFileTransfer::JingleFileTransfer(
session(session),
target(target),
transporterFactory(transporterFactory),
- transporter(NULL),
+ transporter(nullptr),
ourCandidateSelectFinished(false),
theirCandidateSelectFinished(false) {
@@ -229,7 +229,7 @@ void JingleFileTransfer::removeTransporter() {
remoteTransportCandidateSelectFinishedConnection.release();
proxyActivatedConnection.release();
delete transporter;
- transporter = NULL;
+ transporter = nullptr;
}
}