C++11 cleanup

Task-number: QTAUTO-322
Change-Id: I80accb5e7a5996c9b7b1a3baeb4cfbb93703a622
Reviewed-by: Vadim Popov <vadim.popov@pelagicore.com>
Reviewed-by: Kevin Funk <kevin.funk@kdab.com>

92 files changed, 396 insertions, 295 deletions

diff --git a/examples/vehiclefunctions/climate_widget/mainwindow.cpp b/examples/vehiclefunctions/climate_widget/mainwindow.cpp
index 50d1921..15dca4e 100644
--- a/examples/vehiclefunctions/climate_widget/mainwindow.cpp
+++ b/examples/vehiclefunctions/climate_widget/mainwindow.cpp
@@ -61,7 +61,7 @@ MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),
     ui(new Ui::MainWindow),
     m_buttonGroup(new QButtonGroup(this)),
-    m_climateControl(0)
+    m_climateControl(nullptr)
 {
     ui->setupUi(this);
 
diff --git a/examples/vehiclefunctions/climate_widget/mainwindow.h b/examples/vehiclefunctions/climate_widget/mainwindow.h
index f296ffc..f14e35a 100644
--- a/examples/vehiclefunctions/climate_widget/mainwindow.h
+++ b/examples/vehiclefunctions/climate_widget/mainwindow.h
@@ -70,7 +70,7 @@ class MainWindow : public QMainWindow
     Q_OBJECT
 
 public:
-    explicit MainWindow(QWidget *parent = 0);
+    explicit MainWindow(QWidget *parent = nullptr);
     ~MainWindow();
 
 private slots:
diff --git a/src/doc/qtivi/src/attribute-system.qdoc b/src/doc/qtivi/src/attribute-system.qdoc
index c5af7ae..4708d7f 100644
--- a/src/doc/qtivi/src/attribute-system.qdoc
+++ b/src/doc/qtivi/src/attribute-system.qdoc
@@ -143,7 +143,7 @@ class SimpleControl : public QObject
     Q_OBJECT
     Q_PROPERTY(QIviProperty *temperature READ temperatureProperty CONSTANT)
 
-    SimpleControl(QObject *parent = Q_NULLPTR);
+    SimpleControl(QObject *parent = nullptr);
     ~SimpleControl();
 
     int temperature() const;
diff --git a/src/ivicore/qiviabstractfeature.cpp b/src/ivicore/qiviabstractfeature.cpp
index 965fe37..468b5f0 100644
--- a/src/ivicore/qiviabstractfeature.cpp
+++ b/src/ivicore/qiviabstractfeature.cpp
@@ -50,11 +50,13 @@
 #include <QMetaEnum>
 #include <QDebug>
 
+QT_BEGIN_NAMESPACE
+
 QIviAbstractFeaturePrivate::QIviAbstractFeaturePrivate(const QString &interface, QIviAbstractFeature *parent)
     : QObjectPrivate()
     , q_ptr(parent)
     , m_interface(interface)
-    , m_serviceObject(0)
+    , m_serviceObject(nullptr)
     , m_discoveryMode(QIviAbstractFeature::AutoDiscovery)
     , m_discoveryResult(QIviAbstractFeature::NoResult)
     , m_error(QIviAbstractFeature::NoError)
@@ -261,7 +263,7 @@ bool QIviAbstractFeature::setServiceObject(QIviServiceObject *so)
         disconnect(d->m_serviceObject, SIGNAL(destroyed()), this, SLOT(serviceObjectDestroyed()));
     }
 
