From 8d26f701456332427d0d42e342458bc4249aad4f Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@qt.io>
Date: Tue, 7 Aug 2018 17:07:05 +0200
Subject: Remove excess "virtual" keyword from destructors in Qt Gui
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Destructors whose base class have a virtual destructor are
automatically virtual and do not need to be marked as such.

Change-Id: I84c73ab965077bbb03f4213e53c241569213cae0
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
---
 src/gui/accessible/qaccessibleobject.h    | 2 +-
 src/gui/image/qimageiohandler.h           | 2 +-
 src/gui/itemmodels/qstandarditemmodel_p.h | 2 +-
 src/gui/kernel/qguiapplication.h          | 2 +-
 src/gui/kernel/qoffscreensurface.h        | 2 +-
 src/gui/kernel/qopenglcontext_p.h         | 2 +-
 src/gui/kernel/qplatformdialoghelper.h    | 2 +-
 src/gui/kernel/qplatformgraphicsbuffer.h  | 2 +-
 src/gui/kernel/qplatforminputcontext.h    | 2 +-
 src/gui/kernel/qsessionmanager_p.h        | 2 +-
 src/gui/kernel/qsimpledrag_p.h            | 2 +-
 src/gui/kernel/qwindow.h                  | 2 +-
 src/gui/opengl/qopenglpaintdevice.h       | 2 +-
 src/gui/opengl/qopenglshaderprogram.h     | 4 ++--
 src/gui/painting/qpdfwriter.cpp           | 2 +-
 src/gui/text/qsyntaxhighlighter.h         | 2 +-
 src/gui/text/qtextodfwriter.cpp           | 2 +-
 17 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/gui/accessible/qaccessibleobject.h b/src/gui/accessible/qaccessibleobject.h
index 81479c32ab..fd07d33a18 100644
--- a/src/gui/accessible/qaccessibleobject.h
+++ b/src/gui/accessible/qaccessibleobject.h
@@ -65,7 +65,7 @@ public:
     QAccessibleInterface *childAt(int x, int y) const override;
 
 protected:
-    virtual ~QAccessibleObject();
+    ~QAccessibleObject();
 
 private:
     QAccessibleObjectPrivate *d;
diff --git a/src/gui/image/qimageiohandler.h b/src/gui/image/qimageiohandler.h
index 35984dd6a5..990df96534 100644
--- a/src/gui/image/qimageiohandler.h
+++ b/src/gui/image/qimageiohandler.h
@@ -141,7 +141,7 @@ class Q_GUI_EXPORT QImageIOPlugin : public QObject
     Q_OBJECT
 public:
     explicit QImageIOPlugin(QObject *parent = nullptr);
-    virtual ~QImageIOPlugin();
+    ~QImageIOPlugin();
 
     enum Capability {
         CanRead = 0x1,
diff --git a/src/gui/itemmodels/qstandarditemmodel_p.h b/src/gui/itemmodels/qstandarditemmodel_p.h
index 00e83f7b08..23d2938bc4 100644
--- a/src/gui/itemmodels/qstandarditemmodel_p.h
+++ b/src/gui/itemmodels/qstandarditemmodel_p.h
@@ -207,7 +207,7 @@ class QStandardItemModelPrivate : public QAbstractItemModelPrivate
 
 public:
     QStandardItemModelPrivate();
-    virtual ~QStandardItemModelPrivate();
+    ~QStandardItemModelPrivate();
 
     void init();
 
diff --git a/src/gui/kernel/qguiapplication.h b/src/gui/kernel/qguiapplication.h
index 02dffef0fe..5ea72fa0f6 100644
--- a/src/gui/kernel/qguiapplication.h
+++ b/src/gui/kernel/qguiapplication.h
@@ -86,7 +86,7 @@ public:
 #else
     QGuiApplication(int &argc, char **argv, int = ApplicationFlags);
 #endif
-    virtual ~QGuiApplication();
+    ~QGuiApplication();
 
     static void setApplicationDisplayName(const QString &name);
     static QString applicationDisplayName();
diff --git a/src/gui/kernel/qoffscreensurface.h b/src/gui/kernel/qoffscreensurface.h
index 9d4839cb25..1b9e7c00ca 100644
--- a/src/gui/kernel/qoffscreensurface.h
+++ b/src/gui/kernel/qoffscreensurface.h
@@ -60,7 +60,7 @@ public:
     // ### Qt 6: merge overloads
     explicit QOffscreenSurface(QScreen *screen, QObject *parent);
     explicit QOffscreenSurface(QScreen *screen = nullptr);
-    virtual ~QOffscreenSurface();
+    ~QOffscreenSurface();
 
     SurfaceType surfaceType() const override;
 
diff --git a/src/gui/kernel/qopenglcontext_p.h b/src/gui/kernel/qopenglcontext_p.h
index 4f2f951d61..1cb7390687 100644
--- a/src/gui/kernel/qopenglcontext_p.h
+++ b/src/gui/kernel/qopenglcontext_p.h
@@ -219,7 +219,7 @@ public:
         requestedFormat = QSurfaceFormat::defaultFormat();
     }
 
