Fix some implicit-bool-conversions

wilder-portage
Kurt Hindenburg 6 years ago
parent 6733a9367b
commit 9a80c74bff
  1. 4
      src/SessionController.cpp
  2. 2
      src/TerminalDisplay.cpp
  3. 2
      src/ViewManager.cpp

@ -232,7 +232,7 @@ SessionController::~SessionController()
if (!_editProfileDialog.isNull()) { if (!_editProfileDialog.isNull()) {
delete _editProfileDialog.data(); delete _editProfileDialog.data();
} }
if(factory()) { if(factory() != nullptr) {
factory()->removeClient(this); 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. // prepend content-specific actions such as "Open Link", "Copy Email Address" etc.
QSharedPointer<Filter::HotSpot> hotSpot = _view->filterActions(position); QSharedPointer<Filter::HotSpot> hotSpot = _view->filterActions(position);
if (hotSpot) { if (hotSpot != nullptr) {
popup->insertActions(popup->actions().value(0, nullptr), hotSpot->actions() << contentSeparator ); popup->insertActions(popup->actions().value(0, nullptr), hotSpot->actions() << contentSeparator );
} }

@ -4070,7 +4070,7 @@ void CompositeWidgetFocusWatcher::registerWidgetAndChildren(QWidget *widget)
} }
for (auto *child: widget->children()) { for (auto *child: widget->children()) {
auto *childWidget = qobject_cast<QWidget *>(child); auto *childWidget = qobject_cast<QWidget *>(child);
if (childWidget) { if (childWidget != nullptr) {
registerWidgetAndChildren(childWidget); registerWidgetAndChildren(childWidget);
} }
} }

@ -1023,7 +1023,7 @@ QStringList ViewManager::sessionList()
int ViewManager::currentSession() int ViewManager::currentSession()
{ {
if (_pluggedController) { if (_pluggedController != nullptr) {
Q_ASSERT(_pluggedController->session() != nullptr); Q_ASSERT(_pluggedController->session() != nullptr);
return _pluggedController->session()->sessionId(); return _pluggedController->session()->sessionId();
} }

Loading…
Cancel
Save