-    d->m_serviceObject = 0;
+    d->m_serviceObject = nullptr;
 
     //We only want to call clearServiceObject if we are sure that the serviceObject changes
     if (!so) {
@@ -731,9 +733,11 @@ void QIviAbstractFeature::onErrorChanged(QIviAbstractFeature::Error error, const
 void QIviAbstractFeature::serviceObjectDestroyed()
 {
     Q_D(QIviAbstractFeature);
-    d->m_serviceObject = 0;
+    d->m_serviceObject = nullptr;
     clearServiceObject();
     emit serviceObjectChanged();
 }
 
+QT_END_NAMESPACE
+
 #include "moc_qiviabstractfeature.cpp"
diff --git a/src/ivicore/qiviabstractfeature.h b/src/ivicore/qiviabstractfeature.h
index 25a64da..02e974b 100644
--- a/src/ivicore/qiviabstractfeature.h
+++ b/src/ivicore/qiviabstractfeature.h
@@ -92,8 +92,8 @@ public:
     };
     Q_ENUM(DiscoveryResult)
 
-    explicit QIviAbstractFeature(const QString &interface, QObject *parent = Q_NULLPTR);
-    virtual ~QIviAbstractFeature();
+    explicit QIviAbstractFeature(const QString &interface, QObject *parent = nullptr);
+    ~QIviAbstractFeature();
 
     QIviServiceObject *serviceObject() const;
     QIviAbstractFeature::DiscoveryMode discoveryMode() const;
@@ -117,7 +117,7 @@ Q_SIGNALS:
     void errorChanged(QIviAbstractFeature::Error error, const QString &message);
 
 protected:
-    QIviAbstractFeature(QIviAbstractFeaturePrivate &dd, QObject *parent = Q_NULLPTR);
+    QIviAbstractFeature(QIviAbstractFeaturePrivate &dd, QObject *parent = nullptr);
 
     virtual bool acceptServiceObject(QIviServiceObject*);
     virtual void connectToServiceObject(QIviServiceObject*);
diff --git a/src/ivicore/qiviabstractfeaturelistmodel.cpp b/src/ivicore/qiviabstractfeaturelistmodel.cpp
index 48e54fe..a7a7356 100644
--- a/src/ivicore/qiviabstractfeaturelistmodel.cpp
+++ b/src/ivicore/qiviabstractfeaturelistmodel.cpp
@@ -42,6 +42,8 @@
 #include "qiviabstractfeaturelistmodel.h"
 #include "qiviabstractfeaturelistmodel_p.h"
 
+QT_BEGIN_NAMESPACE
+
 QIviHelperFeature::QIviHelperFeature(const QString &interface, QIviAbstractFeatureListModel *model)
     : QIviAbstractFeature(interface)
     , m_model(model)
@@ -531,3 +533,5 @@ void QIviAbstractFeatureListModel::onErrorChanged(QIviAbstractFeature::Error err
 {
     setError(error, message);
 }
+
+QT_END_NAMESPACE
diff --git a/src/ivicore/qiviabstractfeaturelistmodel.h b/src/ivicore/qiviabstractfeaturelistmodel.h
index 7835880..2521a13 100644
--- a/src/ivicore/qiviabstractfeaturelistmodel.h
+++ b/src/ivicore/qiviabstractfeaturelistmodel.h
@@ -63,7 +63,7 @@ class Q_QTIVICORE_EXPORT QIviAbstractFeatureListModel : public QAbstractListMode
 
 public:
 
-    explicit QIviAbstractFeatureListModel(const QString &interface, QObject *parent = Q_NULLPTR);
+    explicit QIviAbstractFeatureListModel(const QString &interface, QObject *parent = nullptr);
     ~QIviAbstractFeatureListModel();
 
     QIviServiceObject *serviceObject() const;
@@ -88,15 +88,15 @@ Q_SIGNALS:
     void errorChanged(QIviAbstractFeature::Error error, const QString &message);
 
 protected:
-    QIviAbstractFeatureListModel(QIviAbstractFeatureListModelPrivate &dd, QObject *parent = Q_NULLPTR);
+    QIviAbstractFeatureListModel(QIviAbstractFeatureListModelPrivate &dd, QObject *parent = nullptr);
 
     virtual bool acceptServiceObject(QIviServiceObject*);
     virtual void connectToServiceObject(QIviServiceObject*);
     virtual void disconnectFromServiceObject(QIviServiceObject*);
     virtual void clearServiceObject() = 0;
 
-    virtual void classBegin() Q_DECL_OVERRIDE;
-    virtual void componentComplete() Q_DECL_OVERRIDE;
+    virtual void classBegin() override;
+    virtual void componentComplete() override;
 
     QString interfaceName() const;
     QString errorText() const;
diff --git a/src/ivicore/qiviabstractfeaturelistmodel_p.h b/src/ivicore/qiviabstractfeaturelistmodel_p.h
index d82e27b..a505009 100644
--- a/src/ivicore/qiviabstractfeaturelistmodel_p.h
+++ b/src/ivicore/qiviabstractfeaturelistmodel_p.h
@@ -65,13 +65,13 @@ class QIviHelperFeature : public QIviAbstractFeature
 public:
     QIviHelperFeature(const QString &interface, QIviAbstractFeatureListModel *model);
 
-    bool acceptServiceObject(QIviServiceObject *so);
+    bool acceptServiceObject(QIviServiceObject *so) override;
     bool acceptServiceObjectDefaultImpl(QIviServiceObject *so);
-    void connectToServiceObject(QIviServiceObject *so);
+    void connectToServiceObject(QIviServiceObject *so) override;
     void connectToServiceObjectDefaultImpl(QIviServiceObject *so);
-    void disconnectFromServiceObject(QIviServiceObject *so);
+    void disconnectFromServiceObject(QIviServiceObject *so) override;
     void disconnectFromServiceObjectDefaultImpl(QIviServiceObject *so);
-    void clearServiceObject();
+    void clearServiceObject() override;
 
     using QIviAbstractFeature::interfaceName;
     using QIviAbstractFeature::errorText;
@@ -84,7 +84,7 @@ class Q_QTIVICORE_EXPORT QIviAbstractFeatureListModelPrivate : public QAbstractI
 {
 public:
     QIviAbstractFeatureListModelPrivate(const QString &interface, QIviAbstractFeatureListModel *model);
-    virtual ~QIviAbstractFeatureListModelPrivate();
+    ~QIviAbstractFeatureListModelPrivate();
 
     virtual void initialize();
 
diff --git a/src/ivicore/qiviabstractzonedfeature.cpp b/src/ivicore/qiviabstractzonedfeature.cpp
index d81454c..96575a4 100644
--- a/src/ivicore/qiviabstractzonedfeature.cpp
+++ b/src/ivicore/qiviabstractzonedfeature.cpp
@@ -46,6 +46,8 @@
 #include "qiviabstractzonedfeature_p.h"
 #include "qivizonedfeatureinterface.h"
 
+QT_BEGIN_NAMESPACE
+
 QIviAbstractZonedFeaturePrivate::QIviAbstractZonedFeaturePrivate(const QString &interface, const QString &zone, QIviAbstractFeature *parent)
     : QIviAbstractFeaturePrivate(interface, parent)
     , m_zone(zone)
@@ -113,7 +115,7 @@ bool QIviAbstractZonedFeature::acceptServiceObject(QIviServiceObject *serviceObj
 */
 void QIviAbstractZonedFeature::connectToServiceObject(QIviServiceObject *serviceObject)
 {
-    QIviZonedFeatureInterface *backend(0);
+    QIviZonedFeatureInterface *backend = nullptr;
     if (QIviAbstractZonedFeature* parentFeature = qobject_cast<QIviAbstractZonedFeature*>(parent()))
         backend = parentFeature->backend();
     else if (serviceObject)
@@ -331,3 +333,5 @@ QVariantList QIviAbstractZonedFeature::zoneFeatureList() const
     Q_D(const QIviAbstractZonedFeature);
     return d->m_zoneFeatureList;
 }
+
+QT_END_NAMESPACE
diff --git a/src/ivicore/qiviabstractzonedfeature.h b/src/ivicore/qiviabstractzonedfeature.h
index 445e3f1..0f4a86b 100644
--- a/src/ivicore/qiviabstractzonedfeature.h
+++ b/src/ivicore/qiviabstractzonedfeature.h
@@ -63,8 +63,8 @@ class Q_QTIVICORE_EXPORT QIviAbstractZonedFeature : public QIviAbstractFeature
 
 public:
 
-    explicit QIviAbstractZonedFeature(const QString &interface, const QString &zone = QString(), QObject *parent = Q_NULLPTR);
-    virtual ~QIviAbstractZonedFeature();
+    explicit QIviAbstractZonedFeature(const QString &interface, const QString &zone = QString(), QObject *parent = nullptr);
+    ~QIviAbstractZonedFeature();
 
     QString zone() const;
 
@@ -79,14 +79,14 @@ Q_SIGNALS:
     void zonesChanged();
 
 protected:
-    QIviAbstractZonedFeature(QIviAbstractZonedFeaturePrivate &dd, QObject *parent = Q_NULLPTR);
+    QIviAbstractZonedFeature(QIviAbstractZonedFeaturePrivate &dd, QObject *parent = nullptr);
 
     virtual QIviAbstractZonedFeature *createZoneFeature(const QString &zone) = 0;
     QIviZonedFeatureInterface *backend(const QString &interface = QString()) const;
 
-    virtual bool acceptServiceObject(QIviServiceObject *serviceObject) Q_DECL_OVERRIDE;
-    virtual void connectToServiceObject(QIviServiceObject *serviceObject) Q_DECL_OVERRIDE;
-    virtual void clearServiceObject() Q_DECL_OVERRIDE;
+    virtual bool acceptServiceObject(QIviServiceObject *serviceObject) override;
+    virtual void connectToServiceObject(QIviServiceObject *serviceObject) override;
+    virtual void clearServiceObject() override;
 
 private Q_SLOTS:
     void setZone(const QString &zone);
diff --git a/src/ivicore/qivifeatureinterface.cpp b/src/ivicore/qivifeatureinterface.cpp
index 6628836..0701b91 100644
--- a/src/ivicore/qivifeatureinterface.cpp
+++ b/src/ivicore/qivifeatureinterface.cpp
@@ -41,6 +41,8 @@
 
 #include "qivifeatureinterface.h"
 
+QT_BEGIN_NAMESPACE
+
 /*!
    \class QIviFeatureInterface
    \inmodule QtIviCore
@@ -102,3 +104,5 @@ QIviFeatureInterface::QIviFeatureInterface(QObjectPrivate &dd, QObject *parent)
 
     \sa initialize
 */
+
+QT_END_NAMESPACE
diff --git a/src/ivicore/qivifeatureinterface.h b/src/ivicore/qivifeatureinterface.h
index 2082644..52c3639 100644
--- a/src/ivicore/qivifeatureinterface.h
+++ b/src/ivicore/qivifeatureinterface.h
@@ -52,13 +52,13 @@ class Q_QTIVICORE_EXPORT QIviFeatureInterface : public QObject
     Q_OBJECT
 
 public:
-    explicit QIviFeatureInterface(QObject *parent = Q_NULLPTR);
+    explicit QIviFeatureInterface(QObject *parent = nullptr);
     ~QIviFeatureInterface();
 
     virtual void initialize() = 0;
 
 protected:
-    QIviFeatureInterface(QObjectPrivate &dd, QObject *parent = Q_NULLPTR);
+    QIviFeatureInterface(QObjectPrivate &dd, QObject *parent = nullptr);
 
 Q_SIGNALS:
     void errorChanged(QIviAbstractFeature::Error error, const QString &message = QString());
diff --git a/src/ivicore/qiviproperty.cpp b/src/ivicore/qiviproperty.cpp
index d2db6b8..6f56933 100644
--- a/src/ivicore/qiviproperty.cpp
+++ b/src/ivicore/qiviproperty.cpp
@@ -48,11 +48,13 @@
 #include <private/qv8engine_p.h>
 #include <private/qv4engine_p.h>
 
+QT_BEGIN_NAMESPACE
+
 QIviPropertyPrivate::QIviPropertyPrivate(int userType, QtPrivate::QSlotObjectBase *attributeGetter, QtPrivate::QSlotObjectBase *valueGetter)
     : m_type(userType)
     , m_attributeGetter(attributeGetter)
     , m_valueGetter(valueGetter)
-    , m_valueSetter(Q_NULLPTR)
+    , m_valueSetter(nullptr)
 {}
 
 void QIviPropertyPrivate::throwError(QObject *object, const QString &error)
@@ -159,7 +161,7 @@ void QIviProperty::setValue(const QVariant &value)
         return;
     }
 
-    void *args[] = { Q_NULLPTR, var.data() };
+    void *args[] = { nullptr, var.data() };
     d->m_valueSetter->call(parent(), args);
 }
 
@@ -198,3 +200,5 @@ QtPrivate::QSlotObjectBase *QIviProperty::valueGetter() const
     Q_D(const QIviProperty);
     return d->m_valueGetter;
 }
+
+QT_END_NAMESPACE
diff --git a/src/ivicore/qiviproperty.h b/src/ivicore/qiviproperty.h
index e2478be..843cb2a 100644
--- a/src/ivicore/qiviproperty.h
+++ b/src/ivicore/qiviproperty.h
@@ -61,7 +61,7 @@ class Q_QTIVICORE_EXPORT QIviProperty : public QObject
     Q_PROPERTY(QVariantList availableValues READ availableValues NOTIFY availableValuesChanged)
 
 public:
-    virtual ~QIviProperty();
+    ~QIviProperty();
 
     virtual bool isAvailable() const = 0;
     virtual QVariant minimumValue() const  = 0;
diff --git a/src/ivicore/qivipropertyattribute.cpp b/src/ivicore/qivipropertyattribute.cpp
index 9f98b52..c0e68ec 100644
--- a/src/ivicore/qivipropertyattribute.cpp
+++ b/src/ivicore/qivipropertyattribute.cpp
@@ -41,6 +41,8 @@
 
 #include "qivipropertyattribute.h"
 
+QT_BEGIN_NAMESPACE
+
 QIviPropertyAttributeBase::QIviPropertyAttributeBase()
 {
     registerTypes();
@@ -172,3 +174,5 @@ void QIviPropertyAttributeBase::registerTypes()
  *
  * All elements of QIviPropertyAttribute are used for the comparison.
  */
+
+QT_END_NAMESPACE
diff --git a/src/ivicore/qivipropertyfactory.cpp b/src/ivicore/qivipropertyfactory.cpp
index 2deb09f..d988f67 100644
--- a/src/ivicore/qivipropertyfactory.cpp
+++ b/src/ivicore/qivipropertyfactory.cpp
@@ -41,6 +41,8 @@
 
 #include "qivipropertyfactory.h"
 
+QT_BEGIN_NAMESPACE
+
 /*!
  * \class QIviPropertyFactory
  * \inmodule QtIviCore
@@ -121,3 +123,5 @@
  *
  * \reimp
  */
+
+QT_END_NAMESPACE
diff --git a/src/ivicore/qivipropertyfactory.h b/src/ivicore/qivipropertyfactory.h
index f76939e..066a68b 100644
--- a/src/ivicore/qivipropertyfactory.h
+++ b/src/ivicore/qivipropertyfactory.h
@@ -130,25 +130,25 @@ public:
         return prop;
     }
 
-    bool isAvailable() const Q_DECL_OVERRIDE
+    bool isAvailable() const override
     {
         return callAttributeGetter().isAvailable();
     }
 
-    QVariant minimumValue() const Q_DECL_OVERRIDE
+    QVariant minimumValue() const override
     {
         return QVariant::fromValue<T>(callAttributeGetter().minimumValue());
     }
-    QVariant maximumValue() const Q_DECL_OVERRIDE
+    QVariant maximumValue() const override
     {
         return QVariant::fromValue<T>(callAttributeGetter().maximumValue());
     }
-    QVariantList availableValues() const Q_DECL_OVERRIDE
+    QVariantList availableValues() const override
     {
         return qtivi_convertAvailableValues(callAttributeGetter().availableValues());
     }
 
-    QVariant value() const Q_DECL_OVERRIDE
+    QVariant value() const override
     {
         T val;
         void *args[] = { reinterpret_cast<void*>(&val), QVariant().data() };
diff --git a/src/ivicore/qiviproxyserviceobject_p.cpp b/src/ivicore/qiviproxyserviceobject_p.cpp
index c355934..94684b0 100644
--- a/src/ivicore/qiviproxyserviceobject_p.cpp
+++ b/src/ivicore/qiviproxyserviceobject_p.cpp
@@ -41,6 +41,8 @@
 
 #include "qiviproxyserviceobject_p.h"
 
+QT_BEGIN_NAMESPACE
+
 QIviProxyServiceObject::QIviProxyServiceObject(QIviServiceInterface *interface)
     : QIviServiceObject()
     , m_interface(interface)
@@ -63,3 +65,4 @@ QIviFeatureInterface *QIviProxyServiceObject::interfaceInstance(const QString &i
     return m_interface->interfaceInstance(interface);
 }
 
+QT_END_NAMESPACE
diff --git a/src/ivicore/qiviproxyserviceobject_p.h b/src/ivicore/qiviproxyserviceobject_p.h
index 43a2f94..3d7839b 100644
--- a/src/ivicore/qiviproxyserviceobject_p.h
+++ b/src/ivicore/qiviproxyserviceobject_p.h
@@ -61,8 +61,8 @@ QT_BEGIN_NAMESPACE
 class QIviProxyServiceObject : public QIviServiceObject
 {
 public:
-    QIviProxyServiceObject(QIviServiceInterface *interface);
-    virtual ~QIviProxyServiceObject();
+    explicit QIviProxyServiceObject(QIviServiceInterface *interface);
+    ~QIviProxyServiceObject();
 
     virtual QStringList interfaces() const;
     virtual QIviFeatureInterface *interfaceInstance(const QString &interface) const;
diff --git a/src/ivicore/qivisearchandbrowsemodel.cpp b/src/ivicore/qivisearchandbrowsemodel.cpp
index 4a3feef..81e2ff9 100644
--- a/src/ivicore/qivisearchandbrowsemodel.cpp
+++ b/src/ivicore/qivisearchandbrowsemodel.cpp
@@ -49,6 +49,8 @@
 #include <QMetaObject>
 #include <QDebug>
 
+QT_BEGIN_NAMESPACE
+
 QIviSearchAndBrowseModelPrivate::QIviSearchAndBrowseModelPrivate(const QString &interface, QIviSearchAndBrowseModel *model)
     : QIviAbstractFeatureListModelPrivate(interface, model)
     , q_ptr(model)
@@ -1212,4 +1214,6 @@ void QIviSearchAndBrowseModel::clearServiceObject()
     This signal is emitted whenever the fetchMoreThreshold is reached and new data is requested from the backend.
 */
 
+QT_END_NAMESPACE
+
 #include "moc_qivisearchandbrowsemodel.cpp"
diff --git a/src/ivicore/qivisearchandbrowsemodel.h b/src/ivicore/qivisearchandbrowsemodel.h
index ef11a5c..dfbc486 100644
--- a/src/ivicore/qivisearchandbrowsemodel.h
+++ b/src/ivicore/qivisearchandbrowsemodel.h
@@ -105,8 +105,8 @@ public:
     Q_DECLARE_FLAGS(Capabilities, Capability)
     Q_FLAG(Capabilities)
 
-    QIviSearchAndBrowseModel(QObject *parent = Q_NULLPTR);
-    virtual ~QIviSearchAndBrowseModel();
+    explicit QIviSearchAndBrowseModel(QObject *parent = nullptr);
+    ~QIviSearchAndBrowseModel();
 
     Capabilities capabilities() const;
 
@@ -129,13 +129,13 @@ public:
     QIviSearchAndBrowseModel::LoadingType loadingType() const;
     void setLoadingType(QIviSearchAndBrowseModel::LoadingType loadingType);
 
-    int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
-    QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    QVariant data(const QModelIndex &index, int role) const override;
 
-    bool canFetchMore(const QModelIndex &parent) const Q_DECL_OVERRIDE;
-    void fetchMore(const QModelIndex &parent) Q_DECL_OVERRIDE;
+    bool canFetchMore(const QModelIndex &parent) const override;
+    void fetchMore(const QModelIndex &parent) override;
 
-    QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE;
+    QHash<int, QByteArray> roleNames() const override;
 
     Q_INVOKABLE QVariant get(int index) const;
     Q_INVOKABLE void goBack();
@@ -164,12 +164,12 @@ Q_SIGNALS:
     void loadingTypeChanged(QIviSearchAndBrowseModel::LoadingType loadingType);
 
 protected:
-    QIviSearchAndBrowseModel(QIviServiceObject *serviceObject, const QString &contentType, QObject *parent = Q_NULLPTR);
+    QIviSearchAndBrowseModel(QIviServiceObject *serviceObject, const QString &contentType, QObject *parent = nullptr);
     QIviSearchAndBrowseModel(QIviSearchAndBrowseModelPrivate &dd, QObject *parent);
-    virtual bool acceptServiceObject(QIviServiceObject *serviceObject) Q_DECL_OVERRIDE;
-    virtual void connectToServiceObject(QIviServiceObject *serviceObject) Q_DECL_OVERRIDE;
-    virtual void disconnectFromServiceObject(QIviServiceObject *serviceObject) Q_DECL_OVERRIDE;
-    virtual void clearServiceObject() Q_DECL_OVERRIDE;
+    virtual bool acceptServiceObject(QIviServiceObject *serviceObject) override;
+    virtual void connectToServiceObject(QIviServiceObject *serviceObject) override;
+    virtual void disconnectFromServiceObject(QIviServiceObject *serviceObject) override;
+    virtual void clearServiceObject() override;
 
 private:
     Q_DECLARE_PRIVATE(QIviSearchAndBrowseModel)
diff --git a/src/ivicore/qivisearchandbrowsemodel_p.h b/src/ivicore/qivisearchandbrowsemodel_p.h
index b7d4433..f8ef7a6 100644
--- a/src/ivicore/qivisearchandbrowsemodel_p.h
+++ b/src/ivicore/qivisearchandbrowsemodel_p.h
@@ -71,7 +71,7 @@ public:
     QIviSearchAndBrowseModelPrivate(const QString &interface, QIviSearchAndBrowseModel *model);
     ~QIviSearchAndBrowseModelPrivate();
 
-    virtual void initialize() Q_DECL_OVERRIDE;
+    virtual void initialize() override;
     void onCapabilitiesChanged(const QUuid &identifier, QIviSearchAndBrowseModel::Capabilities capabilities);
     void onDataFetched(const QUuid &identifer, const QList<QVariant> &items, int start, bool moreAvailable);
     void onCountChanged(const QUuid &identifier, int new_length);
diff --git a/src/ivicore/qivisearchandbrowsemodelinterface.cpp b/src/ivicore/qivisearchandbrowsemodelinterface.cpp
index 4d582c2..602de7c 100644
--- a/src/ivicore/qivisearchandbrowsemodelinterface.cpp
+++ b/src/ivicore/qivisearchandbrowsemodelinterface.cpp
@@ -42,6 +42,8 @@
 #include "qivisearchandbrowsemodelinterface.h"
 #include "qivisearchandbrowsemodelinterface_p.h"
 
+QT_BEGIN_NAMESPACE
+
 QIviSearchAndBrowseModelInterfacePrivate::QIviSearchAndBrowseModelInterfacePrivate()
 {
 }
@@ -69,7 +71,7 @@ QIviSearchAndBrowseModelInterfacePrivate::QIviSearchAndBrowseModelInterfacePriva
 */
 
 /*!
-    \fn QIviSearchAndBrowseModelInterface::QIviSearchAndBrowseModelInterface(QObject *parent=0)
+    \fn QIviSearchAndBrowseModelInterface::QIviSearchAndBrowseModelInterface(QObject *parent = nullptr)
 
     Constructs a backend interface.
 
@@ -289,3 +291,5 @@ void QIviSearchAndBrowseModelInterface::registerContentType(const QMetaObject &o
 
     \sa indexOf()
 */
+
+QT_END_NAMESPACE
diff --git a/src/ivicore/qivisearchandbrowsemodelinterface.h b/src/ivicore/qivisearchandbrowsemodelinterface.h
index a30b687..1e6aabb 100644
--- a/src/ivicore/qivisearchandbrowsemodelinterface.h
+++ b/src/ivicore/qivisearchandbrowsemodelinterface.h
@@ -61,8 +61,8 @@ class Q_QTIVICORE_EXPORT QIviSearchAndBrowseModelInterface : public QIviFeatureI
     Q_OBJECT
 
 public:
-    QIviSearchAndBrowseModelInterface(QObject *parent = Q_NULLPTR);
-    virtual ~QIviSearchAndBrowseModelInterface();
+    explicit QIviSearchAndBrowseModelInterface(QObject *parent = nullptr);
+    ~QIviSearchAndBrowseModelInterface();
 
     virtual QSet<QString> availableContentTypes() const;
     virtual QSet<QString> supportedIdentifiers(const QString &contentType) const;
diff --git a/src/ivicore/qivisearchandbrowsemodelitem.cpp b/src/ivicore/qivisearchandbrowsemodelitem.cpp
index 3a14818..e304bbb 100644
--- a/src/ivicore/qivisearchandbrowsemodelitem.cpp
+++ b/src/ivicore/qivisearchandbrowsemodelitem.cpp
@@ -59,8 +59,6 @@ public:
     QVariantMap m_data;
 };
 
-QT_END_NAMESPACE
-
 /*!
     \class QIviSearchAndBrowseModelItem
     \inmodule QtIviCore
@@ -197,3 +195,5 @@ bool QIviSearchAndBrowseModelItem::operator==(const QIviSearchAndBrowseModelItem
 
     \sa operator==()
 */
+
+QT_END_NAMESPACE
diff --git a/src/ivicore/qiviservicemanager.cpp b/src/ivicore/qiviservicemanager.cpp
index 91c7911..33653c1 100644
--- a/src/ivicore/qiviservicemanager.cpp
+++ b/src/ivicore/qiviservicemanager.cpp
@@ -59,8 +59,6 @@ QT_BEGIN_NAMESPACE
 
 Q_LOGGING_CATEGORY(qLcIviServiceManagement, "qt.ivi.servicemanagement");
 
-QT_END_NAMESPACE
-
 namespace qtivi_helper {
 #ifdef QT_DEBUG
     static const bool loadDebug = true;
@@ -158,10 +156,10 @@ void QIviServiceManagerPrivate::registerBackend(const QString &fileName, const Q
 
     Backend* backend = new Backend;
     backend->metaData = backendMetaData;
-    backend->interface = 0;
-    backend->interfaceObject = 0;
-    backend->loader = 0;
-    backend->proxyServiceObject = 0;
+    backend->interface = nullptr;
+    backend->interfaceObject = nullptr;
+    backend->loader = nullptr;
+    backend->proxyServiceObject = nullptr;
     addBackend(backend);
 }
 
@@ -187,8 +185,8 @@ bool QIviServiceManagerPrivate::registerBackend(QObject *serviceBackendInterface
     backend->metaData = metaData;
     backend->interface = interface;
     backend->interfaceObject = serviceBackendInterface;
-    backend->loader = 0;
-    backend->proxyServiceObject = 0;
+    backend->loader = nullptr;
+    backend->proxyServiceObject = nullptr;
 
     addBackend(backend);
     return true;
@@ -242,7 +240,7 @@ static QIviServiceInterface *warn(const char *what, const QPluginLoader *loader)
     qWarning("ServiceManager::serviceObjects - failed to %s '%s'",
              what, qPrintable(loader->fileName()));
     delete loader;
-    return Q_NULLPTR;
+    return nullptr;
 }
 } // unnamed namespace
 
@@ -313,7 +311,7 @@ QIviServiceInterface *QIviServiceManagerPrivate::loadServiceBackendInterface(str
  */
 
 QIviServiceManager::QIviServiceManager()
-    : QAbstractListModel(0)
+    : QAbstractListModel(nullptr)
     , d_ptr(new QIviServiceManagerPrivate(this))
 {
     d_ptr->searchPlugins();
@@ -415,3 +413,5 @@ QVariant QIviServiceManager::data(const QModelIndex &index, int role) const
 
     return QVariant();
 }
+
+QT_END_NAMESPACE
diff --git a/src/ivicore/qiviservicemanager.h b/src/ivicore/qiviservicemanager.h
index 1f3d393..c3ca952 100644
--- a/src/ivicore/qiviservicemanager.h
+++ b/src/ivicore/qiviservicemanager.h
@@ -69,7 +69,7 @@ public:
     Q_ENUM(BackendType)
 
     static QIviServiceManager *instance();
-    virtual ~QIviServiceManager();
+    ~QIviServiceManager();
 
     QList<QIviServiceObject*> findServiceByInterface(const QString &interface, SearchFlags searchFlags = IncludeAll);
     bool hasInterface(const QString &interface) const;
diff --git a/src/ivicore/qiviserviceobject.cpp b/src/ivicore/qiviserviceobject.cpp
index c03e411..4e44d3b 100644
--- a/src/ivicore/qiviserviceobject.cpp
+++ b/src/ivicore/qiviserviceobject.cpp
@@ -43,6 +43,8 @@
 
 #include <QUuid>
 
+QT_BEGIN_NAMESPACE
+
 /*!
  * \class QIviServiceObject
  * \inmodule QtIviCore
@@ -126,3 +128,5 @@ QString QIviServiceObject::id() const
  *
  * Returns an object implementing the service interface requested through \a interface.
  */
+
+QT_END_NAMESPACE
diff --git a/src/ivicore/qiviserviceobject.h b/src/ivicore/qiviserviceobject.h
index f7a4e97..a1495ce 100644
--- a/src/ivicore/qiviserviceobject.h
+++ b/src/ivicore/qiviserviceobject.h
@@ -56,8 +56,8 @@ class Q_QTIVICORE_EXPORT QIviServiceObject : public QObject, public QIviServiceI
     Q_PROPERTY(QString id READ id CONSTANT)
 
 public:
-    explicit QIviServiceObject(QObject *parent = Q_NULLPTR);
-    virtual ~QIviServiceObject();
+    explicit QIviServiceObject(QObject *parent = nullptr);
+    ~QIviServiceObject();
 
     virtual QString id() const;
 
diff --git a/src/ivicore/qivizonedfeatureinterface.cpp b/src/ivicore/qivizonedfeatureinterface.cpp
index 684bed4..07179a8 100644
--- a/src/ivicore/qivizonedfeatureinterface.cpp
+++ b/src/ivicore/qivizonedfeatureinterface.cpp
@@ -41,6 +41,8 @@
 
 #include "qivizonedfeatureinterface.h"
 
+QT_BEGIN_NAMESPACE
+
 /*!
    \class QIviZonedFeatureInterface
    \inmodule QtIviCore
@@ -156,7 +158,7 @@
  */
 
 /*!
- * \fn QIviZonedFeatureInterface::QIviZonedFeatureInterface(QObject *parent=0)
+ * \fn QIviZonedFeatureInterface::QIviZonedFeatureInterface(QObject *parent = nullptr)
  *
  * Constructs a backend base interface.
  *
@@ -181,3 +183,5 @@ QIviZonedFeatureInterface::~QIviZonedFeatureInterface()
  *
  * \sa {Providing Available Zones}
  */
+
+QT_END_NAMESPACE
diff --git a/src/ivicore/qivizonedfeatureinterface.h b/src/ivicore/qivizonedfeatureinterface.h
index 88037e5..a55414b 100644
--- a/src/ivicore/qivizonedfeatureinterface.h
+++ b/src/ivicore/qivizonedfeatureinterface.h
@@ -52,8 +52,8 @@ class Q_QTIVICORE_EXPORT QIviZonedFeatureInterface : public QIviFeatureInterface
     Q_OBJECT
 
 public:
-    explicit QIviZonedFeatureInterface(QObject *parent = Q_NULLPTR);
-    virtual ~QIviZonedFeatureInterface();
+    explicit QIviZonedFeatureInterface(QObject *parent = nullptr);
+    ~QIviZonedFeatureInterface();
 
     virtual QStringList availableZones() const = 0;
 };
diff --git a/src/ivicore/queryparser/qiviqueryparser.g b/src/ivicore/queryparser/qiviqueryparser.g
index 4d02530..a8c6af0 100644
--- a/src/ivicore/queryparser/qiviqueryparser.g
+++ b/src/ivicore/queryparser/qiviqueryparser.g
@@ -91,8 +91,8 @@
 QT_BEGIN_NAMESPACE
 
 //TODO Find a better way of doing it, this is not reentrant
-QString* currentQuery = 0;
-unsigned int *currentOffset = 0;
+QString* currentQuery = nullptr;
+unsigned int *currentOffset = nullptr;
 void readQueryBuffer(char *buffer, unsigned int &numBytesRead,int maxBytesToRead)
 {
     if (!currentQuery) {
@@ -126,7 +126,7 @@ public:
 
 public:
     QIviQueryParser();
-    virtual ~QIviQueryParser();
+    ~QIviQueryParser();
 
     QIviAbstractQueryTerm *parse();
 
@@ -227,11 +227,11 @@ typedef int yy_size_t;
 
 QIviQueryParser::~QIviQueryParser()
 {
-    currentOffset = 0;
-    currentQuery = 0;
+    currentOffset = nullptr;
+    currentQuery = nullptr;
 
     //We need to reset the lexer to reinitialize it when needed
-    yy_init = 0;
+    yy_init = nullptr;
 
     //Get rid of the unused warning
     if (0)
@@ -266,8 +266,8 @@ void QIviQueryParser::handleConjunction(bool bangOperator)
     list.prepend(m_termStack.pop());
     list.prepend(m_termStack.pop());
 
-    QIviConjunctionTerm *conjunction1 = 0;
-    QIviConjunctionTerm *conjunction2 = 0;
+    QIviConjunctionTerm *conjunction1 = nullptr;
+    QIviConjunctionTerm *conjunction2 = nullptr;
     int i = 0;
     for (QIviAbstractQueryTerm *term : list) {
         if (term->type() == QIviAbstractQueryTerm::ConjunctionTerm) {
diff --git a/src/ivicore/queryparser/qiviqueryterm.h b/src/ivicore/queryparser/qiviqueryterm.h
index 14f837c..902a823 100644
--- a/src/ivicore/queryparser/qiviqueryterm.h
+++ b/src/ivicore/queryparser/qiviqueryterm.h
@@ -74,11 +74,11 @@ public:
         Or
     };
 
-    QIviConjunctionTerm();
-    virtual ~QIviConjunctionTerm();
+    explicit QIviConjunctionTerm();
+    ~QIviConjunctionTerm();
 
-    QIviAbstractQueryTerm::Type type() const Q_DECL_OVERRIDE;
-    QString toString() const Q_DECL_OVERRIDE;
+    QIviAbstractQueryTerm::Type type() const override;
+    QString toString() const override;
     Conjunction conjunction() const;
     QList<QIviAbstractQueryTerm*> terms() const;
 
@@ -95,10 +95,10 @@ class Q_QTIVICORE_EXPORT QIviScopeTerm : public QIviAbstractQueryTerm
 public:
 
     explicit QIviScopeTerm();
-    virtual ~QIviScopeTerm();
+    ~QIviScopeTerm();
 
-    QIviAbstractQueryTerm::Type type() const Q_DECL_OVERRIDE;
-    QString toString() const Q_DECL_OVERRIDE;
+    QIviAbstractQueryTerm::Type type() const override;
+    QString toString() const override;
     bool isNegated() const;
     QIviAbstractQueryTerm* term() const;
 
@@ -124,10 +124,10 @@ public:
     };
 
     explicit QIviFilterTerm();
-    virtual ~QIviFilterTerm();
+    ~QIviFilterTerm();
 
-    QIviAbstractQueryTerm::Type type() const Q_DECL_OVERRIDE;
-    QString toString() const Q_DECL_OVERRIDE;
+    QIviAbstractQueryTerm::Type type() const override;
+    QString toString() const override;
     Operator operatorType() const;
     QVariant value() const;
     QString propertyName() const;
diff --git a/src/ivimedia/qiviamfmtuner.cpp b/src/ivimedia/qiviamfmtuner.cpp
index 9487f3a..8968089 100644
--- a/src/ivimedia/qiviamfmtuner.cpp
+++ b/src/ivimedia/qiviamfmtuner.cpp
@@ -44,6 +44,8 @@
 #include <QtIviCore/QIviServiceObject>
 #include <QtDebug>
 
+QT_BEGIN_NAMESPACE
+
 QIviAmFmTunerPrivate::QIviAmFmTunerPrivate(const QString &interface, QIviAmFmTuner *parent)
     : QIviAbstractFeaturePrivate(interface, parent)
     , q_ptr(parent)
@@ -564,4 +566,6 @@ void QIviAmFmTuner::clearServiceObject()
     \sa startScan stopScan scanRunning scanStarted
 */
 
+QT_END_NAMESPACE
+
 #include "moc_qiviamfmtuner.cpp"
diff --git a/src/ivimedia/qiviamfmtuner.h b/src/ivimedia/qiviamfmtuner.h
index 0322ff9..0667e7a 100644
--- a/src/ivimedia/qiviamfmtuner.h
+++ b/src/ivimedia/qiviamfmtuner.h
@@ -64,7 +64,7 @@ class Q_QTIVIMEDIA_EXPORT QIviAmFmTuner : public QIviAbstractFeature
     Q_PROPERTY(bool scanRunning READ isScanRunning NOTIFY scanRunningChanged)
 
 public:
-    explicit QIviAmFmTuner(QObject *parent = Q_NULLPTR);
+    explicit QIviAmFmTuner(QObject *parent = nullptr);
 
     enum Band {
         AMBand,
@@ -105,10 +105,10 @@ Q_SIGNALS:
     void scanStopped();
 
 protected:
-    QIviAmFmTuner(QIviAmFmTunerPrivate &dd, QObject *parent = Q_NULLPTR);
+    QIviAmFmTuner(QIviAmFmTunerPrivate &dd, QObject *parent = nullptr);
 
-    virtual void connectToServiceObject(QIviServiceObject *serviceObject) Q_DECL_OVERRIDE;
-    virtual void clearServiceObject() Q_DECL_OVERRIDE;
+    virtual void connectToServiceObject(QIviServiceObject *serviceObject) override;
+    virtual void clearServiceObject() override;
 
 private:
     Q_DECLARE_PRIVATE(QIviAmFmTuner)
diff --git a/src/ivimedia/qiviamfmtunerbackendinterface.cpp b/src/ivimedia/qiviamfmtunerbackendinterface.cpp
index 8b77f18..54e32ff 100644
--- a/src/ivimedia/qiviamfmtunerbackendinterface.cpp
+++ b/src/ivimedia/qiviamfmtunerbackendinterface.cpp
@@ -41,6 +41,8 @@
 
 #include "qiviamfmtunerbackendinterface.h"
 
+QT_BEGIN_NAMESPACE
+
 /*!
     \class QIviAmFmTunerBackendInterface
     \inmodule QtIviMedia
@@ -193,3 +195,5 @@ QIviAmFmTunerBackendInterface::QIviAmFmTunerBackendInterface(QObject *parent)
 
     \sa startScan() stopScan()
 */
+
+QT_END_NAMESPACE
diff --git a/src/ivimedia/qiviamfmtunerbackendinterface.h b/src/ivimedia/qiviamfmtunerbackendinterface.h
index 6c8c2cc..d8ca8cb 100644
--- a/src/ivimedia/qiviamfmtunerbackendinterface.h
+++ b/src/ivimedia/qiviamfmtunerbackendinterface.h
@@ -55,7 +55,7 @@ class Q_QTIVIMEDIA_EXPORT QIviAmFmTunerBackendInterface : public QIviFeatureInte
     Q_OBJECT
 
 public:
-    explicit QIviAmFmTunerBackendInterface(QObject *parent = Q_NULLPTR);
+    explicit QIviAmFmTunerBackendInterface(QObject *parent = nullptr);
 
     virtual void setFrequency(int frequency) = 0;
     virtual void setBand(QIviAmFmTuner::Band band) = 0;
diff --git a/src/ivimedia/qivimediadevice.cpp b/src/ivimedia/qivimediadevice.cpp
index f7896be..3ddca4f 100644
--- a/src/ivimedia/qivimediadevice.cpp
+++ b/src/ivimedia/qivimediadevice.cpp
@@ -41,6 +41,8 @@
 
 #include "qivimediadevice.h"
 
+QT_BEGIN_NAMESPACE
+
 /*!
     \class QIviMediaDevice
     \inmodule QtIviMedia
@@ -162,3 +164,5 @@ QString QIviMediaUsbDevice::type() const
 
     Ejects the USB media device and makes sure all data is written to the thumb-drive so it can safely be removed.
 */
+
+QT_END_NAMESPACE
diff --git a/src/ivimedia/qivimediadevice.h b/src/ivimedia/qivimediadevice.h
index 42a8c08..266c548 100644
--- a/src/ivimedia/qivimediadevice.h
+++ b/src/ivimedia/qivimediadevice.h
@@ -55,7 +55,7 @@ class Q_QTIVIMEDIA_EXPORT QIviMediaDevice : public QIviServiceObject
     Q_PROPERTY(QString name READ name NOTIFY nameChanged)
 
 public:
-    explicit QIviMediaDevice(QObject *parent = Q_NULLPTR);
+    explicit QIviMediaDevice(QObject *parent = nullptr);
     virtual QString type() const = 0;
     virtual QString name() const = 0;
 
@@ -68,9 +68,9 @@ class Q_QTIVIMEDIA_EXPORT QIviMediaUsbDevice : public QIviMediaDevice
     Q_OBJECT
 
 public:
-    explicit QIviMediaUsbDevice(QObject *parent = Q_NULLPTR);
+    explicit QIviMediaUsbDevice(QObject *parent = nullptr);
 
-    virtual QString type() const Q_DECL_OVERRIDE;
+    virtual QString type() const override;
 
     //TODO add a signal to indicate that the stick can be removed now.
 public Q_SLOTS:
diff --git a/src/ivimedia/qivimediadevicediscoverymodel.cpp b/src/ivimedia/qivimediadevicediscoverymodel.cpp
index ba6582c..7ffb950 100644
--- a/src/ivimedia/qivimediadevicediscoverymodel.cpp
+++ b/src/ivimedia/qivimediadevicediscoverymodel.cpp
@@ -46,6 +46,8 @@
 #include <QtIviMedia/QIviMediaDevice>
 #include <QtDebug>
 
+QT_BEGIN_NAMESPACE
+
 QIviMediaDeviceDiscoveryModelPrivate::QIviMediaDeviceDiscoveryModelPrivate(const QString &interface, QIviMediaDeviceDiscoveryModel *parent)
     : QIviAbstractFeatureListModelPrivate(interface, parent)
     , q_ptr(parent)
@@ -360,4 +362,6 @@ void QIviMediaDeviceDiscoveryModel::clearServiceObject()
     Afterwards the device will be deleted.
 */
 
+QT_END_NAMESPACE
+
 #include "moc_qivimediadevicediscoverymodel.cpp"
diff --git a/src/ivimedia/qivimediadevicediscoverymodel.h b/src/ivimedia/qivimediadevicediscoverymodel.h
index af54088..cecd649 100644
--- a/src/ivimedia/qivimediadevicediscoverymodel.h
+++ b/src/ivimedia/qivimediadevicediscoverymodel.h
@@ -64,14 +64,14 @@ public:
         ServiceObjectRole = Qt::UserRole + 1
     };
 
-    explicit QIviMediaDeviceDiscoveryModel(QObject *parent = Q_NULLPTR);
+    explicit QIviMediaDeviceDiscoveryModel(QObject *parent = nullptr);
 
-    int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
-    virtual QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    virtual QVariant data(const QModelIndex &index, int role) const override;
     Q_INVOKABLE QIviMediaDevice *get(int i) const;
     QIviMediaDevice *at(int i) const;
 
-    virtual QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE;
+    virtual QHash<int, QByteArray> roleNames() const override;
 
 Q_SIGNALS:
     void countChanged();
@@ -79,10 +79,10 @@ Q_SIGNALS:
     void deviceRemoved(QIviMediaDevice *device);
 
 protected:
-    QIviMediaDeviceDiscoveryModel(QIviMediaDeviceDiscoveryModelPrivate &dd, QObject *parent = Q_NULLPTR);
+    QIviMediaDeviceDiscoveryModel(QIviMediaDeviceDiscoveryModelPrivate &dd, QObject *parent = nullptr);
 
-    virtual void connectToServiceObject(QIviServiceObject *serviceObject) Q_DECL_OVERRIDE;
-    virtual void clearServiceObject() Q_DECL_OVERRIDE;
+    virtual void connectToServiceObject(QIviServiceObject *serviceObject) override;
+    virtual void clearServiceObject() override;
 
 private:
     Q_DECLARE_PRIVATE(QIviMediaDeviceDiscoveryModel)
diff --git a/src/ivimedia/qivimediadevicediscoverymodel_p.h b/src/ivimedia/qivimediadevicediscoverymodel_p.h
index 892fa8b..d52e364 100644
--- a/src/ivimedia/qivimediadevicediscoverymodel_p.h
+++ b/src/ivimedia/qivimediadevicediscoverymodel_p.h
@@ -66,7 +66,7 @@ class QIviMediaDeviceDiscoveryModelPrivate : public QIviAbstractFeatureListModel
 public:
     QIviMediaDeviceDiscoveryModelPrivate(const QString &interface, QIviMediaDeviceDiscoveryModel *parent);
 
-    virtual void initialize() Q_DECL_OVERRIDE;
+    virtual void initialize() override;
     void clearToDefaults();
     void resetModel(const QList<QIviServiceObject *> deviceList);
     void onDeviceAdded(QIviServiceObject *device);
diff --git a/src/ivimedia/qivimediadevicediscoverymodelbackendinterface.cpp b/src/ivimedia/qivimediadevicediscoverymodelbackendinterface.cpp
index a7545fd..439d6c4 100644
--- a/src/ivimedia/qivimediadevicediscoverymodelbackendinterface.cpp
+++ b/src/ivimedia/qivimediadevicediscoverymodelbackendinterface.cpp
@@ -41,6 +41,8 @@
 
 #include "qivimediadevicediscoverymodelbackendinterface.h"
 
+QT_BEGIN_NAMESPACE
+
 /*!
     \class QIviMediaDeviceDiscoveryModelBackendInterface
     \inmodule QtIviMedia
@@ -103,3 +105,5 @@ QIviMediaDeviceDiscoveryModelBackendInterface::QIviMediaDeviceDiscoveryModelBack
 
     This signal is emitted when a \a device has been removed from the system and cannot be used anymore.
 */
+
+QT_END_NAMESPACE
diff --git a/src/ivimedia/qivimediadevicediscoverymodelbackendinterface.h b/src/ivimedia/qivimediadevicediscoverymodelbackendinterface.h
index 77fc118..96b92c5 100644
--- a/src/ivimedia/qivimediadevicediscoverymodelbackendinterface.h
+++ b/src/ivimedia/qivimediadevicediscoverymodelbackendinterface.h
@@ -52,7 +52,7 @@ class Q_QTIVIMEDIA_EXPORT QIviMediaDeviceDiscoveryModelBackendInterface : public
 {
     Q_OBJECT
 public:
-    explicit QIviMediaDeviceDiscoveryModelBackendInterface(QObject *parent = Q_NULLPTR);
+    explicit QIviMediaDeviceDiscoveryModelBackendInterface(QObject *parent = nullptr);
 
     virtual void initialize() = 0;
 
diff --git a/src/ivimedia/qivimediaindexercontrol.cpp b/src/ivimedia/qivimediaindexercontrol.cpp
index 64206c1..5d4828c 100644
--- a/src/ivimedia/qivimediaindexercontrol.cpp
+++ b/src/ivimedia/qivimediaindexercontrol.cpp
@@ -45,6 +45,8 @@
 #include <QIviServiceObject>
 #include <QtDebug>
 
+QT_BEGIN_NAMESPACE
+
 QIviMediaIndexerControlPrivate::QIviMediaIndexerControlPrivate(const QString &interface, QIviMediaIndexerControl *parent)
     : QIviAbstractFeaturePrivate(interface, parent)
     , q_ptr(parent)
@@ -263,4 +265,6 @@ void QIviMediaIndexerControl::clearServiceObject()
     d->clearToDefaults();
 }
 
+QT_END_NAMESPACE
+
 #include "moc_qivimediaindexercontrol.cpp"
diff --git a/src/ivimedia/qivimediaindexercontrol.h b/src/ivimedia/qivimediaindexercontrol.h
index 93f736d..bb99c0c 100644
--- a/src/ivimedia/qivimediaindexercontrol.h
+++ b/src/ivimedia/qivimediaindexercontrol.h
@@ -65,7 +65,7 @@ public:
     };
     Q_ENUM(State)
 
-    explicit QIviMediaIndexerControl(QObject *parent = Q_NULLPTR);
+    explicit QIviMediaIndexerControl(QObject *parent = nullptr);
 
     qreal progress() const;
     QIviMediaIndexerControl::State state() const;
@@ -79,10 +79,10 @@ Q_SIGNALS:
     void stateChanged(QIviMediaIndexerControl::State state);
 
 protected:
-    QIviMediaIndexerControl(QIviMediaIndexerControlPrivate &dd, QObject *parent = Q_NULLPTR);
+    QIviMediaIndexerControl(QIviMediaIndexerControlPrivate &dd, QObject *parent = nullptr);
 
-    virtual void connectToServiceObject(QIviServiceObject *serviceObject) Q_DECL_OVERRIDE;
-    virtual void clearServiceObject() Q_DECL_OVERRIDE;
+    virtual void connectToServiceObject(QIviServiceObject *serviceObject) override;
+    virtual void clearServiceObject() override;
 
 private:
     Q_DECLARE_PRIVATE(QIviMediaIndexerControl)
diff --git a/src/ivimedia/qivimediaindexercontrolbackendinterface.cpp b/src/ivimedia/qivimediaindexercontrolbackendinterface.cpp
index 9441858..fca7050 100644
--- a/src/ivimedia/qivimediaindexercontrolbackendinterface.cpp
+++ b/src/ivimedia/qivimediaindexercontrolbackendinterface.cpp
@@ -41,6 +41,8 @@
 
 #include "qivimediaindexercontrolbackendinterface.h"
 
+QT_BEGIN_NAMESPACE
+
 /*!
     \class QIviMediaIndexerControlBackendInterface
     \inmodule QtIviMedia
@@ -107,3 +109,5 @@ QIviMediaIndexerControlBackendInterface::QIviMediaIndexerControlBackendInterface
     This signal is emitted whenever the indexing state changed. The \a state argument holds the new state
     of the indexer.
 */
+
+QT_END_NAMESPACE
diff --git a/src/ivimedia/qivimediaindexercontrolbackendinterface.h b/src/ivimedia/qivimediaindexercontrolbackendinterface.h
index 75aee4c..b261a7c 100644
--- a/src/ivimedia/qivimediaindexercontrolbackendinterface.h
+++ b/src/ivimedia/qivimediaindexercontrolbackendinterface.h
@@ -52,7 +52,7 @@ class Q_QTIVIMEDIA_EXPORT QIviMediaIndexerControlBackendInterface : public QIviF
 {
     Q_OBJECT
 public:
-    explicit QIviMediaIndexerControlBackendInterface(QObject *parent = Q_NULLPTR);
+    explicit QIviMediaIndexerControlBackendInterface(QObject *parent = nullptr);
 
     virtual void initialize() = 0;
     virtual void pause() = 0;
diff --git a/src/ivimedia/qivimediaplayer.cpp b/src/ivimedia/qivimediaplayer.cpp
index 3575801..6c82562 100644
--- a/src/ivimedia/qivimediaplayer.cpp
+++ b/src/ivimedia/qivimediaplayer.cpp
@@ -47,13 +47,15 @@
 #include <QtIviCore/QIviServiceObject>
 #include <QtDebug>
 
+QT_BEGIN_NAMESPACE
+
 QIviMediaPlayerPrivate::QIviMediaPlayerPrivate(const QString &interface, QIviMediaPlayer *parent)
     : QIviAbstractFeaturePrivate(interface, parent)
     , q_ptr(parent)
     , m_playQueue(nullptr)
     , m_playMode(QIviMediaPlayer::Normal)
     , m_playState(QIviMediaPlayer::Stopped)
-    , m_currentTrack(0)
+    , m_currentTrack(nullptr)
     , m_position(-1)
     , m_duration(-1)
 {
@@ -531,4 +533,6 @@ void QIviMediaPlayer::clearServiceObject()
     d->clearToDefaults();
 }
 
+QT_END_NAMESPACE
+
 #include "moc_qivimediaplayer.cpp"
diff --git a/src/ivimedia/qivimediaplayer.h b/src/ivimedia/qivimediaplayer.h
index 6ecd12a..7f32e05 100644
--- a/src/ivimedia/qivimediaplayer.h
+++ b/src/ivimedia/qivimediaplayer.h
@@ -79,7 +79,7 @@ public:
     };
     Q_ENUM(PlayState)
 
-    explicit QIviMediaPlayer(QObject *parent = Q_NULLPTR);
+    explicit QIviMediaPlayer(QObject *parent = nullptr);
 
     QIviPlayQueue *playQueue() const;
     PlayMode playMode() const;
@@ -106,10 +106,10 @@ Q_SIGNALS:
     void durationChanged(qint64 duration);
 
 protected:
-    QIviMediaPlayer(QIviMediaPlayerPrivate &dd, QObject *parent = Q_NULLPTR);
+    QIviMediaPlayer(QIviMediaPlayerPrivate &dd, QObject *parent = nullptr);
 
-    virtual void connectToServiceObject(QIviServiceObject *serviceObject) Q_DECL_OVERRIDE;
-    virtual void clearServiceObject() Q_DECL_OVERRIDE;
+    virtual void connectToServiceObject(QIviServiceObject *serviceObject) override;
+    virtual void clearServiceObject() override;
 
 private:
     Q_DECLARE_PRIVATE(QIviMediaPlayer)
diff --git a/src/ivimedia/qivimediaplayer_p.h b/src/ivimedia/qivimediaplayer_p.h
index 0053d1d..619ec95 100644
--- a/src/ivimedia/qivimediaplayer_p.h
+++ b/src/ivimedia/qivimediaplayer_p.h
@@ -66,7 +66,7 @@ class QIviMediaPlayerPrivate : public QIviAbstractFeaturePrivate
 public:
     QIviMediaPlayerPrivate(const QString &interface, QIviMediaPlayer *parent);
 
-    virtual void initialize() Q_DECL_OVERRIDE;
+    virtual void initialize() override;
     void clearToDefaults();
     void onPlayModeChanged(QIviMediaPlayer::PlayMode playMode);
     void onPlayStateChanged(QIviMediaPlayer::PlayState playState);
diff --git a/src/ivimedia/qivimediaplayerbackendinterface.cpp b/src/ivimedia/qivimediaplayerbackendinterface.cpp
index 0567e91..d9f7320 100644
--- a/src/ivimedia/qivimediaplayerbackendinterface.cpp
+++ b/src/ivimedia/qivimediaplayerbackendinterface.cpp
@@ -41,6 +41,8 @@
 
 #include "qivimediaplayerbackendinterface.h"
 
+QT_BEGIN_NAMESPACE
+
 /*!
     \class QIviMediaPlayerBackendInterface
     \inmodule QtIviMedia
@@ -268,3 +270,5 @@ QIviMediaPlayerBackendInterface::QIviMediaPlayerBackendInterface(QObject *parent
 
     \sa insert() remove() move()
 */
+
+QT_END_NAMESPACE
diff --git a/src/ivimedia/qivimediaplayerbackendinterface.h b/src/ivimedia/qivimediaplayerbackendinterface.h
index d7d83ce..8ad42aa 100644
--- a/src/ivimedia/qivimediaplayerbackendinterface.h
+++ b/src/ivimedia/qivimediaplayerbackendinterface.h
@@ -55,7 +55,7 @@ class Q_QTIVIMEDIA_EXPORT QIviMediaPlayerBackendInterface : public QIviFeatureIn
     Q_OBJECT
 
 public:
-    explicit QIviMediaPlayerBackendInterface(QObject *parent = Q_NULLPTR);
+    explicit QIviMediaPlayerBackendInterface(QObject *parent = nullptr);
 
     virtual void play() = 0;
     virtual void pause() = 0;
diff --git a/src/ivimedia/qiviplayableitem.cpp b/src/ivimedia/qiviplayableitem.cpp
index 91c8a31..8f6cd62 100644
--- a/src/ivimedia/qiviplayableitem.cpp
+++ b/src/ivimedia/qiviplayableitem.cpp
@@ -91,8 +91,6 @@ public:
     int m_rating;
 };
 
-QT_END_NAMESPACE
-
 /*!
     \class QIviPlayableItem
     \inmodule QtIviMedia
@@ -474,3 +472,5 @@ bool QIviAudioTrackItem::operator==(const QIviAudioTrackItem &other)
 
     \sa operator==()
 */
+
+QT_END_NAMESPACE
diff --git a/src/ivimedia/qiviplayableitem.h b/src/ivimedia/qiviplayableitem.h
index ad70cb7..aadb0c9 100644
--- a/src/ivimedia/qiviplayableitem.h
+++ b/src/ivimedia/qiviplayableitem.h
@@ -59,14 +59,14 @@ class Q_QTIVIMEDIA_EXPORT QIviPlayableItem : public QIviSearchAndBrowseModelItem
     Q_PROPERTY(QUrl url READ url WRITE setUrl)
 
 public:
-    QIviPlayableItem();
-    QIviPlayableItem(const QIviPlayableItem &);
+    explicit QIviPlayableItem();
+    explicit QIviPlayableItem(const QIviPlayableItem &);
     QIviPlayableItem &operator=(const QIviPlayableItem &);
-    virtual ~QIviPlayableItem();
+    ~QIviPlayableItem();
 
     virtual QUrl url() const;
     virtual void setUrl(const QUrl &url);
-    virtual QString type() const Q_DECL_OVERRIDE;
+    virtual QString type() const override;
 
     bool operator==(const QIviPlayableItem &other);
     inline bool operator!=(const QIviPlayableItem &other) { return !(*this == other); }
@@ -94,7 +94,7 @@ public:
     QIviAudioTrackItem();
     QIviAudioTrackItem(const QIviAudioTrackItem &);
     QIviAudioTrackItem &operator=(const QIviAudioTrackItem &);
-    virtual ~QIviAudioTrackItem();
+    ~QIviAudioTrackItem();
 
     virtual QString title();
     virtual void setTitle(const QString &title);
@@ -114,8 +114,8 @@ public:
     virtual void setCoverArtUrl(const QUrl &url);
     virtual int rating();
     virtual void setRating(int rating);
-    virtual QString name() const Q_DECL_OVERRIDE;
-    virtual QString type() const Q_DECL_OVERRIDE;
+    virtual QString name() const override;
+    virtual QString type() const override;
 
     bool operator==(const QIviAudioTrackItem &other);
     inline bool operator!=(const QIviAudioTrackItem &other) { return !(*this == other); }
diff --git a/src/ivimedia/qiviplayqueue.cpp b/src/ivimedia/qiviplayqueue.cpp
index a6cbbb6..a96ae29 100644
--- a/src/ivimedia/qiviplayqueue.cpp
+++ b/src/ivimedia/qiviplayqueue.cpp
@@ -46,6 +46,8 @@
 
 #include <QtDebug>
 
+QT_BEGIN_NAMESPACE
+
 QIviPlayQueuePrivate::QIviPlayQueuePrivate(QIviMediaPlayer *player, QIviPlayQueue *model)
     : QAbstractItemModelPrivate()
     , q_ptr(model)
@@ -624,4 +626,6 @@ QIviPlayQueue::QIviPlayQueue(QIviMediaPlayer *parent)
     This signal is emitted whenever the fetchMoreThreshold is reached and new data is requested from the backend.
 */
 
+QT_END_NAMESPACE
+
 #include "moc_qiviplayqueue.cpp"
diff --git a/src/ivimedia/qiviplayqueue.h b/src/ivimedia/qiviplayqueue.h
index 0600437..db20745 100644
--- a/src/ivimedia/qiviplayqueue.h
+++ b/src/ivimedia/qiviplayqueue.h
@@ -89,13 +89,13 @@ public:
     QIviPlayQueue::LoadingType loadingType() const;
     void setLoadingType(QIviPlayQueue::LoadingType loadingType);
 
-    int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
-    QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    QVariant data(const QModelIndex &index, int role) const override;
 
-    bool canFetchMore(const QModelIndex &parent) const Q_DECL_OVERRIDE;
-    void fetchMore(const QModelIndex &parent) Q_DECL_OVERRIDE;
+    bool canFetchMore(const QModelIndex &parent) const override;
+    void fetchMore(const QModelIndex &parent) override;
 
-    QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE;
+    QHash<int, QByteArray> roleNames() const override;
 
     Q_INVOKABLE QVariant get(int index) const;
 
@@ -117,7 +117,7 @@ Q_SIGNALS:
     void currentIndexChanged(int currentIndex);
 
 protected:
-    explicit QIviPlayQueue(QIviMediaPlayer *parent = Q_NULLPTR);
+    explicit QIviPlayQueue(QIviMediaPlayer *parent = nullptr);
 
 private:
     Q_DECLARE_PRIVATE(QIviPlayQueue)
diff --git a/src/ivimedia/qivitunerstation.cpp b/src/ivimedia/qivitunerstation.cpp
index 9a22305..9898e3c 100644
--- a/src/ivimedia/qivitunerstation.cpp
+++ b/src/ivimedia/qivitunerstation.cpp
@@ -84,8 +84,6 @@ public:
     QIviAmFmTuner::Band m_band;
 };
 
-QT_END_NAMESPACE
-
 /*!
     \class QIviTunerStation
     \inmodule QtIviMedia
@@ -414,3 +412,5 @@ bool QIviAmFmTunerStation::operator==(const QIviAmFmTunerStation &other)
 
     \sa operator==()
 */
+
+QT_END_NAMESPACE
diff --git a/src/ivimedia/qivitunerstation.h b/src/ivimedia/qivitunerstation.h
index ea29dfb..1e028fb 100644
--- a/src/ivimedia/qivitunerstation.h
+++ b/src/ivimedia/qivitunerstation.h
@@ -66,7 +66,7 @@ public:
     QIviTunerStation();
     QIviTunerStation(const QIviTunerStation &);
     QIviTunerStation &operator=(const QIviTunerStation &);
-    virtual ~QIviTunerStation();
+    ~QIviTunerStation();
 
     virtual QString stationName() const;
     virtual void setStationName(const QString &stationName);
@@ -80,8 +80,8 @@ public:
     void setRadioText(QString radioText);
     int receptionQuality() const;
     void setReceptionQuality(int receptionQuality);
-    virtual QString name() const Q_DECL_OVERRIDE;
-    virtual QString type() const Q_DECL_OVERRIDE;
+    virtual QString name() const override;
+    virtual QString type() const override;
 
     bool operator==(const QIviTunerStation &other);
     inline bool operator!=(const QIviTunerStation &other) { return !(*this == other); }
@@ -105,7 +105,7 @@ public:
 
     virtual QIviAmFmTuner::Band band() const;
     virtual void setBand(QIviAmFmTuner::Band band);
-    virtual QString type() const Q_DECL_OVERRIDE;
+    virtual QString type() const override;
 
     bool operator==(const QIviAmFmTunerStation &other);
     inline bool operator!=(const QIviAmFmTunerStation &other) { return !(*this == other); }
diff --git a/src/ivivehiclefunctions/qiviclimatecontrol.cpp b/src/ivivehiclefunctions/qiviclimatecontrol.cpp
index c3204a1..f079b17 100644
--- a/src/ivivehiclefunctions/qiviclimatecontrol.cpp
+++ b/src/ivivehiclefunctions/qiviclimatecontrol.cpp
@@ -45,6 +45,8 @@
 #include <QtIviCore/QIviServiceObject>
 #include <QtIviCore/QIviPropertyFactory>
 
+QT_BEGIN_NAMESPACE
+
 QIviClimateControlPrivate::QIviClimateControlPrivate(const QString &interface, const QString &zone, QIviClimateControl *parent)
     : QIviAbstractZonedFeaturePrivate(interface, zone, parent)
     , m_airflowDirections(0)
@@ -1840,4 +1842,6 @@ void QIviClimateControl::setAutomaticClimateFanIntensityLevel(int value)
  * \sa automaticClimateFanIntensityLevelAttribute() automaticClimateFanIntensityLevel()
  */
 
- #include "moc_qiviclimatecontrol.cpp"
+QT_END_NAMESPACE
+
+#include "moc_qiviclimatecontrol.cpp"
diff --git a/src/ivivehiclefunctions/qiviclimatecontrol.h b/src/ivivehiclefunctions/qiviclimatecontrol.h
index 2faf2ce..316cdee 100644
--- a/src/ivivehiclefunctions/qiviclimatecontrol.h
+++ b/src/ivivehiclefunctions/qiviclimatecontrol.h
@@ -94,7 +94,7 @@ public:
     };
     Q_ENUM(ClimateMode)
 
-    QIviClimateControl(const QString &zone = QString(), QObject *parent = Q_NULLPTR);
+    QIviClimateControl(const QString &zone = QString(), QObject *parent = nullptr);
     ~QIviClimateControl();
 
     bool isAirConditioningEnabled() const;
@@ -197,11 +197,11 @@ Q_SIGNALS:
     void automaticClimateFanIntensityLevelAttributeChanged(const QIviPropertyAttribute<int> &attribute);
 
 protected:
-    QIviClimateControl(QIviClimateControlPrivate &dd, QObject *parent = Q_NULLPTR);
-    virtual QIviAbstractZonedFeature *createZoneFeature(const QString &zone) Q_DECL_OVERRIDE;
+    QIviClimateControl(QIviClimateControlPrivate &dd, QObject *parent = nullptr);
+    virtual QIviAbstractZonedFeature *createZoneFeature(const QString &zone) override;
 
-    virtual void connectToServiceObject(QIviServiceObject *serviceObject) Q_DECL_OVERRIDE;
-    virtual void clearServiceObject() Q_DECL_OVERRIDE;
+    virtual void connectToServiceObject(QIviServiceObject *serviceObject) override;
+    virtual void clearServiceObject() override;
 
 private:
     Q_DECLARE_PRIVATE(QIviClimateControl)
diff --git a/src/ivivehiclefunctions/qiviclimatecontrol_p.h b/src/ivivehiclefunctions/qiviclimatecontrol_p.h
index 38502a0..104867a 100644
--- a/src/ivivehiclefunctions/qiviclimatecontrol_p.h
+++ b/src/ivivehiclefunctions/qiviclimatecontrol_p.h
@@ -66,7 +66,7 @@ class QIviClimateControlPrivate : public QIviAbstractZonedFeaturePrivate
 public:
     QIviClimateControlPrivate(const QString &interface, const QString &zone, QIviClimateControl *parent);
 
-    virtual void initialize() Q_DECL_OVERRIDE;
+    virtual void initialize() override;
     void clearToDefaults();
 
     void onAirflowDirectionsChanged(QIviClimateControl::AirflowDirections value, const QString &zone);
diff --git a/src/ivivehiclefunctions/qiviclimatecontrolbackendinterface.cpp b/src/ivivehiclefunctions/qiviclimatecontrolbackendinterface.cpp
index f0c75d1..45292d6 100644
--- a/src/ivivehiclefunctions/qiviclimatecontrolbackendinterface.cpp
+++ b/src/ivivehiclefunctions/qiviclimatecontrolbackendinterface.cpp
@@ -41,6 +41,8 @@
 
 #include "qiviclimatecontrolbackendinterface.h"
 
+QT_BEGIN_NAMESPACE
+
 /*!
  * \class QIviClimateControlBackendInterface
  * \inmodule QtIviVehicleFunctions
@@ -59,7 +61,7 @@
  */
 
 /*!
- * \fn QIviClimateControlBackendInterface::QIviClimateControlBackendInterface(QObject *parent=0)
+ * \fn QIviClimateControlBackendInterface::QIviClimateControlBackendInterface(QObject *parent = nullptr)
  *
  * Constructs a backend interface.
  *
@@ -455,3 +457,5 @@ QIviClimateControlBackendInterface::QIviClimateControlBackendInterface(QObject *
  *
  * The signal is emitted when the fan intensity level for the AutomaticClimate mode for \a zone is changed to \a attribute.
  */
+
+QT_END_NAMESPACE
diff --git a/src/ivivehiclefunctions/qiviclimatecontrolbackendinterface.h b/src/ivivehiclefunctions/qiviclimatecontrolbackendinterface.h
index 96f8860..e9abe67 100644
--- a/src/ivivehiclefunctions/qiviclimatecontrolbackendinterface.h
+++ b/src/ivivehiclefunctions/qiviclimatecontrolbackendinterface.h
@@ -55,7 +55,7 @@ class Q_QTIVIVEHICLEFUNCTIONS_EXPORT QIviClimateControlBackendInterface : public
     Q_OBJECT
 
 public:
-    QIviClimateControlBackendInterface(QObject *parent = Q_NULLPTR);
+    QIviClimateControlBackendInterface(QObject *parent = nullptr);
 
     virtual void setTargetTemperature(int value, const QString &zone) = 0;
     virtual void setSeatCooler(int value, const QString &zone) = 0;
diff --git a/src/ivivehiclefunctions/qiviwindowcontrol.cpp b/src/ivivehiclefunctions/qiviwindowcontrol.cpp
index 18d52df..3a5b49c 100644
--- a/src/ivivehiclefunctions/qiviwindowcontrol.cpp
+++ b/src/ivivehiclefunctions/qiviwindowcontrol.cpp
@@ -45,6 +45,8 @@
 #include <QtIviCore/QIviPropertyFactory>
 #include <QtIviCore/QIviServiceObject>
 
+QT_BEGIN_NAMESPACE
+
 QIviWindowControlPrivate::QIviWindowControlPrivate(const QString &interface, const QString &zone, QIviWindowControl *parent)
     : QIviAbstractZonedFeaturePrivate(interface, zone, parent)
     , m_heaterMode(QIviWindowControl::HeaterOff)
@@ -744,6 +746,6 @@ void QIviWindowControl::close()
  * \sa stateAttribute() state()
  */
 
-
+QT_END_NAMESPACE
 
 #include "moc_qiviwindowcontrol.cpp"
diff --git a/src/ivivehiclefunctions/qiviwindowcontrol.h b/src/ivivehiclefunctions/qiviwindowcontrol.h
index bbe6337..c440035 100644
--- a/src/ivivehiclefunctions/qiviwindowcontrol.h
+++ b/src/ivivehiclefunctions/qiviwindowcontrol.h
@@ -84,7 +84,7 @@ public:
     };
     Q_ENUM(State)
 