-    virtual ~QOpenGLContextPrivate()
+    ~QOpenGLContextPrivate()
     {
         //do not delete the QOpenGLContext handle here as it is deleted in
         //QWidgetPrivate::deleteTLSysExtra()
diff --git a/src/gui/kernel/qplatformdialoghelper.h b/src/gui/kernel/qplatformdialoghelper.h
index 64b703e524..3000bd1af1 100644
--- a/src/gui/kernel/qplatformdialoghelper.h
+++ b/src/gui/kernel/qplatformdialoghelper.h
@@ -153,7 +153,7 @@ public:
     Q_ENUM(ButtonLayout)
 
     QPlatformDialogHelper();
-    virtual ~QPlatformDialogHelper();
+    ~QPlatformDialogHelper();
 
     virtual QVariant styleHint(StyleHint hint) const;
 
diff --git a/src/gui/kernel/qplatformgraphicsbuffer.h b/src/gui/kernel/qplatformgraphicsbuffer.h
index 0aeef946e6..65c24bebc9 100644
--- a/src/gui/kernel/qplatformgraphicsbuffer.h
+++ b/src/gui/kernel/qplatformgraphicsbuffer.h
@@ -78,7 +78,7 @@ public:
         OriginTopLeft
     };
 
-    virtual ~QPlatformGraphicsBuffer();
+    ~QPlatformGraphicsBuffer();
 
     AccessTypes isLocked() const { return m_lock_access; }
     bool lock(AccessTypes access, const QRect &rect = QRect());
diff --git a/src/gui/kernel/qplatforminputcontext.h b/src/gui/kernel/qplatforminputcontext.h
index 26d40cd2c6..ad0e5bcf35 100644
--- a/src/gui/kernel/qplatforminputcontext.h
+++ b/src/gui/kernel/qplatforminputcontext.h
@@ -67,7 +67,7 @@ public:
     };
 
     QPlatformInputContext();
-    virtual ~QPlatformInputContext();
+    ~QPlatformInputContext();
 
     virtual bool isValid() const;
     virtual bool hasCapability(Capability capability) const;
diff --git a/src/gui/kernel/qsessionmanager_p.h b/src/gui/kernel/qsessionmanager_p.h
index 954443430e..d07d9b5eb8 100644
--- a/src/gui/kernel/qsessionmanager_p.h
+++ b/src/gui/kernel/qsessionmanager_p.h
@@ -69,7 +69,7 @@ public:
     QSessionManagerPrivate(const QString &id,
                            const QString &key);
 
-    virtual ~QSessionManagerPrivate();
+    ~QSessionManagerPrivate();
 
     QPlatformSessionManager *platformSessionManager;
 };
