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>

3 files changed, 23 insertions, 23 deletions

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;