diff --git a/src/modules/partition/core/BootLoaderModel.h b/src/modules/partition/core/BootLoaderModel.h
index 2ef175e84..e911d9029 100644
--- a/src/modules/partition/core/BootLoaderModel.h
+++ b/src/modules/partition/core/BootLoaderModel.h
@@ -38,7 +38,7 @@ public:
         IsPartitionRole
     };
 
-    BootLoaderModel( QObject* parent = 0 );
+    BootLoaderModel( QObject* parent = nullptr );
     ~BootLoaderModel() override;
 
     /**
diff --git a/src/modules/partition/core/PartitionCoreModule.cpp b/src/modules/partition/core/PartitionCoreModule.cpp
index 07c09c6d7..a40ca1035 100644
--- a/src/modules/partition/core/PartitionCoreModule.cpp
+++ b/src/modules/partition/core/PartitionCoreModule.cpp
@@ -270,8 +270,8 @@ PartitionCoreModule::deletePartition( Device* device, Partition* partition )
             if ( !KPMHelpers::isPartitionFreeSpace( childPartition ) )
                 lst << childPartition;
 
-        for ( auto partition : lst )
-            deletePartition( device, partition );
+        for ( auto childPartition : lst )
+            deletePartition( device, childPartition );
     }
 
     QList< Calamares::job_ptr >& jobs = deviceInfo->jobs;
@@ -441,7 +441,7 @@ PartitionCoreModule::osproberEntries() const
 }
 
 void
-PartitionCoreModule::refreshPartition( Device* device, Partition* partition )
+PartitionCoreModule::refreshPartition( Device* device, Partition* )
 {
     // Keep it simple for now: reset the model. This can be improved to cause
     // the model to emit dataChanged() for the affected row instead, avoiding
diff --git a/src/modules/partition/gui/PartitionBarsView.cpp b/src/modules/partition/gui/PartitionBarsView.cpp
index f1333da7c..a66420e1b 100644
--- a/src/modules/partition/gui/PartitionBarsView.cpp
+++ b/src/modules/partition/gui/PartitionBarsView.cpp
@@ -35,8 +35,8 @@
 
 
 static const int VIEW_HEIGHT = qMax( CalamaresUtils::defaultFontHeight() + 8, // wins out with big fonts
-                                     (int)( CalamaresUtils::defaultFontHeight() * 0.6 ) + 22 ); // wins out with small fonts
-static const int CORNER_RADIUS = 3;
+                                     int( CalamaresUtils::defaultFontHeight() * 0.6 ) + 22 ); // wins out with small fonts
+static constexpr int CORNER_RADIUS = 3;
 static const int EXTENDED_PARTITION_MARGIN = qMax( 4, VIEW_HEIGHT / 6 );
 
 // The SELECTION_MARGIN is applied within a hardcoded 2px padding anyway, so
@@ -54,8 +54,8 @@ static const int SELECTION_MARGIN = qMin( ( EXTENDED_PARTITION_MARGIN - 2 ) / 2,
 PartitionBarsView::PartitionBarsView( QWidget* parent )
     : QAbstractItemView( parent )
     , m_nestedPartitionsMode( NoNestedPartitions )
-    , m_hoveredIndex( QModelIndex() )
     , canBeSelected( []( const QModelIndex& ) { return true; } )
+    , m_hoveredIndex( QModelIndex() )
 {
     setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed );
     setFrameStyle( QFrame::NoFrame );
@@ -422,14 +422,14 @@ PartitionBarsView::setSelectionFilter( std::function< bool ( const QModelIndex&
 
 
 QModelIndex
-PartitionBarsView::moveCursor( CursorAction cursorAction, Qt::KeyboardModifiers modifiers )
+PartitionBarsView::moveCursor( CursorAction, Qt::KeyboardModifiers )
 {
     return QModelIndex();
 }
 
 
 bool
-PartitionBarsView::isIndexHidden( const QModelIndex& index ) const
+PartitionBarsView::isIndexHidden( const QModelIndex& ) const
 {
     return false;
 }
@@ -491,7 +491,7 @@ PartitionBarsView::mouseMoveEvent( QMouseEvent* event )
 
 
 void
-PartitionBarsView::leaveEvent( QEvent* event )
+PartitionBarsView::leaveEvent( QEvent* )
 {
     QGuiApplication::restoreOverrideCursor();
     if ( m_hoveredIndex.isValid() )
diff --git a/src/modules/partition/gui/PartitionSizeController.cpp b/src/modules/partition/gui/PartitionSizeController.cpp
index 3cf915c7d..3bb9e758c 100644
--- a/src/modules/partition/gui/PartitionSizeController.cpp
+++ b/src/modules/partition/gui/PartitionSizeController.cpp
@@ -58,7 +58,7 @@ PartitionSizeController::setPartResizerWidget( PartResizerWidget* widget, bool f
     Q_ASSERT( m_device );
 
     if ( m_partResizerWidget )
-        disconnect( m_partResizerWidget, 0, this, 0 );
+        disconnect( m_partResizerWidget, nullptr, this, nullptr );
 
     m_dirty = false;
     m_currentSpinBoxValue = -1;
@@ -108,7 +108,7 @@ void
 PartitionSizeController::setSpinBox( QSpinBox* spinBox )
 {
     if ( m_spinBox )
-        disconnect( m_spinBox, 0, this, 0 );
+        disconnect( m_spinBox, nullptr, this, nullptr );
     m_spinBox = spinBox;
     m_spinBox->setMaximum( std::numeric_limits< int >::max() );
     connectWidgets();
diff --git a/src/modules/partition/gui/ReplaceWidget.cpp b/src/modules/partition/gui/ReplaceWidget.cpp
index 1057127cd..f5a492809 100644
--- a/src/modules/partition/gui/ReplaceWidget.cpp
+++ b/src/modules/partition/gui/ReplaceWidget.cpp
@@ -347,7 +347,7 @@ ReplaceWidget::updateFromCurrentDevice( QComboBox* devicesComboBox )
 
     QAbstractItemModel* oldModel = m_ui->partitionTreeView->model();
     if ( oldModel )
-        disconnect( oldModel, 0, this, 0 );
+        disconnect( oldModel, nullptr, this, nullptr );
 
     PartitionModel* model = m_core->partitionModelForDevice( device );
     m_ui->partitionTreeView->setModel( model );
diff --git a/src/modules/partition/jobs/FormatPartitionJob.cpp b/src/modules/partition/jobs/FormatPartitionJob.cpp
index 0ea9192db..162839ce7 100644
--- a/src/modules/partition/jobs/FormatPartitionJob.cpp
+++ b/src/modules/partition/jobs/FormatPartitionJob.cpp
@@ -78,7 +78,7 @@ FormatPartitionJob::prettyStatusMessage() const
 Calamares::JobResult
 FormatPartitionJob::exec()
 {
-    Report report( 0 );
+    Report report( nullptr );  // Root of the report tree, no parent
     QString partitionPath = m_partition->partitionPath();
     QString message = tr( "The installer failed to format partition %1 on disk '%2'." ).arg( partitionPath, m_device->name() );