-    QIviWindowControl(const QString &zone = QString(), QObject *parent = Q_NULLPTR);
+    QIviWindowControl(const QString &zone = QString(), QObject *parent = nullptr);
     ~QIviWindowControl();
 
     QIviWindowControl::HeaterMode heaterMode() const;
@@ -122,11 +122,11 @@ Q_SIGNALS:
     void stateAttributeChanged(const QIviPropertyAttribute<QIviWindowControl::State> &attribute);
 
 protected:
-    QIviWindowControl(QIviWindowControlPrivate &dd, QObject *parent = Q_NULLPTR);
-    virtual QIviAbstractZonedFeature *createZoneFeature(const QString &zone) Q_DECL_OVERRIDE;
+    QIviWindowControl(QIviWindowControlPrivate &dd, QObject *parent = nullptr);
+    virtual QIviAbstractZonedFeature *createZoneFeature(const QString &zone) override;
 
-    virtual void connectToServiceObject(QIviServiceObject *serviceObject) Q_DECL_OVERRIDE;
-    virtual void clearServiceObject() Q_DECL_OVERRIDE;
+    virtual void connectToServiceObject(QIviServiceObject *serviceObject) override;
+    virtual void clearServiceObject() override;
 
 private:
     Q_DECLARE_PRIVATE(QIviWindowControl)