diff --git a/src/gui/kernel/qsimpledrag_p.h b/src/gui/kernel/qsimpledrag_p.h
index f9e8a83a39..8638b05155 100644
--- a/src/gui/kernel/qsimpledrag_p.h
+++ b/src/gui/kernel/qsimpledrag_p.h
@@ -71,7 +71,7 @@ class QScreen;
 class Q_GUI_EXPORT QBasicDrag : public QPlatformDrag, public QObject
 {
 public:
-    virtual ~QBasicDrag();
+    ~QBasicDrag();
 
     virtual Qt::DropAction drag(QDrag *drag) override;
     void cancelDrag() override;
diff --git a/src/gui/kernel/qwindow.h b/src/gui/kernel/qwindow.h
index 439e62d0bd..36d8e7ad0f 100644
--- a/src/gui/kernel/qwindow.h
+++ b/src/gui/kernel/qwindow.h
@@ -143,7 +143,7 @@ public:
 
     explicit QWindow(QScreen *screen = nullptr);
     explicit QWindow(QWindow *parent);
-    virtual ~QWindow();
+    ~QWindow();
 
     void setSurfaceType(SurfaceType surfaceType);
     SurfaceType surfaceType() const override;
diff --git a/src/gui/opengl/qopenglpaintdevice.h b/src/gui/opengl/qopenglpaintdevice.h
index 300002a9c1..54118f2926 100644
--- a/src/gui/opengl/qopenglpaintdevice.h
+++ b/src/gui/opengl/qopenglpaintdevice.h
@@ -59,7 +59,7 @@ public:
     QOpenGLPaintDevice();
     explicit QOpenGLPaintDevice(const QSize &size);
     QOpenGLPaintDevice(int width, int height);
-    virtual ~QOpenGLPaintDevice();
+    ~QOpenGLPaintDevice();
 
     int devType() const override { return QInternal::OpenGL; }
     QPaintEngine *paintEngine() const override;
diff --git a/src/gui/opengl/qopenglshaderprogram.h b/src/gui/opengl/qopenglshaderprogram.h
index 84eb8d6956..bdd18c9d68 100644
--- a/src/gui/opengl/qopenglshaderprogram.h
+++ b/src/gui/opengl/qopenglshaderprogram.h
@@ -80,7 +80,7 @@ public:
     Q_DECLARE_FLAGS(ShaderType, ShaderTypeBit)
 
     explicit QOpenGLShader(QOpenGLShader::ShaderType type, QObject *parent = nullptr);
-    virtual ~QOpenGLShader();
+    ~QOpenGLShader();
 
     QOpenGLShader::ShaderType shaderType() const;
 
@@ -115,7 +115,7 @@ class Q_GUI_EXPORT QOpenGLShaderProgram : public QObject
     Q_OBJECT
 public:
     explicit QOpenGLShaderProgram(QObject *parent = nullptr);
-    virtual ~QOpenGLShaderProgram();
+    ~QOpenGLShaderProgram();
 
     bool addShader(QOpenGLShader *shader);
     void removeShader(QOpenGLShader *shader);
diff --git a/src/gui/painting/qpdfwriter.cpp b/src/gui/painting/qpdfwriter.cpp
index e6c5cabd7f..5f0fad2a4e 100644
--- a/src/gui/painting/qpdfwriter.cpp
+++ b/src/gui/painting/qpdfwriter.cpp
@@ -76,7 +76,7 @@ public:
         : QPagedPaintDevicePrivate(), pd(d)
     {}
 
-    virtual ~QPdfPagedPaintDevicePrivate()
+    ~QPdfPagedPaintDevicePrivate()
     {}
 
     bool setPageLayout(const QPageLayout &newPageLayout) override
diff --git a/src/gui/text/qsyntaxhighlighter.h b/src/gui/text/qsyntaxhighlighter.h
index d87f89f0fd..ad0d50a4c0 100644
--- a/src/gui/text/qsyntaxhighlighter.h
+++ b/src/gui/text/qsyntaxhighlighter.h
@@ -64,7 +64,7 @@ class Q_GUI_EXPORT QSyntaxHighlighter : public QObject
 public:
     explicit QSyntaxHighlighter(QObject *parent);
     explicit QSyntaxHighlighter(QTextDocument *parent);
-    virtual ~QSyntaxHighlighter();
+    ~QSyntaxHighlighter();
 
     void setDocument(QTextDocument *doc);
     QTextDocument *document() const;
diff --git a/src/gui/text/qtextodfwriter.cpp b/src/gui/text/qtextodfwriter.cpp
index d8218ab613..5f6a24cc5d 100644
--- a/src/gui/text/qtextodfwriter.cpp
+++ b/src/gui/text/qtextodfwriter.cpp
@@ -89,7 +89,7 @@ public:
         contentStream = device;
     }
 
-    virtual ~QXmlStreamStrategy()
+    ~QXmlStreamStrategy()
     {
         if (contentStream)
             contentStream->close();
-- 
cgit v1.2.3