diff --git a/src/libcalamaresui/utils/ImageRegistry.cpp b/src/libcalamaresui/utils/ImageRegistry.cpp
index 5e55b2293..9ed646e50 100644
--- a/src/libcalamaresui/utils/ImageRegistry.cpp
+++ b/src/libcalamaresui/utils/ImageRegistry.cpp
@@ -29,7 +29,7 @@
 #include "utils/Logger.h"
 
 static QHash< QString, QHash< int, QHash< qint64, QPixmap > > > s_cache;
-ImageRegistry* ImageRegistry::s_instance = 0;
+ImageRegistry* ImageRegistry::s_instance = nullptr;
 
 
 ImageRegistry*
diff --git a/src/libcalamaresui/utils/qjsonitem.h b/src/libcalamaresui/utils/qjsonitem.h
index 58ea02d32..1dfa5c65e 100644
--- a/src/libcalamaresui/utils/qjsonitem.h
+++ b/src/libcalamaresui/utils/qjsonitem.h
@@ -26,7 +26,7 @@
 class QJsonTreeItem
 {
 public:
-    QJsonTreeItem(QJsonTreeItem * parent = 0);
+    QJsonTreeItem(QJsonTreeItem * parent = nullptr);
     virtual ~QJsonTreeItem();
     void appendChild(QJsonTreeItem * item);
     QJsonTreeItem *child(int row);
@@ -41,7 +41,7 @@ public:
     QJsonValue::Type type() const;
 
 
-    static QJsonTreeItem* load(const QJsonValue& value, QJsonTreeItem * parent = 0);
+    static QJsonTreeItem* load(const QJsonValue& value, QJsonTreeItem * parent = nullptr);
 
 protected:
 
diff --git a/src/libcalamaresui/utils/qjsonmodel.h b/src/libcalamaresui/utils/qjsonmodel.h
index a76d807d8..0bf8f5dab 100644
--- a/src/libcalamaresui/utils/qjsonmodel.h
+++ b/src/libcalamaresui/utils/qjsonmodel.h
@@ -30,7 +30,7 @@ class QJsonModel : public QAbstractItemModel
 {
     Q_OBJECT
 public:
-    explicit QJsonModel(QObject *parent = 0);
+    explicit QJsonModel(QObject *parent = nullptr);
     virtual ~QJsonModel();
     bool load(const QString& fileName);
     bool load(QIODevice * device);
diff --git a/src/libcalamaresui/viewpages/ViewStep.cpp b/src/libcalamaresui/viewpages/ViewStep.cpp
index 6d5a5f746..a81787673 100644
--- a/src/libcalamaresui/viewpages/ViewStep.cpp
+++ b/src/libcalamaresui/viewpages/ViewStep.cpp
@@ -61,6 +61,8 @@ ViewStep::setModuleInstanceKey( const QString& instanceKey )
 
 void
 ViewStep::setConfigurationMap( const QVariantMap& configurationMap )
-{}
+{
+    Q_UNUSED( configurationMap );
+}
 
 }
diff --git a/src/libcalamaresui/widgets/ClickableLabel.h b/src/libcalamaresui/widgets/ClickableLabel.h
index fc198b98b..7a6556e3f 100644
--- a/src/libcalamaresui/widgets/ClickableLabel.h
+++ b/src/libcalamaresui/widgets/ClickableLabel.h
@@ -28,14 +28,14 @@ class ClickableLabel : public QLabel
 public:
     explicit ClickableLabel( QWidget* parent = nullptr, Qt::WindowFlags f = 0 );
     explicit ClickableLabel( const QString& text, QWidget* parent = nullptr, Qt::WindowFlags f = 0 );
-    virtual ~ClickableLabel();
+    virtual ~ClickableLabel() override;
 
 signals:
     void clicked();
 
 protected:
-    virtual void mousePressEvent( QMouseEvent* event );
-    virtual void mouseReleaseEvent( QMouseEvent* event );
+    virtual void mousePressEvent( QMouseEvent* event ) override;
+    virtual void mouseReleaseEvent( QMouseEvent* event ) override;
 
 private:
     QTime m_time;
diff --git a/src/libcalamaresui/widgets/FixedAspectRatioLabel.cpp b/src/libcalamaresui/widgets/FixedAspectRatioLabel.cpp
index 4920605bc..99d3d51f4 100644
--- a/src/libcalamaresui/widgets/FixedAspectRatioLabel.cpp
+++ b/src/libcalamaresui/widgets/FixedAspectRatioLabel.cpp
@@ -42,6 +42,7 @@ FixedAspectRatioLabel::setPixmap( const QPixmap& pixmap )
 void
 FixedAspectRatioLabel::resizeEvent( QResizeEvent* event )
 {
+    Q_UNUSED( event );
     QLabel::setPixmap( m_pixmap.scaled(
                            contentsRect().size(),
                            Qt::KeepAspectRatio,
diff --git a/src/libcalamaresui/widgets/FixedAspectRatioLabel.h b/src/libcalamaresui/widgets/FixedAspectRatioLabel.h
index 4483576f6..33cc4708f 100644
--- a/src/libcalamaresui/widgets/FixedAspectRatioLabel.h
+++ b/src/libcalamaresui/widgets/FixedAspectRatioLabel.h
@@ -28,7 +28,7 @@ class FixedAspectRatioLabel : public QLabel
     Q_OBJECT
 public:
     explicit FixedAspectRatioLabel( QWidget* parent = nullptr );
-    virtual ~FixedAspectRatioLabel();
+    virtual ~FixedAspectRatioLabel() override;
 
 public slots:
     void setPixmap( const QPixmap &pixmap );
diff --git a/src/libcalamaresui/widgets/QtWaitingSpinner.cpp b/src/libcalamaresui/widgets/QtWaitingSpinner.cpp
index c298a61ec..93ad6f9ee 100644
--- a/src/libcalamaresui/widgets/QtWaitingSpinner.cpp
+++ b/src/libcalamaresui/widgets/QtWaitingSpinner.cpp
@@ -57,7 +57,7 @@ void QtWaitingSpinner::paintEvent(QPaintEvent* /*ev*/) {
 	for (int i = 0; i < myLinesNumber; ++i) {
 		painter.save();
 		painter.translate(myRadius + myLength, myRadius + myLength);
-		qreal rotateAngle = (qreal)360 * qreal(i) / qreal(myLinesNumber);
+		qreal rotateAngle = 360.0 * qreal(i) / qreal(myLinesNumber);
 		painter.rotate(rotateAngle);
 		painter.translate(myRadius, 0);
 		int distance = lineDistance(i, myCurrentCounter, myLinesNumber);
@@ -160,14 +160,14 @@ QColor QtWaitingSpinner::countTrailColor(int distance, int lines, int trail, int
 	if (distance == 0) {
 		return color;
 	}
-	const qreal minAlphaF = (qreal)minOpacity / 100;
-	int distanceThreshold = ceil( (lines - 1) * (qreal)trail / 100);
+	const qreal minAlphaF = qreal(minOpacity) / 100.0;
+	int distanceThreshold = ceil( (lines - 1) * qreal(trail) / 100.0);
 	if (distance > distanceThreshold) {
 		color.setAlphaF(minAlphaF);
 		return color;
 	}
-	qreal alphaDiff = color.alphaF() - (qreal)minAlphaF;
-	qreal gradation = alphaDiff / (qreal)(distanceThreshold + 1);
+	qreal alphaDiff = color.alphaF() - minAlphaF;
+	qreal gradation = alphaDiff / qreal(distanceThreshold + 1);
 	qreal resultAlpha = color.alphaF() - gradation * distance;
 	resultAlpha = std::min(1.0, std::max(0.0, resultAlpha)); //if alpha is out of bound, force it to bounds
 	color.setAlphaF(resultAlpha);
diff --git a/src/libcalamaresui/widgets/QtWaitingSpinner.h b/src/libcalamaresui/widgets/QtWaitingSpinner.h
index b01ebd1a8..1c1b3eb10 100644
--- a/src/libcalamaresui/widgets/QtWaitingSpinner.h
+++ b/src/libcalamaresui/widgets/QtWaitingSpinner.h
@@ -33,7 +33,7 @@ class UIDLLEXPORT QtWaitingSpinner : public QWidget {
 	Q_OBJECT
 
 public:
-	explicit QtWaitingSpinner(int linesNumber = 12, int length = 7, int width = 5, int radius = 10, QWidget* parent = 0);
+	explicit QtWaitingSpinner(int linesNumber = 12, int length = 7, int width = 5, int radius = 10, QWidget* parent = nullptr);
 
 public Q_SLOTS:
 	void start();
diff --git a/src/modules/keyboard/KeyboardViewStep.h b/src/modules/keyboard/KeyboardViewStep.h
index 239639251..39f3f56a7 100644
--- a/src/modules/keyboard/KeyboardViewStep.h
+++ b/src/modules/keyboard/KeyboardViewStep.h
@@ -34,7 +34,7 @@ class PLUGINDLLEXPORT KeyboardViewStep : public Calamares::ViewStep
 
 public:
     explicit KeyboardViewStep( QObject* parent = nullptr );
-    virtual ~KeyboardViewStep();
+    virtual ~KeyboardViewStep() override;
 
     QString prettyName() const override;
     QString prettyStatus() const override;
diff --git a/src/modules/netinstall/NetInstallViewStep.h b/src/modules/netinstall/NetInstallViewStep.h
index de4d411d8..651c53266 100644
--- a/src/modules/netinstall/NetInstallViewStep.h
+++ b/src/modules/netinstall/NetInstallViewStep.h
@@ -34,7 +34,7 @@ class PLUGINDLLEXPORT NetInstallViewStep : public Calamares::ViewStep
 
 public:
     explicit NetInstallViewStep( QObject* parent = nullptr );
-    virtual ~NetInstallViewStep();
+    virtual ~NetInstallViewStep() override;
 
     QString prettyName() const override;
     QString prettyStatus() const override;
diff --git a/src/modules/netinstall/PackageModel.h b/src/modules/netinstall/PackageModel.h
index d49dd88c2..4a41f1879 100644
--- a/src/modules/netinstall/PackageModel.h
+++ b/src/modules/netinstall/PackageModel.h
@@ -35,7 +35,7 @@ class PackageModel : public QAbstractItemModel
     Q_OBJECT
 
 public:
-    explicit PackageModel( const YAML::Node& data, QObject* parent = 0 );
+    explicit PackageModel( const YAML::Node& data, QObject* parent = nullptr );
     ~PackageModel();
 
     QVariant data( const QModelIndex& index, int role ) const override;