diff --git a/src/ivivehiclefunctions/qiviwindowcontrol_p.h b/src/ivivehiclefunctions/qiviwindowcontrol_p.h
index 5ab15e5..67b9416 100644
--- a/src/ivivehiclefunctions/qiviwindowcontrol_p.h
+++ b/src/ivivehiclefunctions/qiviwindowcontrol_p.h
@@ -66,7 +66,7 @@ class QIviWindowControlPrivate : public QIviAbstractZonedFeaturePrivate
 public:
     QIviWindowControlPrivate(const QString &interface, const QString &zone, QIviWindowControl *parent);
 
-    virtual void initialize() Q_DECL_OVERRIDE;
+    virtual void initialize() override;
     void clearToDefaults();
 
     void onHeaterModeChanged(QIviWindowControl::HeaterMode heaterMode, const QString &zone);
diff --git a/src/ivivehiclefunctions/qiviwindowcontrolbackendinterface.cpp b/src/ivivehiclefunctions/qiviwindowcontrolbackendinterface.cpp
index 8ca7ab4..109fbf3 100644
--- a/src/ivivehiclefunctions/qiviwindowcontrolbackendinterface.cpp
+++ b/src/ivivehiclefunctions/qiviwindowcontrolbackendinterface.cpp
@@ -41,6 +41,8 @@
 
 #include "qiviwindowcontrolbackendinterface.h"
 
