Make 'override' specifier usage consistent

Add where missing. Replace occurrences of Q_DECL_OVERRIDE macro,
building IFW requires a C++11 compatible compiler so the language
specifier is preferred.

Change-Id: Idb75e2813d26b9da85e03891f0ae9537c6524c56
Reviewed-by: Katja Marttila <katja.marttila@qt.io>

3 files changed, 67 insertions, 65 deletions

diff --git a/src/libs/kdtools/filedownloader_p.h b/src/libs/kdtools/filedownloader_p.h
index 41a430554..ec47e31ca 100644
--- a/src/libs/kdtools/filedownloader_p.h
+++ b/src/libs/kdtools/filedownloader_p.h
@@ -1,6 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Installer Framework.
@@ -46,22 +47,22 @@ public:
     explicit LocalFileDownloader(QObject *parent = 0);
     ~LocalFileDownloader();
 
-    bool canDownload() const;
-    bool isDownloaded() const;
-    QString downloadedFileName() const;
-    void setDownloadedFileName(const QString &name);
-    LocalFileDownloader *clone(QObject *parent = 0) const;
+    bool canDownload() const override;
+    bool isDownloaded() const override;
+    QString downloadedFileName() const override;
+    void setDownloadedFileName(const QString &name) override;
+    LocalFileDownloader *clone(QObject *parent = 0) const override;
 
 public Q_SLOTS:
-    void cancelDownload();
+    void cancelDownload() override;
 
 protected:
-    void timerEvent(QTimerEvent *te);
-    void onError();
-    void onSuccess();
+    void timerEvent(QTimerEvent *te) override;
+    void onError() override;
+    void onSuccess() override;
 
 private Q_SLOTS:
-    void doDownload();
+    void doDownload() override;
 
 private:
     struct Private;
@@ -76,22 +77,22 @@ public:
     explicit ResourceFileDownloader(QObject *parent = 0);
     ~ResourceFileDownloader();
 
-    bool canDownload() const;
-    bool isDownloaded() const;
-    QString downloadedFileName() const;
-    void setDownloadedFileName(const QString &name);
-    ResourceFileDownloader *clone(QObject *parent = 0) const;
+    bool canDownload() const override;
+    bool isDownloaded() const override;
+    QString downloadedFileName() const override;
+    void setDownloadedFileName(const QString &name) override;
+    ResourceFileDownloader *clone(QObject *parent = 0) const override;
 
 public Q_SLOTS:
-    void cancelDownload();
+    void cancelDownload() override;
 
 protected:
-    void timerEvent(QTimerEvent *te);
-    void onError();
-    void onSuccess();
+    void timerEvent(QTimerEvent *te) override;
+    void onError() override;
+    void onSuccess() override;
 
 private Q_SLOTS:
-    void doDownload();
+    void doDownload() override;
 
 private:
     struct Private;
@@ -106,22 +107,22 @@ public:
     explicit HttpDownloader(QObject *parent = 0);
     ~HttpDownloader();
 
-    bool canDownload() const;
-    bool isDownloaded() const;
-    QString downloadedFileName() const;
-    void setDownloadedFileName(const QString &name);
-    HttpDownloader *clone(QObject *parent = 0) const;
+    bool canDownload() const override;
+    bool isDownloaded() const override;
+    QString downloadedFileName() const override;
+    void setDownloadedFileName(const QString &name) override;
+    HttpDownloader *clone(QObject *parent = 0) const override;
 
 public Q_SLOTS:
-    void cancelDownload();
+    void cancelDownload() override;
 
 protected:
-    void onError();
-    void onSuccess();
-    void timerEvent(QTimerEvent *event);
+    void onError() override;
+    void onSuccess() override;
+    void timerEvent(QTimerEvent *event) override;
 
 private Q_SLOTS:
-    void doDownload();
+    void doDownload() override;
 
     void httpReadyRead();
     void httpReadProgress(qint64 done, qint64 total);
diff --git a/src/libs/kdtools/updatefinder.h b/src/libs/kdtools/updatefinder.h
index 7a3e4df1e..83b6a5f13 100644
--- a/src/libs/kdtools/updatefinder.h
+++ b/src/libs/kdtools/updatefinder.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the Qt Installer Framework.
@@ -55,10 +55,10 @@ public:
     void setPackageSources(const QSet<QInstaller::PackageSource> &sources);
 
 private:
