diff --git a/src/EditProfileDialog.cpp b/src/EditProfileDialog.cpp
index 9d7fd5de2..0df9a56bc 100644
--- a/src/EditProfileDialog.cpp
+++ b/src/EditProfileDialog.cpp
@@ -1059,7 +1059,7 @@ void EditProfileDialog::previewColorScheme(const QModelIndex &index)
 
 void EditProfileDialog::showFontDialog()
 {
-    if (!_fontDialog) {
+    if (_fontDialog == nullptr) {
         _fontDialog = new FontDialog(this);
         connect(_fontDialog, &FontDialog::fontChanged, this, [this](const QFont &font) {
             preview(Profile::Font, font);
@@ -1529,7 +1529,7 @@ void EditProfileDialog::setupButtonGroup(const ButtonGroupOptions &options, cons
 
     Q_ASSERT(options.buttons.count() > 0);
     auto *activeButton = options.group->button(currentValue);
-    if (!activeButton) {
+    if (activeButton == nullptr) {
         activeButton = options.buttons[0].button;
     }
     activeButton->setChecked(true);
diff --git a/src/EditProfileDialog.h b/src/EditProfileDialog.h
index 9594a6a8d..f1777592b 100644
--- a/src/EditProfileDialog.h
+++ b/src/EditProfileDialog.h
@@ -393,7 +393,7 @@ public Q_SLOTS:
             Q_ASSERT(widget);
             do {
                 QLayout *widgetLayout = widget->layout();
-                if (widgetLayout) {
+                if (widgetLayout != nullptr) {
                     widgetLayout->update();
                     widgetLayout->activate();
                 }
@@ -414,11 +414,11 @@ public Q_SLOTS:
             int left = getLeftMargin(layout);
             for (int row = 0; row < layout->rowCount(); ++row) {
                 QLayoutItem *layoutItem = layout->itemAtPosition(row, LABELS_COLUMN);
-                if (!layoutItem) {
+                if (layoutItem == nullptr) {
                     continue;
                 }
                 QWidget *widget = layoutItem->widget();
-                if (!widget) {
+                if (widget == nullptr) {
                     continue;
                 }
                 const int idx = layout->indexOf(widget);
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index f5eec3254..74f1544e6 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -729,7 +729,7 @@ void MainWindow::showManageProfilesDialog()
 void MainWindow::showSettingsDialog(const bool showProfilePage)
 {
     static ConfigurationDialog *confDialog = nullptr;
-    if (confDialog) {
+    if (confDialog != nullptr) {
         confDialog->show();
         return;
     }
diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp
index 9603d195a..066d95e1a 100644
--- a/src/TerminalDisplay.cpp
+++ b/src/TerminalDisplay.cpp
@@ -3600,7 +3600,7 @@ bool TerminalDisplay::event(QEvent* event)
         break;
     case QEvent::FocusOut:
     case QEvent::FocusIn:
-        if(_screenWindow) {
+        if(_screenWindow != nullptr) {
             // force a redraw on focusIn, fixes the
             // black screen bug when the view is focused
             // but doesn't redraws.
diff --git a/src/ViewManager.cpp b/src/ViewManager.cpp
index 50cf8aa90..84f62bddf 100644
--- a/src/ViewManager.cpp
+++ b/src/ViewManager.cpp
@@ -266,7 +266,7 @@ void ViewManager::toggleActionsBasedOnState() {
         tabOnlyAction->setEnabled(count > 1);
     }
 
-    if (_viewContainer && _viewContainer->activeViewSplitter()) {
+    if ((_viewContainer != nullptr) && (_viewContainer->activeViewSplitter() != nullptr)) {
         const int splitCount = _viewContainer
                 ->activeViewSplitter()
                 ->getToplevelSplitter()
@@ -464,7 +464,7 @@ void ViewManager::sessionFinished()
 
     // Before deleting the view, let's unmaximize if it's maximized.
     auto *splitter = qobject_cast<ViewSplitter*>(view->parentWidget());
-    if (!splitter) {
+    if (splitter == nullptr) {
         return;
     }
 
@@ -876,7 +876,7 @@ QJsonObject saveSessionsRecurse(QSplitter *splitter) {
 
         if (maybeSplitter != nullptr) {
             internalWidgets.append(saveSessionsRecurse(maybeSplitter));
-        } else if (maybeTerminalDisplay) {
+        } else if (maybeTerminalDisplay != nullptr) {
             internalWidgets.append(saveSessionTerminal(maybeTerminalDisplay));
         }
     }
diff --git a/src/settings/ConfigurationDialog.cpp b/src/settings/ConfigurationDialog.cpp
index b78799619..c28fecbe6 100644
--- a/src/settings/ConfigurationDialog.cpp
+++ b/src/settings/ConfigurationDialog.cpp
@@ -100,7 +100,7 @@ void ConfigurationDialog::addPage(KPageWidgetItem *item, bool manage)
 
     if (_shown && manage) {
         QPushButton *defaultButton = buttonBox()->button(QDialogButtonBox::RestoreDefaults);
-        if (defaultButton) {
+        if (defaultButton != nullptr) {
             bool isDefault = defaultButton->isEnabled() && _manager->isDefault();
             defaultButton->setEnabled(!isDefault);
         }
@@ -134,7 +134,7 @@ void ConfigurationDialog::settingsChangedSlot()
 void ConfigurationDialog::setApplyButtonEnabled(bool enabled)
 {
     QPushButton *applyButton = buttonBox()->button(QDialogButtonBox::Apply);
-    if (applyButton) {
+    if (applyButton != nullptr) {
         applyButton->setEnabled(enabled);
     }
 }
@@ -142,7 +142,7 @@ void ConfigurationDialog::setApplyButtonEnabled(bool enabled)
 void ConfigurationDialog::setRestoreDefaultsButtonEnabled(bool enabled)
 {
     QPushButton *restoreDefaultsButton = buttonBox()->button(QDialogButtonBox::RestoreDefaults);
-    if (restoreDefaultsButton) {
+    if (restoreDefaultsButton != nullptr) {
         restoreDefaultsButton->setEnabled(enabled);
     }
 }
diff --git a/src/settings/ConfigurationDialog.h b/src/settings/ConfigurationDialog.h
index 1f5c2742a..37ae10d88 100644
--- a/src/settings/ConfigurationDialog.h
+++ b/src/settings/ConfigurationDialog.h
@@ -154,7 +154,7 @@ public Q_SLOTS:
         blockSignals(true);
         for(const QButtonGroup *group: qAsConst(_groups)) {
             auto *enumItem = groupToConfigItemEnum(group);
-            if(!enumItem) {
+            if(enumItem == nullptr) {
                 continue;
             }
 
@@ -167,7 +167,7 @@ public Q_SLOTS:
                     break;
                 }
             }
-            if(!currentButton) {
+            if(currentButton == nullptr) {
                 return;
             }
             currentButton->setChecked(true);
@@ -189,11 +189,11 @@ public Q_SLOTS:
         bool updateConfig = false;
         for(const QButtonGroup *group: qAsConst(_groups)) {
             auto *enumItem = groupToConfigItemEnum(group);
-            if(!enumItem) {
+            if(enumItem == nullptr) {
                 continue;
             }
             const auto *currentButton = group->checkedButton();
-            if(!currentButton) {
+            if(currentButton == nullptr) {
                 continue;
             }
             const int value = buttonToEnumValue(currentButton);
@@ -222,7 +222,7 @@ protected Q_SLOTS:
             return;
         }
         auto *enumItem = groupToConfigItemEnum(button->group());
-        if(!enumItem) {
+        if(enumItem == nullptr) {
             return;
         }
 
@@ -240,11 +240,11 @@ private:
         Q_ASSERT(group);
         const QString key = group->objectName().mid(ManagedNamePrefix.length());
         auto *item = _config->findItem(key);
-        if(!item) {
+        if(item == nullptr) {
             return nullptr;
         }
         auto *enumItem = dynamic_cast<KCoreConfigSkeleton::ItemEnum *>(item);
-        if(!enumItem) {
+        if(enumItem == nullptr) {
             return nullptr;
         }
         return enumItem;
@@ -260,7 +260,7 @@ private:
         }
 
         const auto *enumItem = groupToConfigItemEnum(button->group());
-        if(!enumItem) {
+        if(enumItem == nullptr) {
             return -1;
         }
         const auto &choices = enumItem->choices();