+QT_BEGIN_NAMESPACE
+
 /*!
  * \class QIviWindowControlBackendInterface
  * \inmodule QtIviVehicleFunctions
@@ -59,7 +61,7 @@
  */
 
 /*!
- * \fn QIviWindowControlBackendInterface::QIviWindowControlBackendInterface(QObject *parent=0)
+ * \fn QIviWindowControlBackendInterface::QIviWindowControlBackendInterface(QObject *parent = nullptr)
  *
  * Constructs a backend interface.
  *
@@ -173,3 +175,5 @@ QIviWindowControlBackendInterface::QIviWindowControlBackendInterface(QObject *pa
  *
  * The signal is emitted when the state attribute for \a zone is changed to \a attribute.
  */
+
+QT_END_NAMESPACE
diff --git a/src/ivivehiclefunctions/qiviwindowcontrolbackendinterface.h b/src/ivivehiclefunctions/qiviwindowcontrolbackendinterface.h
index f5b8c01..0f17244 100644
--- a/src/ivivehiclefunctions/qiviwindowcontrolbackendinterface.h
+++ b/src/ivivehiclefunctions/qiviwindowcontrolbackendinterface.h
@@ -55,7 +55,7 @@ class Q_QTIVIVEHICLEFUNCTIONS_EXPORT QIviWindowControlBackendInterface : public
     Q_OBJECT
 
 public:
