Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-04-01 12:36:16 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-04-01 15:56:34 (GMT) |
| commit | eddd92ed76ae68cb1e202602fd3ebd11b69191a2 (patch) | |
| tree | 8d396e5801d77a2f0ee4ab8e4c5093d8cf8118e6 /Swift/QtUI/Roster/QtRosterWidget.cpp | |
| parent | a79db8d446e152b715f435550c2a6e10a36ee532 (diff) | |
| download | swift-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/QtUI/Roster/QtRosterWidget.cpp')
| -rw-r--r-- | Swift/QtUI/Roster/QtRosterWidget.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Swift/QtUI/Roster/QtRosterWidget.cpp b/Swift/QtUI/Roster/QtRosterWidget.cpp index 027ff00..92fed86 100644 --- a/Swift/QtUI/Roster/QtRosterWidget.cpp +++ b/Swift/QtUI/Roster/QtRosterWidget.cpp @@ -66,28 +66,28 @@ void QtRosterWidget::contextMenuEvent(QContextMenuEvent* event) { removeContact->setEnabled(isOnline()); QAction* showProfileForContact = contextMenu.addAction(tr("Show Profile")); - QAction* unblockContact = NULL; + QAction* unblockContact = nullptr; if (contact->blockState() == ContactRosterItem::IsBlocked || contact->blockState() == ContactRosterItem::IsDomainBlocked) { unblockContact = contextMenu.addAction(tr("Unblock")); unblockContact->setEnabled(isOnline()); } - QAction* blockContact = NULL; + QAction* blockContact = nullptr; if (contact->blockState() == ContactRosterItem::IsUnblocked) { blockContact = contextMenu.addAction(tr("Block")); blockContact->setEnabled(isOnline()); } #ifdef SWIFT_EXPERIMENTAL_FT - QAction* sendFile = NULL; + QAction* sendFile = nullptr; if (contact->supportsFeature(ContactRosterItem::FileTransferFeature)) { sendFile = contextMenu.addAction(tr("Send File")); sendFile->setEnabled(isOnline()); } #endif #ifdef SWIFT_EXPERIMENTAL_WB - QAction* startWhiteboardChat = NULL; + QAction* startWhiteboardChat = nullptr; if (contact->supportsFeature(ContactRosterItem::WhiteboardFeature)) { startWhiteboardChat = contextMenu.addAction(tr("Start Whiteboard Chat")); startWhiteboardChat->setEnabled(isOnline()); @@ -153,7 +153,7 @@ void QtRosterWidget::contextMenuEvent(QContextMenuEvent* event) { void QtRosterWidget::renameGroup(GroupRosterItem* group) { bool ok; - QString newName = QInputDialog::getText(NULL, tr("Rename group"), tr("Enter a new name for group '%1':").arg(P2QSTRING(group->getDisplayName())), QLineEdit::Normal, P2QSTRING(group->getDisplayName()), &ok); + QString newName = QInputDialog::getText(nullptr, tr("Rename group"), tr("Enter a new name for group '%1':").arg(P2QSTRING(group->getDisplayName())), QLineEdit::Normal, P2QSTRING(group->getDisplayName()), &ok); if (ok) { eventStream_->send(boost::make_shared<RenameGroupUIEvent>(group->getDisplayName(), Q2PSTRING(newName))); } |