summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2016-04-01 12:36:16 (GMT)
committerTobias Markmann <tm@ayena.de>2016-04-01 15:56:34 (GMT)
commiteddd92ed76ae68cb1e202602fd3ebd11b69191a2 (patch)
tree8d396e5801d77a2f0ee4ab8e4c5093d8cf8118e6 /Swiften/Client/ClientSession.cpp
parenta79db8d446e152b715f435550c2a6e10a36ee532 (diff)
downloadswift-eddd92ed76ae68cb1e202602fd3ebd11b69191a2.zip
swift-eddd92ed76ae68cb1e202602fd3ebd11b69191a2.tar.bz2
Modernize code to use C++11 nullptr using clang-tidy
Run 'clang-tidy -fix -checks=modernize-use-nullptr' on all source code files on OS X. This does not modernize platform specific code on Linux and Windows Test-Information: Code builds and unit tests pass on OS X 10.11.4. Change-Id: Ic43ffeb1b76c1a933a55af03db3c54977f5f60dd
Diffstat (limited to 'Swiften/Client/ClientSession.cpp')
-rw-r--r--Swiften/Client/ClientSession.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/Swiften/Client/ClientSession.cpp b/Swiften/Client/ClientSession.cpp
index e38dde8..1b67c96 100644
--- a/Swiften/Client/ClientSession.cpp
+++ b/Swiften/Client/ClientSession.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2015 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -73,8 +73,8 @@ ClientSession::ClientSession(
needResourceBind(false),
needAcking(false),
rosterVersioningSupported(false),
- authenticator(NULL),
- certificateTrustChecker(NULL),
+ authenticator(nullptr),
+ certificateTrustChecker(nullptr),
singleSignOn(false),
authenticationPort(-1) {
#ifdef SWIFTEN_PLATFORM_WIN32
@@ -348,7 +348,7 @@ void ClientSession::handleElement(boost::shared_ptr<ToplevelElement> element) {
else {
state = WaitingForStreamStart;
delete authenticator;
- authenticator = NULL;
+ authenticator = nullptr;
stream->resetXMPPParser();
sendStreamHeader();
}
@@ -493,7 +493,7 @@ void ClientSession::finishSession(boost::shared_ptr<Swift::Error> error) {
}
if (authenticator) {
delete authenticator;
- authenticator = NULL;
+ authenticator = nullptr;
}
stream->writeFooter();
stream->close();