-    QIviWindowControlBackendInterface(QObject *parent = Q_NULLPTR);
+    QIviWindowControlBackendInterface(QObject *parent = nullptr);
 
     virtual void setHeaterMode(QIviWindowControl::HeaterMode value, const QString &zone) = 0;
     virtual void setBlindMode(QIviWindowControl::BlindMode value, const QString &zone) = 0;
diff --git a/src/plugins/ivimedia/media_simulator/mediadiscoverybackend.h b/src/plugins/ivimedia/media_simulator/mediadiscoverybackend.h
index 9dbf2d6..1603bae 100644
--- a/src/plugins/ivimedia/media_simulator/mediadiscoverybackend.h
+++ b/src/plugins/ivimedia/media_simulator/mediadiscoverybackend.h
@@ -52,9 +52,9 @@ class MediaDiscoveryBackend : public QIviMediaDeviceDiscoveryModelBackendInterfa
     Q_OBJECT
 
 public:
-    MediaDiscoveryBackend(QObject *parent = 0);
+    MediaDiscoveryBackend(QObject *parent = nullptr);
 
-    void initialize() Q_DECL_OVERRIDE;
+    void initialize() override;
 
 private slots:
     void onDirectoryChanged(const QString &path);
diff --git a/src/plugins/ivimedia/media_simulator/mediaindexerbackend.h b/src/plugins/ivimedia/media_simulator/mediaindexerbackend.h
index 23a759a..0708098 100644
--- a/src/plugins/ivimedia/media_simulator/mediaindexerbackend.h
+++ b/src/plugins/ivimedia/media_simulator/mediaindexerbackend.h
@@ -53,11 +53,11 @@ class MediaIndexerBackend : public QIviMediaIndexerControlBackendInterface
 {
     Q_OBJECT
 public:
-    explicit MediaIndexerBackend(const QSqlDatabase &database, QObject *parent = 0);
+    explicit MediaIndexerBackend(const QSqlDatabase &database, QObject *parent = nullptr);
 
-    virtual void initialize() Q_DECL_OVERRIDE;
-    virtual void pause() Q_DECL_OVERRIDE;
-    virtual void resume() Q_DECL_OVERRIDE;
+    virtual void initialize() override;
+    virtual void pause() override;
+    virtual void resume() override;
 
 signals:
     void indexingDone();
diff --git a/src/plugins/ivimedia/media_simulator/mediaplayerbackend.h b/src/plugins/ivimedia/media_simulator/mediaplayerbackend.h
index 3d354d9..054f9c4 100644
--- a/src/plugins/ivimedia/media_simulator/mediaplayerbackend.h
+++ b/src/plugins/ivimedia/media_simulator/mediaplayerbackend.h
@@ -64,25 +64,25 @@ public:
     };
     Q_ENUM(OperationType)
 
-    MediaPlayerBackend(const QSqlDatabase &database, QObject *parent = Q_NULLPTR);
+    MediaPlayerBackend(const QSqlDatabase &database, QObject *parent = nullptr);
 
-    virtual void initialize() Q_DECL_OVERRIDE;
-    virtual void play() Q_DECL_OVERRIDE;
-    virtual void pause() Q_DECL_OVERRIDE;
-    virtual void stop() Q_DECL_OVERRIDE;
-    virtual void seek(qint64 offset) Q_DECL_OVERRIDE;
-    virtual void next() Q_DECL_OVERRIDE;
-    virtual void previous() Q_DECL_OVERRIDE;
-    virtual void setPlayMode(QIviMediaPlayer::PlayMode playMode) Q_DECL_OVERRIDE;
-    virtual void setPosition(qint64 position) Q_DECL_OVERRIDE;
-    virtual void setCurrentIndex(int index) Q_DECL_OVERRIDE;
+    virtual void initialize() override;
+    virtual void play() override;
+    virtual void pause() override;
+    virtual void stop() override;
+    virtual void seek(qint64 offset) override;
+    virtual void next() override;
+    virtual void previous() override;
+    virtual void setPlayMode(QIviMediaPlayer::PlayMode playMode) override;
+    virtual void setPosition(qint64 position) override;
+    virtual void setCurrentIndex(int index) override;
 
-    virtual bool canReportCount() Q_DECL_OVERRIDE;
-    virtual void fetchData(int start, int count) Q_DECL_OVERRIDE;
+    virtual bool canReportCount() override;
+    virtual void fetchData(int start, int count) override;
 
-    virtual void insert(int index, const QIviPlayableItem *item) Q_DECL_OVERRIDE;
-    virtual void remove(int index) Q_DECL_OVERRIDE;
-    virtual void move(int cur_index, int new_index) Q_DECL_OVERRIDE;
+    virtual void insert(int index, const QIviPlayableItem *item) override;
+    virtual void remove(int index) override;
+    virtual void move(int cur_index, int new_index) override;
 
 public Q_SLOTS:
     void doSqlOperation(MediaPlayerBackend::OperationType type, const QStringList &queries, int start, int count);
diff --git a/src/plugins/ivimedia/media_simulator/mediaplugin.h b/src/plugins/ivimedia/media_simulator/mediaplugin.h
index 6d5bbae..a681198 100644
--- a/src/plugins/ivimedia/media_simulator/mediaplugin.h
+++ b/src/plugins/ivimedia/media_simulator/mediaplugin.h
@@ -60,7 +60,7 @@ class MediaPlugin : public QObject, QIviServiceInterface
     Q_INTERFACES(QIviServiceInterface)
 
 public:
-    explicit MediaPlugin(QObject *parent = Q_NULLPTR);
+    explicit MediaPlugin(QObject *parent = nullptr);
 
     QStringList interfaces() const;
     QIviFeatureInterface *interfaceInstance(const QString &interface) const;
