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 /Swift/Controllers/WhiteboardManager.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 'Swift/Controllers/WhiteboardManager.cpp')
-rw-r--r--Swift/Controllers/WhiteboardManager.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/Swift/Controllers/WhiteboardManager.cpp b/Swift/Controllers/WhiteboardManager.cpp
index 91f01c8..9594be4 100644
--- a/Swift/Controllers/WhiteboardManager.cpp
+++ b/Swift/Controllers/WhiteboardManager.cpp
@@ -50,7 +50,7 @@ namespace Swift {
WhiteboardWindow* WhiteboardManager::findWhiteboardWindow(const JID& contact) {
if (whiteboardWindows_.find(contact.toBare()) == whiteboardWindows_.end()) {
- return NULL;
+ return nullptr;
}
return whiteboardWindows_[contact.toBare()];
}
@@ -71,7 +71,7 @@ namespace Swift {
boost::shared_ptr<ShowWhiteboardUIEvent> showWindowEvent = boost::dynamic_pointer_cast<ShowWhiteboardUIEvent>(event);
if (showWindowEvent) {
WhiteboardWindow* window = findWhiteboardWindow(showWindowEvent->getContact());
- if (window != NULL) {
+ if (window != nullptr) {
window->activateWindow();
}
}
@@ -93,7 +93,7 @@ namespace Swift {
session->onRequestRejected.connect(boost::bind(&WhiteboardManager::handleRequestReject, this, _1));
WhiteboardWindow* window = findWhiteboardWindow(contact);
- if (window == NULL) {
+ if (window == nullptr) {
createNewWhiteboardWindow(contact, session);
} else {
window->setSession(session);
@@ -113,7 +113,7 @@ namespace Swift {
session->onRequestAccepted.connect(boost::bind(&WhiteboardManager::handleSessionAccept, this, _1));
WhiteboardWindow* window = findWhiteboardWindow(session->getTo());
- if (window == NULL) {
+ if (window == nullptr) {
createNewWhiteboardWindow(session->getTo(), session);
} else {
window->setSession(session);
@@ -132,7 +132,7 @@ namespace Swift {
void WhiteboardManager::handleSessionAccept(const JID& contact) {
WhiteboardWindow* window = findWhiteboardWindow(contact);
- if (window != NULL) {
+ if (window != nullptr) {
window->show();
}
onRequestAccepted(contact);