-    void doRun();
-    bool doStop();
-    bool doPause();
-    bool doResume();
+    void doRun() override;
+    bool doStop() override;
+    bool doPause() override;
+    bool doResume() override;
 
 private:
     Private *d;
diff --git a/src/libs/kdtools/updateoperations.h b/src/libs/kdtools/updateoperations.h
index b13a42559..c789975e2 100644
--- a/src/libs/kdtools/updateoperations.h
+++ b/src/libs/kdtools/updateoperations.h
@@ -1,6 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Installer Framework.
@@ -40,12 +41,12 @@ public:
     explicit CopyOperation(QInstaller::PackageManagerCore *core = 0);
     ~CopyOperation();
 
-    void backup();
-    bool performOperation();
-    bool undoOperation();
-    bool testOperation();
+    void backup() override;
+    bool performOperation() override;
+    bool undoOperation() override;
+    bool testOperation() override;
 
-    QDomDocument toXml() const;
+    QDomDocument toXml() const override;
 private:
     QString sourcePath();
     QString destinationPath();
@@ -58,10 +59,10 @@ public:
     explicit MoveOperation(QInstaller::PackageManagerCore *core = 0);
     ~MoveOperation();
 
-    void backup();
-    bool performOperation();
-    bool undoOperation();
-    bool testOperation();
+    void backup() override;
+    bool performOperation() override;
+    bool undoOperation() override;
+    bool testOperation() override;
 };
 
 class KDTOOLS_EXPORT DeleteOperation : public UpdateOperation
@@ -71,12 +72,12 @@ public:
     explicit DeleteOperation(QInstaller::PackageManagerCore *core = 0);
     ~DeleteOperation();
 
-    void backup();
-    bool performOperation();
-    bool undoOperation();
-    bool testOperation();
+    void backup() override;
+    bool performOperation() override;
+    bool undoOperation() override;
+    bool testOperation() override;
 
-    QDomDocument toXml() const;
+    QDomDocument toXml() const override;
 };
 
 class KDTOOLS_EXPORT MkdirOperation : public UpdateOperation
@@ -85,10 +86,10 @@ class KDTOOLS_EXPORT MkdirOperation : public UpdateOperation
 public:
     explicit MkdirOperation(QInstaller::PackageManagerCore *core = 0);
 
-    void backup();
-    bool performOperation();
-    bool undoOperation();
-    bool testOperation();
+    void backup() override;
+    bool performOperation() override;
+    bool undoOperation() override;
+    bool testOperation() override;
 };
 
 class KDTOOLS_EXPORT RmdirOperation : public UpdateOperation
@@ -97,10 +98,10 @@ class KDTOOLS_EXPORT RmdirOperation : public UpdateOperation
 public:
     RmdirOperation(QInstaller::PackageManagerCore *core = 0);
 
-    void backup();
-    bool performOperation();
-    bool undoOperation();
-    bool testOperation();
+    void backup() override;
+    bool performOperation() override;
+    bool undoOperation() override;
+    bool testOperation() override;
 };
 
 class KDTOOLS_EXPORT AppendFileOperation : public UpdateOperation
@@ -109,10 +110,10 @@ class KDTOOLS_EXPORT AppendFileOperation : public UpdateOperation
 public:
     explicit AppendFileOperation(QInstaller::PackageManagerCore *core = 0);
 
-    void backup();
-    bool performOperation();
-    bool undoOperation();
-    bool testOperation();
+    void backup() override;
+    bool performOperation() override;
+    bool undoOperation() override;
+    bool testOperation() override;
 };
 
 class KDTOOLS_EXPORT PrependFileOperation : public UpdateOperation
@@ -121,10 +122,10 @@ class KDTOOLS_EXPORT PrependFileOperation : public UpdateOperation
 public:
     explicit PrependFileOperation(QInstaller::PackageManagerCore *core = 0);
 
-    void backup();
-    bool performOperation();
-    bool undoOperation();
-    bool testOperation();
+    void backup() override;
+    bool performOperation() override;
+    bool undoOperation() override;
+    bool testOperation() override;
 };
 
 } // namespace KDUpdater