diff --git a/src/plugins/ivimedia/media_simulator/searchandbrowsebackend.h b/src/plugins/ivimedia/media_simulator/searchandbrowsebackend.h
index 4a143d5..de32345 100644
--- a/src/plugins/ivimedia/media_simulator/searchandbrowsebackend.h
+++ b/src/plugins/ivimedia/media_simulator/searchandbrowsebackend.h
@@ -70,19 +70,19 @@ class SearchAndBrowseBackend : public QIviSearchAndBrowseModelInterface
 {
     Q_OBJECT
 public:
-    explicit SearchAndBrowseBackend(const QSqlDatabase &database, QObject *parent = Q_NULLPTR);
+    explicit SearchAndBrowseBackend(const QSqlDatabase &database, QObject *parent = nullptr);
 
-    virtual void initialize() Q_DECL_OVERRIDE;
-    virtual void fetchData(const QUuid &identifier, const QString &type, QIviAbstractQueryTerm *term, const QList<QIviOrderTerm> &orderTerms, int start, int count) Q_DECL_OVERRIDE;
-    virtual bool canGoBack(const QUuid &identifier, const QString &type) Q_DECL_OVERRIDE;
-    virtual QString goBack(const QUuid &identifier, const QString &type) Q_DECL_OVERRIDE;
-    virtual bool canGoForward(const QUuid &identifier, const QString &type, const QString &itemId) Q_DECL_OVERRIDE;
-    virtual QString goForward(const QUuid &identifier, const QString &type, const QString &itemId) Q_DECL_OVERRIDE;
+    virtual void initialize() override;
+    virtual void fetchData(const QUuid &identifier, const QString &type, QIviAbstractQueryTerm *term, const QList<QIviOrderTerm> &orderTerms, int start, int count) override;
+    virtual bool canGoBack(const QUuid &identifier, const QString &type) override;
+    virtual QString goBack(const QUuid &identifier, const QString &type) override;
+    virtual bool canGoForward(const QUuid &identifier, const QString &type, const QString &itemId) override;
+    virtual QString goForward(const QUuid &identifier, const QString &type, const QString &itemId) override;
 
-    virtual void insert(const QUuid &identifier, const QString &type, int index, const QIviSearchAndBrowseModelItem *item) Q_DECL_OVERRIDE;
-    virtual void remove(const QUuid &identifier, const QString &type, int index) Q_DECL_OVERRIDE;
-    virtual void move(const QUuid &identifier, const QString &type, int currentIndex, int newIndex) Q_DECL_OVERRIDE;
-    virtual int indexOf(const QUuid &identifier, const QString &type, const QIviSearchAndBrowseModelItem *item) Q_DECL_OVERRIDE;
+    virtual void insert(const QUuid &identifier, const QString &type, int index, const QIviSearchAndBrowseModelItem *item) override;
+    virtual void remove(const QUuid &identifier, const QString &type, int index) override;
+    virtual void move(const QUuid &identifier, const QString &type, int currentIndex, int newIndex) override;
+    virtual int indexOf(const QUuid &identifier, const QString &type, const QIviSearchAndBrowseModelItem *item) override;
 
 private slots:
     void search(const QUuid &identifier, const QString &queryString, const QString &type, int start, int count);
diff --git a/src/plugins/ivimedia/media_simulator/usbbrowsebackend.h b/src/plugins/ivimedia/media_simulator/usbbrowsebackend.h
index 1f19c96..9a8241b 100644
--- a/src/plugins/ivimedia/media_simulator/usbbrowsebackend.h
+++ b/src/plugins/ivimedia/media_simulator/usbbrowsebackend.h
@@ -47,19 +47,19 @@
 class UsbBrowseBackend : public QIviSearchAndBrowseModelInterface
 {
 public:
-    UsbBrowseBackend(const QString &path, QObject *parent = 0);
+    UsbBrowseBackend(const QString &path, QObject *parent = nullptr);
 
-    virtual void initialize() Q_DECL_OVERRIDE;
-    virtual void fetchData(const QUuid &identifier, const QString &type, QIviAbstractQueryTerm *term, const QList<QIviOrderTerm> &orderTerms, int start, int count) Q_DECL_OVERRIDE;
-    virtual bool canGoBack(const QUuid &identifier, const QString &type) Q_DECL_OVERRIDE;
-    virtual QString goBack(const QUuid &identifier, const QString &type) Q_DECL_OVERRIDE;
-    virtual bool canGoForward(const QUuid &identifier, const QString &type, const QString &itemId) Q_DECL_OVERRIDE;
-    virtual QString goForward(const QUuid &identifier, const QString &type, const QString &itemId) Q_DECL_OVERRIDE;
+    virtual void initialize() override;
+    virtual void fetchData(const QUuid &identifier, const QString &type, QIviAbstractQueryTerm *term, const QList<QIviOrderTerm> &orderTerms, int start, int count) override;
+    virtual bool canGoBack(const QUuid &identifier, const QString &type) override;
+    virtual QString goBack(const QUuid &identifier, const QString &type) override;
+    virtual bool canGoForward(const QUuid &identifier, const QString &type, const QString &itemId) override;
+    virtual QString goForward(const QUuid &identifier, const QString &type, const QString &itemId) override;
 
-    virtual void insert(const QUuid &identifier, const QString &type, int index, const QIviSearchAndBrowseModelItem *item) Q_DECL_OVERRIDE;
-    virtual void remove(const QUuid &identifier, const QString &type, int index) Q_DECL_OVERRIDE;
-    virtual void move(const QUuid &identifier, const QString &type, int currentIndex, int newIndex) Q_DECL_OVERRIDE;
-    virtual int indexOf(const QUuid &identifier, const QString &type, const QIviSearchAndBrowseModelItem *item) Q_DECL_OVERRIDE;
+    virtual void insert(const QUuid &identifier, const QString &type, int index, const QIviSearchAndBrowseModelItem *item) override;
+    virtual void remove(const QUuid &identifier, const QString &type, int index) override;
+    virtual void move(const QUuid &identifier, const QString &type, int currentIndex, int newIndex) override;
+    virtual int indexOf(const QUuid &identifier, const QString &type, const QIviSearchAndBrowseModelItem *item) override;
 
 private:
     QString m_rootFolder;
diff --git a/src/plugins/ivimedia/media_simulator/usbdevice.h b/src/plugins/ivimedia/media_simulator/usbdevice.h
index 5d3fc70..8126c2a 100644
--- a/src/plugins/ivimedia/media_simulator/usbdevice.h
+++ b/src/plugins/ivimedia/media_simulator/usbdevice.h
@@ -50,13 +50,13 @@ class USBDevice : public QIviMediaUsbDevice
 {
     Q_OBJECT
 public:
-    explicit USBDevice(const QString &folder, QObject *parent = 0);
+    explicit USBDevice(const QString &folder, QObject *parent = nullptr);
 
-    virtual QString name() const Q_DECL_OVERRIDE;
-    virtual void eject() Q_DECL_OVERRIDE;
+    virtual QString name() const override;
+    virtual void eject() override;
 
-    virtual QStringList interfaces() const Q_DECL_OVERRIDE;
-    virtual QIviFeatureInterface *interfaceInstance(const QString &interface) const Q_DECL_OVERRIDE;
+    virtual QStringList interfaces() const override;
+    virtual QIviFeatureInterface *interfaceInstance(const QString &interface) const override;
 
 private:
     UsbBrowseBackend *m_browseModel;
diff --git a/src/plugins/ivimedia/tuner_simulator/amfmtunerbackend.h b/src/plugins/ivimedia/tuner_simulator/amfmtunerbackend.h
index 55b4318..157579b 100644
--- a/src/plugins/ivimedia/tuner_simulator/amfmtunerbackend.h
+++ b/src/plugins/ivimedia/tuner_simulator/amfmtunerbackend.h
@@ -50,23 +50,23 @@ class AmFmTunerBackend : public QIviAmFmTunerBackendInterface
 {
     Q_OBJECT
 public:
-    explicit AmFmTunerBackend(QObject *parent = 0);
+    explicit AmFmTunerBackend(QObject *parent = nullptr);
 
-    virtual void initialize() Q_DECL_OVERRIDE;
-    virtual void setFrequency(int frequency) Q_DECL_OVERRIDE;
-    virtual void setBand(QIviAmFmTuner::Band band) Q_DECL_OVERRIDE;
-    virtual void stepUp() Q_DECL_OVERRIDE;
-    virtual void stepDown() Q_DECL_OVERRIDE;
-    virtual void seekUp() Q_DECL_OVERRIDE;
-    virtual void seekDown() Q_DECL_OVERRIDE;
-    virtual void startScan() Q_DECL_OVERRIDE;
-    virtual void stopScan() Q_DECL_OVERRIDE;
+    virtual void initialize() override;
+    virtual void setFrequency(int frequency) override;
+    virtual void setBand(QIviAmFmTuner::Band band) override;
+    virtual void stepUp() override;
+    virtual void stepDown() override;
+    virtual void seekUp() override;
+    virtual void seekDown() override;
+    virtual void startScan() override;
+    virtual void stopScan() override;
 
 private:
     void setCurrentStation(const QIviAmFmTunerStation &station);
     int stationIndexFromFrequency(int frequency) const;
     QIviAmFmTunerStation stationAt(int frequency) const;
-    void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE;
+    void timerEvent(QTimerEvent *event) override;
 
     QIviAmFmTuner::Band m_band;
     struct BandData {
diff --git a/src/plugins/ivimedia/tuner_simulator/searchandbrowsebackend.h b/src/plugins/ivimedia/tuner_simulator/searchandbrowsebackend.h
index d628a01..d6bd9b6 100644
--- a/src/plugins/ivimedia/tuner_simulator/searchandbrowsebackend.h
+++ b/src/plugins/ivimedia/tuner_simulator/searchandbrowsebackend.h
@@ -52,19 +52,19 @@ class SearchAndBrowseBackend : public QIviSearchAndBrowseModelInterface
 {
     Q_OBJECT
 public:
-    explicit SearchAndBrowseBackend(AmFmTunerBackend *tunerBackend, QObject *parent = Q_NULLPTR);
+    explicit SearchAndBrowseBackend(AmFmTunerBackend *tunerBackend, QObject *parent = nullptr);
 
-    virtual void initialize() Q_DECL_OVERRIDE;
-    virtual void fetchData(const QUuid &identifier, const QString &type, QIviAbstractQueryTerm *term, const QList<QIviOrderTerm> &orderTerms, int start, int count) Q_DECL_OVERRIDE;
-    virtual bool canGoBack(const QUuid &identifier, const QString &type) Q_DECL_OVERRIDE;
-    virtual QString goBack(const QUuid &identifier, const QString &type) Q_DECL_OVERRIDE;
-    virtual bool canGoForward(const QUuid &identifier, const QString &type, const QString &itemId) Q_DECL_OVERRIDE;
-    virtual QString goForward(const QUuid &identifier, const QString &type, const QString &itemId) Q_DECL_OVERRIDE;
+    virtual void initialize() override;
+    virtual void fetchData(const QUuid &identifier, const QString &type, QIviAbstractQueryTerm *term, const QList<QIviOrderTerm> &orderTerms, int start, int count) override;
+    virtual bool canGoBack(const QUuid &identifier, const QString &type) override;
+    virtual QString goBack(const QUuid &identifier, const QString &type) override;
+    virtual bool canGoForward(const QUuid &identifier, const QString &type, const QString &itemId) override;
+    virtual QString goForward(const QUuid &identifier, const QString &type, const QString &itemId) override;
 
-    virtual void insert(const QUuid &identifier, const QString &type, int index, const QIviSearchAndBrowseModelItem *item) Q_DECL_OVERRIDE;
-    virtual void remove(const QUuid &identifier, const QString &type, int index) Q_DECL_OVERRIDE;
-    virtual void move(const QUuid &identifier, const QString &type, int currentIndex, int newIndex) Q_DECL_OVERRIDE;
-    virtual int indexOf(const QUuid &identifier, const QString &type, const QIviSearchAndBrowseModelItem *item) Q_DECL_OVERRIDE;
+    virtual void insert(const QUuid &identifier, const QString &type, int index, const QIviSearchAndBrowseModelItem *item) override;
+    virtual void remove(const QUuid &identifier, const QString &type, int index) override;
+    virtual void move(const QUuid &identifier, const QString &type, int currentIndex, int newIndex) override;
+    virtual int indexOf(const QUuid &identifier, const QString &type, const QIviSearchAndBrowseModelItem *item) override;
 private:
 
     AmFmTunerBackend *m_tunerBackend;
diff --git a/src/plugins/ivimedia/tuner_simulator/tunerplugin.h b/src/plugins/ivimedia/tuner_simulator/tunerplugin.h
index adc0c58..5cc7f0d 100644
--- a/src/plugins/ivimedia/tuner_simulator/tunerplugin.h
+++ b/src/plugins/ivimedia/tuner_simulator/tunerplugin.h
@@ -54,7 +54,7 @@ class TunerPlugin : public QObject, QIviServiceInterface
     Q_INTERFACES(QIviServiceInterface)
 
 public:
-    explicit TunerPlugin(QObject *parent = Q_NULLPTR);
+    explicit TunerPlugin(QObject *parent = nullptr);
 
     QStringList interfaces() const;
     QIviFeatureInterface *interfaceInstance(const QString &interface) const;
diff --git a/src/plugins/ivivehiclefunctions/vehiclefunction_simulator/climatecontrolbackend.h b/src/plugins/ivivehiclefunctions/vehiclefunction_simulator/climatecontrolbackend.h
index 1ca7182..7dbbe7f 100644
--- a/src/plugins/ivivehiclefunctions/vehiclefunction_simulator/climatecontrolbackend.h
+++ b/src/plugins/ivivehiclefunctions/vehiclefunction_simulator/climatecontrolbackend.h
@@ -48,7 +48,7 @@
 class ClimateControlBackend : public QIviClimateControlBackendInterface
 {
 public:
-    ClimateControlBackend(QObject *parent = 0);
+    ClimateControlBackend(QObject *parent = nullptr);
     ~ClimateControlBackend();
 
 public:
diff --git a/src/plugins/ivivehiclefunctions/vehiclefunction_simulator/vehicleplugin.h b/src/plugins/ivivehiclefunctions/vehiclefunction_simulator/vehicleplugin.h
index 9708c03..c94e4d7 100644
--- a/src/plugins/ivivehiclefunctions/vehiclefunction_simulator/vehicleplugin.h
+++ b/src/plugins/ivivehiclefunctions/vehiclefunction_simulator/vehicleplugin.h
@@ -54,7 +54,7 @@ class VehiclePlugin : public QObject, QIviServiceInterface
     Q_INTERFACES(QIviServiceInterface)
 
 public:
-    VehiclePlugin(QObject *parent = 0);
+    VehiclePlugin(QObject *parent = nullptr);
 
     QStringList interfaces() const;
     QIviFeatureInterface *interfaceInstance(const QString& interface) const;
diff --git a/src/plugins/ivivehiclefunctions/vehiclefunction_simulator/windowcontrolbackend.h b/src/plugins/ivivehiclefunctions/vehiclefunction_simulator/windowcontrolbackend.h
index 479ad10..a073988 100644
--- a/src/plugins/ivivehiclefunctions/vehiclefunction_simulator/windowcontrolbackend.h
+++ b/src/plugins/ivivehiclefunctions/vehiclefunction_simulator/windowcontrolbackend.h
@@ -74,7 +74,7 @@ private:
 class WindowControlBackend : public QIviWindowControlBackendInterface
 {
 public:
-    WindowControlBackend(QObject *parent = 0);
+    WindowControlBackend(QObject *parent = nullptr);
     ~WindowControlBackend();
 
     QStringList availableZones() const;
diff --git a/tests/auto/core/qiviabstractfeature/qivifeaturetester.h b/tests/auto/core/qiviabstractfeature/qivifeaturetester.h
index d35faaa..320c6ec 100644
--- a/tests/auto/core/qiviabstractfeature/qivifeaturetester.h
+++ b/tests/auto/core/qiviabstractfeature/qivifeaturetester.h
@@ -46,10 +46,10 @@ class QIviFeatureTester : public QObject
     Q_PROPERTY(QString error READ errorMessage NOTIFY errorChanged)
 
 public:
-    explicit QIviFeatureTester(QIviAbstractFeature *feature, QObject *parent = Q_NULLPTR)
+    explicit QIviFeatureTester(QIviAbstractFeature *feature, QObject *parent = nullptr)
         : QObject(parent)
         , m_feature(feature)
-        , m_featureListModel(0)
+        , m_featureListModel(nullptr)
     {
         connect(m_feature, &QIviAbstractFeature::discoveryModeChanged, this, &QIviFeatureTester::discoveryModeChanged);
         connect(m_feature, &QIviAbstractFeature::discoveryResultChanged, this, &QIviFeatureTester::discoveryResultChanged);
@@ -59,9 +59,9 @@ public:
         connect(m_feature, &QIviAbstractFeature::errorChanged, this, &QIviFeatureTester::errorChanged);
     }
 
-    explicit QIviFeatureTester(QIviAbstractFeatureListModel *featureModel, QObject *parent = Q_NULLPTR)
+    explicit QIviFeatureTester(QIviAbstractFeatureListModel *featureModel, QObject *parent = nullptr)
         : QObject(parent)
-        , m_feature(0)
+        , m_feature(nullptr)
         , m_featureListModel(featureModel)
     {
         connect(m_featureListModel, &QIviAbstractFeatureListModel::discoveryModeChanged, this, &QIviFeatureTester::discoveryModeChanged);
diff --git a/tests/auto/core/qiviabstractfeature/tst_qiviabstractfeature.cpp b/tests/auto/core/qiviabstractfeature/tst_qiviabstractfeature.cpp
index 338ceb1..a97df09 100644
--- a/tests/auto/core/qiviabstractfeature/tst_qiviabstractfeature.cpp
+++ b/tests/auto/core/qiviabstractfeature/tst_qiviabstractfeature.cpp
@@ -45,11 +45,11 @@ class TestFeatureInterface : public QIviFeatureInterface
     Q_OBJECT
 
 public:
-    TestFeatureInterface(QObject *parent = 0)
+    explicit TestFeatureInterface(QObject *parent = nullptr)
         : QIviFeatureInterface(parent)
     {}
 
-    virtual ~TestFeatureInterface() {}
+    ~TestFeatureInterface() {}
 
 Q_SIGNALS:
     void errorChanged(QIviAbstractFeature::Error error, const QString &message = QString());
@@ -60,7 +60,7 @@ class TestFeature : public QIviAbstractFeature
     Q_OBJECT
 
 public:
-    TestFeature(bool testBaseFunctions = false, QObject *parent = 0)
+    TestFeature(bool testBaseFunctions = false, QObject *parent = nullptr)
         : QIviAbstractFeature("testFeature", parent)
         , m_testBaseFunctions(testBaseFunctions)
     {}
@@ -109,7 +109,7 @@ class TestFeatureListModel : public QIviAbstractFeatureListModel
     Q_OBJECT
 
 public:
-    TestFeatureListModel(bool testBaseFunctions = false, QObject *parent = 0)
+    TestFeatureListModel(bool testBaseFunctions = false, QObject *parent = nullptr)
         : QIviAbstractFeatureListModel("testFeature", parent)
         , m_testBaseFunctions(testBaseFunctions)
     {}
@@ -171,11 +171,11 @@ class TestFeatureBackend : public TestFeatureInterface
     Q_OBJECT
 
 public:
-    TestFeatureBackend(QObject *parent = 0)
+    TestFeatureBackend(QObject *parent = nullptr)
         : TestFeatureInterface(parent)
     {}
 
-    void initialize() Q_DECL_OVERRIDE
+    void initialize() override
     {
         emit initializationDone();
     }
@@ -192,7 +192,7 @@ class TestBackend : public QObject, QIviServiceInterface
     Q_INTERFACES(QIviServiceInterface)
 
 public:
-    TestBackend(QObject *parent = 0)
+    TestBackend(QObject *parent = nullptr)
         : QObject(parent)
         , m_testBackend(new TestFeatureBackend(this))
     {}
@@ -300,7 +300,7 @@ void BaseTest::testAutoDiscoveryFailure()
     f->setServiceObject(list.at(0));
     result = f->startAutoDiscovery();
     QCOMPARE(result, QIviAbstractFeature::NoResult);
-    f->setServiceObject(0);
+    f->setServiceObject(nullptr);
 
     TestBackend* backend2 = new TestBackend();
     m_manager->registerService(backend2, backend2->interfaces());
@@ -515,7 +515,7 @@ void BaseTest::testResetServiceObject()
     serviceObjectChangedSpy.clear();
 
     //Reset the ServiceObject of the Feature and verify that the feature doesn't have a connection to the ServiceObject anymore
-    f->setServiceObject(0);
+    f->setServiceObject(nullptr);
 
     m_manager->unloadAllBackends();
     QCOMPARE(soDestroyedSpy.count(), 1);
diff --git a/tests/auto/core/qiviproperty/tst_qiviproperty.cpp b/tests/auto/core/qiviproperty/tst_qiviproperty.cpp
index 9de5d24..d73e2c3 100644
--- a/tests/auto/core/qiviproperty/tst_qiviproperty.cpp
+++ b/tests/auto/core/qiviproperty/tst_qiviproperty.cpp
@@ -86,7 +86,7 @@ public:
     QIVIPROPERTY(TestObject::TestFlags, flagsAttribute)
 
 public:
-    TestObject(QObject *parent = Q_NULLPTR)
+    TestObject(QObject *parent = nullptr)
       : QObject(parent)
       , m_intAttributeProperty(QIviPropertyFactory<int>::create(this,
                                                                  &TestObject::intAttribute,
diff --git a/tests/auto/core/qivisearchandbrowsemodel/tst_qivisearchandbrowsemodel.cpp b/tests/auto/core/qivisearchandbrowsemodel/tst_qivisearchandbrowsemodel.cpp
index 752a195..2e08f2c 100644
--- a/tests/auto/core/qivisearchandbrowsemodel/tst_qivisearchandbrowsemodel.cpp
+++ b/tests/auto/core/qivisearchandbrowsemodel/tst_qivisearchandbrowsemodel.cpp
@@ -105,12 +105,12 @@ public:
         return list;
     }
 
-    void initialize() Q_DECL_OVERRIDE
+    void initialize() override
     {
         emit initializationDone();
     }
 
-    virtual void fetchData(const QUuid &identifier, const QString &type, QIviAbstractQueryTerm *term, const QList<QIviOrderTerm> &orderTerms, int start, int count) Q_DECL_OVERRIDE
+    virtual void fetchData(const QUuid &identifier, const QString &type, QIviAbstractQueryTerm *term, const QList<QIviOrderTerm> &orderTerms, int start, int count) override
     {
         emit supportedCapabilitiesChanged(identifier, m_caps);
 
@@ -205,13 +205,13 @@ public:
         emit dataFetched(identifier, requestedItems, start, start + count < list.count());
     }
 
-    virtual bool canGoBack(const QUuid &identifier, const QString &type) Q_DECL_OVERRIDE
+    virtual bool canGoBack(const QUuid &identifier, const QString &type) override
     {
         Q_UNUSED(identifier)
         return (type == "levelTwo" || type == "levelThree");
     }
 
-    virtual QString goBack(const QUuid &identifier, const QString &type) Q_DECL_OVERRIDE
+    virtual QString goBack(const QUuid &identifier, const QString &type) override
     {
         Q_UNUSED(identifier)
 
@@ -223,7 +223,7 @@ public:
         return "levelOne";
     }
 
-    virtual bool canGoForward(const QUuid &identifier, const QString &type, const QString &itemId) Q_DECL_OVERRIDE
+    virtual bool canGoForward(const QUuid &identifier, const QString &type, const QString &itemId) override
     {
         Q_UNUSED(identifier)
         if (itemId.endsWith("0"))
@@ -232,7 +232,7 @@ public:
         return (type == "levelOne" || type == "levelTwo");
     }
 
-    virtual QString goForward(const QUuid &identifier, const QString &type, const QString &itemId) Q_DECL_OVERRIDE
+    virtual QString goForward(const QUuid &identifier, const QString &type, const QString &itemId) override
     {
         Q_UNUSED(identifier)
         Q_UNUSED(itemId)
@@ -245,7 +245,7 @@ public:
         return "levelOne";
     }
 
-    virtual void insert(const QUuid &identifier, const QString &type, int index, const QIviSearchAndBrowseModelItem *item) Q_DECL_OVERRIDE
+    virtual void insert(const QUuid &identifier, const QString &type, int index, const QIviSearchAndBrowseModelItem *item) override
     {
         QList<QIviSearchAndBrowseModelItem> list = m_lists.value(type);
 
@@ -257,7 +257,7 @@ public:
         emit dataChanged(identifier, variantList, index, 0);
     }
 
-    virtual void remove(const QUuid &identifier, const QString &type, int index) Q_DECL_OVERRIDE
+    virtual void remove(const QUuid &identifier, const QString &type, int index) override
     {
         QList<QIviSearchAndBrowseModelItem> list = m_lists.value(type);
 
@@ -267,7 +267,7 @@ public:
         emit dataChanged(identifier, QVariantList(), index, 1);
     }
 
-    virtual void move(const QUuid &identifier, const QString &type, int currentIndex, int newIndex) Q_DECL_OVERRIDE
+    virtual void move(const QUuid &identifier, const QString &type, int currentIndex, int newIndex) override
     {
         QList<QIviSearchAndBrowseModelItem> list = m_lists.value(type);
 
@@ -284,7 +284,7 @@ public:
         emit dataChanged(identifier, variantLIst, min, max - min + 1);
     }
 
-    virtual int indexOf(const QUuid &identifier, const QString &type, const QIviSearchAndBrowseModelItem *item) Q_DECL_OVERRIDE
+    virtual int indexOf(const QUuid &identifier, const QString &type, const QIviSearchAndBrowseModelItem *item) override
     {
         static int callID = 0;
         QList<QIviSearchAndBrowseModelItem> list = m_lists.value(type);
@@ -303,7 +303,7 @@ class TestServiceObject : public QIviServiceObject
 {
 
 public:
-    explicit TestServiceObject(QObject *parent = 0) :
+    explicit TestServiceObject(QObject *parent = nullptr) :
         QIviServiceObject(parent)
     {
         m_backend = new TestBackend;
@@ -433,7 +433,7 @@ void tst_QIviSearchAndBrowseModel::testClearServiceObject()
     //QVERIFY(model.loadingType() != defaultModel.loadingType());
     QVERIFY(model.rowCount() != defaultModel.rowCount());
 
-    QVERIFY(model.setServiceObject(0));
+    QVERIFY(model.setServiceObject(nullptr));
 
     QVERIFY(model.chunkSize() == defaultModel.chunkSize());
     QVERIFY(model.contentType() == defaultModel.contentType());
diff --git a/tests/auto/core/servicemanagertest/simple_plugin/simpleplugin.h b/tests/auto/core/servicemanagertest/simple_plugin/simpleplugin.h
index 8e9473c..e62968d 100644
--- a/tests/auto/core/servicemanagertest/simple_plugin/simpleplugin.h
+++ b/tests/auto/core/servicemanagertest/simple_plugin/simpleplugin.h
@@ -40,8 +40,8 @@ class SimplePlugin : public QObject, public QIviServiceInterface
     Q_INTERFACES(QIviServiceInterface)
     Q_PLUGIN_METADATA(IID QIviServiceInterface_iid FILE "simple_plugin.json")
 public:
-    SimplePlugin();
-    virtual ~SimplePlugin() {}
+    explicit SimplePlugin();
+    ~SimplePlugin() {}
 
     QStringList interfaces() const {
         return QStringList() << "simple_plugin";
diff --git a/tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp b/tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp
index 1602cd3..a118575 100644
--- a/tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp
+++ b/tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp
@@ -70,7 +70,7 @@ public:
         : QIviFeatureInterface(parent)
     {}
 
-    void initialize() Q_DECL_OVERRIDE
+    void initialize() override
     {
     }
 };
diff --git a/tests/auto/core/servicemanagertest/wrong_plugin/wrongplugin.h b/tests/auto/core/servicemanagertest/wrong_plugin/wrongplugin.h
index 2ef469e..58154c9 100644
--- a/tests/auto/core/servicemanagertest/wrong_plugin/wrongplugin.h
+++ b/tests/auto/core/servicemanagertest/wrong_plugin/wrongplugin.h
@@ -40,8 +40,8 @@ class WrongPlugin : public QObject
     //Q_INTERFACES(QIviServiceInterface)
     Q_PLUGIN_METADATA(IID QIviServiceInterface_iid FILE "wrong_plugin.json")
 public:
-    WrongPlugin();
-    virtual ~WrongPlugin() {}
+    explicit WrongPlugin();
+    ~WrongPlugin() {}
 
     QStringList interfaces() const {
         return QStringList() << "wrong_plugin";
diff --git a/tests/auto/core/servicemanagertest/wrongmetadata_plugin/wrongmetadataplugin.h b/tests/auto/core/servicemanagertest/wrongmetadata_plugin/wrongmetadataplugin.h
index 9df8c08..b5dbdd2 100644
--- a/tests/auto/core/servicemanagertest/wrongmetadata_plugin/wrongmetadataplugin.h
+++ b/tests/auto/core/servicemanagertest/wrongmetadata_plugin/wrongmetadataplugin.h
@@ -39,8 +39,8 @@ class WrongMetadataPlugin : public QObject, public QIviServiceInterface
     Q_OBJECT
     Q_INTERFACES(QIviServiceInterface)
 public:
-    WrongMetadataPlugin();
-    virtual ~WrongMetadataPlugin() {}
+    explicit WrongMetadataPlugin();
+    ~WrongMetadataPlugin() {}
 
     QStringList interfaces() const {
         return QStringList() << "wrongmetadata";
diff --git a/tests/auto/vehiclefunctions/climatecontroltest/tst_climatecontroltest.cpp b/tests/auto/vehiclefunctions/climatecontroltest/tst_climatecontroltest.cpp
index 938cd51..699df3c 100644
--- a/tests/auto/vehiclefunctions/climatecontroltest/tst_climatecontroltest.cpp
+++ b/tests/auto/vehiclefunctions/climatecontroltest/tst_climatecontroltest.cpp
@@ -85,12 +85,12 @@ public:
          m_zones << "Dummy"; // to test unavailable attributes
     }
 
-    QStringList availableZones() const Q_DECL_OVERRIDE
+    QStringList availableZones() const override
     {
         return m_zones;
     }
 
-    void initialize() Q_DECL_OVERRIDE
+    void initialize() override
     {
         emit airflowDirectionsChanged(m_airflowDirections);
         emit airflowDirectionsAttributeChanged(m_airflowDirectionsAttribute);
@@ -131,7 +131,7 @@ public:
         }
     }
 
-    void setTargetTemperature(int t, const QString &z) Q_DECL_OVERRIDE
+    void setTargetTemperature(int t, const QString &z) override
     {
         if (!m_zoneTargetTemperature.contains(z)) {
             qWarning() << "Trying to set ClimateControl::targetTemperature in an unsupported zone.";
@@ -155,7 +155,7 @@ public:
         }
     }
 
-    void setSeatCooler(int t, const QString &z) Q_DECL_OVERRIDE
+    void setSeatCooler(int t, const QString &z) override
     {
         if (!m_zoneSeatCooler.contains(z)) {
             qWarning() << "Trying to set ClimateControl::seatCooler in an unsupported zone.";
@@ -179,7 +179,7 @@ public:
         }
     }
 
-    void setSeatHeater(int t, const QString &z) Q_DECL_OVERRIDE
+    void setSeatHeater(int t, const QString &z) override
     {
         if (!m_zoneSeatHeater.contains(z)) {
             qWarning() << "Trying to set ClimateControl::seatHeater in an unsupported zone.";
@@ -203,7 +203,7 @@ public:
         }
     }
 
-    void setAirflowDirections(QIviClimateControl::AirflowDirections ad, const QString &z) Q_DECL_OVERRIDE
+    void setAirflowDirections(QIviClimateControl::AirflowDirections ad, const QString &z) override
     {
         Q_UNUSED(z)
         if (m_airflowDirections != ad) {
@@ -221,7 +221,7 @@ public:
         }
     }
 
-    void setAirConditioningEnabled(bool e, const QString &z) Q_DECL_OVERRIDE
+    void setAirConditioningEnabled(bool e, const QString &z) override
     {
         Q_UNUSED(z)
         if (m_airConditioningEnabled != e) {
@@ -239,7 +239,7 @@ public:
         }
     }
 
-    void setHeaterEnabled(bool e, const QString &z) Q_DECL_OVERRIDE
+    void setHeaterEnabled(bool e, const QString &z) override
     {
         Q_UNUSED(z)
         if (m_heaterEnabled != e) {
@@ -257,7 +257,7 @@ public:
         }
     }
 
-    void setSteeringWheelHeater(int t, const QString &z) Q_DECL_OVERRIDE
+    void setSteeringWheelHeater(int t, const QString &z) override
     {
         if (!m_zoneSteeringWheelHeater.contains(z))
             return;
@@ -279,7 +279,7 @@ public:
         }
     }
 
-    void setFanSpeedLevel(int fsl, const QString &z) Q_DECL_OVERRIDE
+    void setFanSpeedLevel(int fsl, const QString &z) override
     {
         if (!m_zoneFanSpeedLevel.contains(z))
             return;
@@ -324,7 +324,7 @@ public:
         }
     }
 
-    void setZoneSynchronizationEnabled(bool zoneSynchronization, const QString &z) Q_DECL_OVERRIDE
+    void setZoneSynchronizationEnabled(bool zoneSynchronization, const QString &z) override
     {
         Q_UNUSED(z)
         if (m_zoneSynchronizationEnabled != zoneSynchronization) {
@@ -342,7 +342,7 @@ public:
         }
     }
 
-    void setDefrostEnabled(bool defrost, const QString &z) Q_DECL_OVERRIDE
+    void setDefrostEnabled(bool defrost, const QString &z) override
     {
         Q_UNUSED(z)
         if (m_defrostEnabled != defrost) {
@@ -360,7 +360,7 @@ public:
         }
     }
 
-    void setRecirculationMode(QIviClimateControl::RecirculationMode recirculationMode, const QString &z) Q_DECL_OVERRIDE
+    void setRecirculationMode(QIviClimateControl::RecirculationMode recirculationMode, const QString &z) override
     {
         Q_UNUSED(z)
         if (m_recirculationMode != recirculationMode) {
@@ -396,7 +396,7 @@ public:
         }
     }
 
-    void setRecirculationSensitivityLevel(int recirculationSensitivityLevel, const QString &z) Q_DECL_OVERRIDE
+    void setRecirculationSensitivityLevel(int recirculationSensitivityLevel, const QString &z) override
     {
         Q_UNUSED(z)
 
@@ -420,7 +420,7 @@ public:
         }
     }
 
-    void setClimateMode(QIviClimateControl::ClimateMode climateMode, const QString &z) Q_DECL_OVERRIDE
+    void setClimateMode(QIviClimateControl::ClimateMode climateMode, const QString &z) override
     {
         Q_UNUSED(z)
         if (m_climateMode != climateMode) {
@@ -438,7 +438,7 @@ public:
         }
     }
 
-    void setAutomaticClimateFanIntensityLevel(int automaticClimateFanIntensityLevel, const QString &z) Q_DECL_OVERRIDE
+    void setAutomaticClimateFanIntensityLevel(int automaticClimateFanIntensityLevel, const QString &z) override
     {
         Q_UNUSED(z)
 
@@ -509,7 +509,7 @@ Q_DECLARE_METATYPE(ClimateControlTestDataBool)
 class ClimateControlTestServiceObject : public QIviServiceObject {
 
 public:
-    explicit ClimateControlTestServiceObject(QObject *parent=0) :
+    explicit ClimateControlTestServiceObject(QObject *parent = nullptr) :
         QIviServiceObject(parent), m_name(QLatin1String(""))
     {
         m_backend = new ClimateControlTestBackend;
@@ -544,7 +544,7 @@ public:
         : QIviFeatureInterface(parent)
     {}
 
-    void initialize() Q_DECL_OVERRIDE
+    void initialize() override
     {
         emit initializationDone();
     }
@@ -553,7 +553,7 @@ public:
 class ClimateControlInvalidServiceObject : public QIviServiceObject {
 
 public:
-    explicit ClimateControlInvalidServiceObject(QObject *parent=0) :
+    explicit ClimateControlInvalidServiceObject(QObject *parent = nullptr) :
         QIviServiceObject(parent), m_name(QLatin1String("")), m_dummyBackend(new InvalidInterface(this))
     {
         m_interfaces << QIviClimateControl_iid;
diff --git a/tests/auto/vehiclefunctions/windowcontroltest/tst_windowcontroltest.cpp b/tests/auto/vehiclefunctions/windowcontroltest/tst_windowcontroltest.cpp
index bc9f488..f241bf4 100644
--- a/tests/auto/vehiclefunctions/windowcontroltest/tst_windowcontroltest.cpp
+++ b/tests/auto/vehiclefunctions/windowcontroltest/tst_windowcontroltest.cpp
@@ -57,12 +57,12 @@ public:
         m_zoneMap.insert("Rear", zone);
     }
 
-    QStringList availableZones() const Q_DECL_OVERRIDE
+    QStringList availableZones() const override
     {
         return m_zoneMap.keys();
     }
 
-    void initialize() Q_DECL_OVERRIDE
+    void initialize() override
     {
         const QStringList zones = availableZones();
         //zones.removeLast(); // Do not init zone "Dummy"
@@ -82,7 +82,7 @@ public:
 
 public:
 
-    void setHeaterMode(QIviWindowControl::HeaterMode value, const QString &zone) Q_DECL_OVERRIDE
+    void setHeaterMode(QIviWindowControl::HeaterMode value, const QString &zone) override
     {
         if (!m_zoneMap.contains(zone))
             return;
@@ -126,7 +126,7 @@ public:
         }
     }
 
-    void setBlindMode(QIviWindowControl::BlindMode value, const QString &zone) Q_DECL_OVERRIDE
+    void setBlindMode(QIviWindowControl::BlindMode value, const QString &zone) override
     {
         if (!m_zoneMap.contains(zone))
             return;
@@ -194,12 +194,12 @@ public:
     }
 
     //TODO add an autotest for this
-    void open(const QString &zone)
+    void open(const QString &zone) override
     {
         Q_UNUSED(zone)
     }
 
-    void close(const QString &zone)
+    void close(const QString &zone) override
     {
         Q_UNUSED(zone)
     }
@@ -229,7 +229,7 @@ Q_DECLARE_METATYPE(WindowControlTestDataState)
 class WindowControlTestServiceObject : public QIviServiceObject {
 
 public:
-    explicit WindowControlTestServiceObject(QObject *parent=0) :
+    explicit WindowControlTestServiceObject(QObject *parent = nullptr) :
         QIviServiceObject(parent), m_name(QLatin1String(""))
     {
         m_backend = new WindowControlTestBackend;
@@ -264,7 +264,7 @@ public:
         : QIviFeatureInterface(parent)
     {}
 
-    void initialize() Q_DECL_OVERRIDE
+    void initialize() override
     {
         emit initializationDone();
     }
@@ -273,7 +273,7 @@ public:
 class WindowControlInvalidServiceObject : public QIviServiceObject {
 
 public:
-    explicit WindowControlInvalidServiceObject(QObject *parent=0) :
+    explicit WindowControlInvalidServiceObject(QObject *parent = nullptr) :
         QIviServiceObject(parent), m_name(QLatin1String("")), m_dummyBackend(new InvalidInterface(this))
     {
         m_interfaces << QIviWindowControl_iid;
@@ -373,7 +373,7 @@ void WindowControlTest::testClearServiceObject()
     QIviWindowControl *zone = qobject_cast<QIviWindowControl*>(wc.zoneAt("FrontLeft"));
     QVERIFY(zone);
     QCOMPARE(zone->heaterMode(), QIviWindowControl::HeaterOn);
-    wc.setServiceObject(0);
+    wc.setServiceObject(nullptr);
     QVERIFY(!wc.zoneAt("FrontLeft"));
 }