From 9a80c74bff9e47a9b970b73a82d799a025ea8d95 Mon Sep 17 00:00:00 2001 From: Kurt Hindenburg Date: Sun, 10 May 2020 15:12:27 -0400 Subject: [PATCH] Fix some implicit-bool-conversions --- src/SessionController.cpp | 4 ++-- src/TerminalDisplay.cpp | 2 +- src/ViewManager.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/SessionController.cpp b/src/SessionController.cpp index 73ceb76e..6c3c292b 100644 --- a/src/SessionController.cpp +++ b/src/SessionController.cpp @@ -232,7 +232,7 @@ SessionController::~SessionController() if (!_editProfileDialog.isNull()) { delete _editProfileDialog.data(); } - if(factory()) { + if(factory() != nullptr) { factory()->removeClient(this); } } @@ -1718,7 +1718,7 @@ void SessionController::showDisplayContextMenu(const QPoint& position) // prepend content-specific actions such as "Open Link", "Copy Email Address" etc. QSharedPointer hotSpot = _view->filterActions(position); - if (hotSpot) { + if (hotSpot != nullptr) { popup->insertActions(popup->actions().value(0, nullptr), hotSpot->actions() << contentSeparator ); } diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp index d505facc..55b793ad 100644 --- a/src/TerminalDisplay.cpp +++ b/src/TerminalDisplay.cpp @@ -4070,7 +4070,7 @@ void CompositeWidgetFocusWatcher::registerWidgetAndChildren(QWidget *widget) } for (auto *child: widget->children()) { auto *childWidget = qobject_cast(child); - if (childWidget) { + if (childWidget != nullptr) { registerWidgetAndChildren(childWidget); } } diff --git a/src/ViewManager.cpp b/src/ViewManager.cpp index 376c2ad6..1352f1c5 100644 --- a/src/ViewManager.cpp +++ b/src/ViewManager.cpp @@ -1023,7 +1023,7 @@ QStringList ViewManager::sessionList() int ViewManager::currentSession() { - if (_pluggedController) { + if (_pluggedController != nullptr) { Q_ASSERT(_pluggedController->session() != nullptr); return _pluggedController->session()->sessionId(); }