diff --git a/src/libcalamares/ProcessJob.h b/src/libcalamares/ProcessJob.h
index ba6e650f6..1ac7f7f08 100644
--- a/src/libcalamares/ProcessJob.h
+++ b/src/libcalamares/ProcessJob.h
@@ -32,7 +32,7 @@ public:
                          bool runInChroot = false,
                          int secondsTimeout = 30,
                          QObject* parent = nullptr );
-    virtual ~ProcessJob();
+    virtual ~ProcessJob() override;
 
     QString prettyName() const override;
     QString prettyStatusMessage() const override;
diff --git a/src/libcalamares/utils/PluginFactory.cpp b/src/libcalamares/utils/PluginFactory.cpp
index 30a5bf4bf..ff6c9913f 100644
--- a/src/libcalamares/utils/PluginFactory.cpp
+++ b/src/libcalamares/utils/PluginFactory.cpp
@@ -34,7 +34,7 @@ namespace Calamares
 {
 
 PluginFactory::PluginFactory()
-    : d_ptr(new PluginFactoryPrivate)
+    : d_ptr_p(new PluginFactoryPrivate)
 {
     Q_D(PluginFactory);
     d->q_ptr = this;
@@ -43,14 +43,14 @@ PluginFactory::PluginFactory()
 }
 
 PluginFactory::PluginFactory(PluginFactoryPrivate &d)
-    : d_ptr(&d)
+    : d_ptr_p(&d)
 {
     factorycleanup()->add(this);
 }
 
 PluginFactory::~PluginFactory()
 {
-    delete d_ptr;
+    delete d_ptr_p;
 }
 
 void PluginFactory::doRegisterPlugin(const QString &keyword, const QMetaObject *metaObject, CreateInstanceFunction instanceFunction)
@@ -97,7 +97,7 @@ QObject *PluginFactory::create(const char *iface, QWidget *parentWidget, QObject
 {
     Q_D(PluginFactory);
 
-    QObject *obj = 0;
+    QObject *obj( nullptr );
 
     const QList<PluginFactoryPrivate::Plugin> candidates(d->createInstanceHash.values(keyword));
     // for !keyword.isEmpty() candidates.count() is 0 or 1
diff --git a/src/libcalamares/utils/PluginFactory.h b/src/libcalamares/utils/PluginFactory.h
index a45078f65..d7dc61783 100644
--- a/src/libcalamares/utils/PluginFactory.h
+++ b/src/libcalamares/utils/PluginFactory.h
@@ -199,7 +199,7 @@ namespace Calamares
 class DLLEXPORT PluginFactory : public QObject
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(PluginFactory)
+    Q_DECLARE_PRIVATE( PluginFactory )
 public:
     /**
      * This constructor creates a factory for a plugin.
@@ -222,7 +222,7 @@ public:
      * \returns A pointer to the created object is returned, or 0 if an error occurred.
      */
     template<typename T>
-    T *create(QObject *parent = 0);
+    T* create( QObject* parent = nullptr );
 
     /**
      * Use this method to create an object. It will try to create an object which inherits
@@ -235,34 +235,35 @@ public:
      * \returns A pointer to the created object is returned, or 0 if an error occurred.
      */
     template<typename T>
-    T *create(const QString &keyword, QObject *parent = 0);
+    T* create( const QString& keyword, QObject* parent = nullptr );
 
 Q_SIGNALS:
-    void objectCreated(QObject *object);
+    void objectCreated( QObject* object );
 
 protected:
     /**
      * Function pointer type to a function that instantiates a plugin.
      */
-    typedef QObject *(*CreateInstanceFunction)(QWidget *, QObject *);
+    typedef QObject* ( *CreateInstanceFunction )( QWidget*, QObject* );
 
     /**
      * This is used to detect the arguments need for the constructor of plugin classes.
      * You can inherit it, if you want to add new classes and still keep support for the old ones.
      */
     template<class impl>
-    struct InheritanceChecker {
-        CreateInstanceFunction createInstanceFunction(QWidget *)
+    struct InheritanceChecker
+    {
+        CreateInstanceFunction createInstanceFunction( QWidget* )
         {
             return &createInstance<impl, QWidget>;
         }
-        CreateInstanceFunction createInstanceFunction(...)
+        CreateInstanceFunction createInstanceFunction( ... )
         {
             return &createInstance<impl, QObject>;
         }
     };
 
-    explicit PluginFactory(PluginFactoryPrivate &dd);
+    explicit PluginFactory( PluginFactoryPrivate& dd );
 
     /**
      * Registers a plugin with the factory. Call this function from the constructor of the
@@ -292,14 +293,14 @@ protected:
      * \endcode
      */
     template<class T>
-    void registerPlugin(const QString &keyword = QString(),
-                        CreateInstanceFunction instanceFunction
-                        = InheritanceChecker<T>().createInstanceFunction(reinterpret_cast<T *>(0)))
+    void registerPlugin( const QString& keyword = QString(),
+                         CreateInstanceFunction instanceFunction
+                         = InheritanceChecker<T>().createInstanceFunction( reinterpret_cast<T*>( 0 ) ) )
     {
-        doRegisterPlugin(keyword, &T::staticMetaObject, instanceFunction);
+        doRegisterPlugin( keyword, &T::staticMetaObject, instanceFunction );
     }
 
-    PluginFactoryPrivate *const d_ptr;
+    PluginFactoryPrivate* const d_ptr_p;
 
     /**
      * This function is called when the factory asked to create an Object.
@@ -314,56 +315,55 @@ protected:
      * \param keyword A string that uniquely identifies the plugin. If a KService is used this
      * keyword is read from the X-KDE-PluginKeyword entry in the .desktop file.
      */
-    virtual QObject *create(const char *iface, QWidget *parentWidget, QObject *parent, const QString &keyword);
+    virtual QObject* create( const char* iface, QWidget* parentWidget, QObject* parent, const QString& keyword );
 
     template<class impl, class ParentType>
-    static QObject *createInstance(QWidget *parentWidget, QObject *parent)
+    static QObject* createInstance( QWidget* parentWidget, QObject* parent )
     {
-        Q_UNUSED(parentWidget);
-        ParentType *p = 0;
-        if (parent) {
-            p = qobject_cast<ParentType *>(parent);
-            Q_ASSERT(p);
+        Q_UNUSED( parentWidget );
+        ParentType* p( nullptr );
+        if ( parent )
+        {
+            p = qobject_cast<ParentType*>( parent );
+            Q_ASSERT( p );
         }
-        return new impl(p);
+        return new impl( p );
     }
 
 private:
-    void doRegisterPlugin(const QString &keyword, const QMetaObject *metaObject, CreateInstanceFunction instanceFunction);
+    void doRegisterPlugin( const QString& keyword, const QMetaObject* metaObject, CreateInstanceFunction instanceFunction );
 };
 
 template<typename T>
-inline T *PluginFactory::create(QObject *parent)
+inline T* PluginFactory::create( QObject* parent )
 {
-    QObject *o = create(T::staticMetaObject.className(),
-                        parent && parent->isWidgetType() ? reinterpret_cast<QWidget *>(parent) : 0,
-                        parent,
-                        QString());
+    QObject* o = create( T::staticMetaObject.className(),
+                         parent && parent->isWidgetType() ? reinterpret_cast<QWidget*>( parent ) : nullptr,
+                         parent,
+                         QString() );
 
-    T *t = qobject_cast<T *>(o);
-    if (!t) {
+    T* t = qobject_cast<T*>( o );
+    if ( !t )
         delete o;
-    }
     return t;
 }
 
 template<typename T>
-inline T *PluginFactory::create(const QString &keyword, QObject *parent)
+inline T* PluginFactory::create( const QString& keyword, QObject* parent )
 {
-    QObject *o = create(T::staticMetaObject.className(),
-                        parent && parent->isWidgetType() ? reinterpret_cast<QWidget *>(parent) : 0,
-                        parent,
-                        keyword);
+    QObject* o = create( T::staticMetaObject.className(),
+                         parent && parent->isWidgetType() ? reinterpret_cast<QWidget*>( parent ) : nullptr,
+                         parent,
+                         keyword );
 
-    T *t = qobject_cast<T *>(o);
-    if (!t) {
+    T* t = qobject_cast<T*>( o );
+    if ( !t )
         delete o;
-    }
     return t;
 }
 
 }
 
-Q_DECLARE_INTERFACE(Calamares::PluginFactory, CalamaresPluginFactory_iid)
+Q_DECLARE_INTERFACE( Calamares::PluginFactory, CalamaresPluginFactory_iid )
 
 #endif // CALAMARESPLUGINFACTORY_H
diff --git a/src/libcalamaresui/modulesystem/CppJobModule.h b/src/libcalamaresui/modulesystem/CppJobModule.h
index 127614ec5..92c4224d3 100644
--- a/src/libcalamaresui/modulesystem/CppJobModule.h
+++ b/src/libcalamaresui/modulesystem/CppJobModule.h
@@ -42,7 +42,7 @@ protected:
 private:
     friend class Module; //so only the superclass can instantiate
     explicit CppJobModule();
-    virtual ~CppJobModule();
+    virtual ~CppJobModule() override;
 
     QPluginLoader* m_loader;
     job_ptr m_job;
diff --git a/src/libcalamaresui/modulesystem/ProcessJobModule.h b/src/libcalamaresui/modulesystem/ProcessJobModule.h
index b160fd25f..5bb1699be 100644
--- a/src/libcalamaresui/modulesystem/ProcessJobModule.h
+++ b/src/libcalamaresui/modulesystem/ProcessJobModule.h
@@ -40,7 +40,7 @@ protected:
 private:
     friend class Module;
     explicit ProcessJobModule();
-    virtual ~ProcessJobModule();
+    virtual ~ProcessJobModule() override;
 
     QString m_command;
     QString m_workingPath;
diff --git a/src/libcalamaresui/modulesystem/ViewModule.h b/src/libcalamaresui/modulesystem/ViewModule.h
index 177c1eba1..bfbbdadf3 100644
--- a/src/libcalamaresui/modulesystem/ViewModule.h
+++ b/src/libcalamaresui/modulesystem/ViewModule.h
@@ -43,7 +43,7 @@ protected:
 private:
     friend class Module; //so only the superclass can instantiate
     explicit ViewModule();
-    virtual ~ViewModule();
+    virtual ~ViewModule() override;
 
     QPluginLoader* m_loader;
     ViewStep* m_viewStep = nullptr;