Clang: reduce warnings

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;

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

src/libcalamares/utils/PluginFactory.h

@@ -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,7 +235,7 @@ 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 );
@@ -251,7 +251,8 @@ protected:
      * You can inherit it, if you want to add new classes and still keep support for the old ones.
      */
     template<class impl>
-    struct InheritanceChecker {
+    struct InheritanceChecker
+    {
         CreateInstanceFunction createInstanceFunction( QWidget* )
         {
             return &createInstance<impl, QWidget>;
@@ -299,7 +300,7 @@ protected:
         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.
@@ -320,8 +321,9 @@ protected:
     static QObject* createInstance( QWidget* parentWidget, QObject* parent )
     {
         Q_UNUSED( parentWidget );
-        ParentType *p = 0;
+        ParentType* p( nullptr );
-        if (parent) {
+        if ( parent )
+        {
             p = qobject_cast<ParentType*>( parent );
             Q_ASSERT( p );
         }
@@ -336,14 +338,13 @@ template<typename T>
 inline T* PluginFactory::create( QObject* parent )
 {
     QObject* o = create( T::staticMetaObject.className(),
-                        parent && parent->isWidgetType() ? reinterpret_cast<QWidget *>(parent) : 0,
+                         parent && parent->isWidgetType() ? reinterpret_cast<QWidget*>( parent ) : nullptr,
                          parent,
                          QString() );
 
     T* t = qobject_cast<T*>( o );
-    if (!t) {
+    if ( !t )
         delete o;
-    }
     return t;
 }
 
@@ -351,14 +352,13 @@ template<typename T>
 inline T* PluginFactory::create( const QString& keyword, QObject* parent )
 {
     QObject* o = create( T::staticMetaObject.className(),
-                        parent && parent->isWidgetType() ? reinterpret_cast<QWidget *>(parent) : 0,
+                         parent && parent->isWidgetType() ? reinterpret_cast<QWidget*>( parent ) : nullptr,
                          parent,
                          keyword );
 
     T* t = qobject_cast<T*>( o );
-    if (!t) {
+    if ( !t )
         delete o;
-    }
     return t;
 }
 

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;

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;

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;