Remove excess "virtual" keyword from destructors in Qt Gui
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>bb10
parent
264ad32827
commit
8d26f70145
|
|
@ -65,7 +65,7 @@ public:
|
|||
QAccessibleInterface *childAt(int x, int y) const override;
|
||||
|
||||
protected:
|
||||
virtual ~QAccessibleObject();
|
||||
~QAccessibleObject();
|
||||
|
||||
private:
|
||||
QAccessibleObjectPrivate *d;
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -207,7 +207,7 @@ class QStandardItemModelPrivate : public QAbstractItemModelPrivate
|
|||
|
||||
public:
|
||||
QStandardItemModelPrivate();
|
||||
virtual ~QStandardItemModelPrivate();
|
||||
~QStandardItemModelPrivate();
|
||||
|
||||
void init();
|
||||
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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()
|
||||
|
|
|
|||
|
|
@ -153,7 +153,7 @@ public:
|
|||
Q_ENUM(ButtonLayout)
|
||||
|
||||
QPlatformDialogHelper();
|
||||
virtual ~QPlatformDialogHelper();
|
||||
~QPlatformDialogHelper();
|
||||
|
||||
virtual QVariant styleHint(StyleHint hint) const;
|
||||
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ public:
|
|||
OriginTopLeft
|
||||
};
|
||||
|
||||
virtual ~QPlatformGraphicsBuffer();
|
||||
~QPlatformGraphicsBuffer();
|
||||
|
||||
AccessTypes isLocked() const { return m_lock_access; }
|
||||
bool lock(AccessTypes access, const QRect &rect = QRect());
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ public:
|
|||
};
|
||||
|
||||
QPlatformInputContext();
|
||||
virtual ~QPlatformInputContext();
|
||||
~QPlatformInputContext();
|
||||
|
||||
virtual bool isValid() const;
|
||||
virtual bool hasCapability(Capability capability) const;
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ public:
|
|||
QSessionManagerPrivate(const QString &id,
|
||||
const QString &key);
|
||||
|
||||
virtual ~QSessionManagerPrivate();
|
||||
~QSessionManagerPrivate();
|
||||
|
||||
QPlatformSessionManager *platformSessionManager;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ public:
|
|||
: QPagedPaintDevicePrivate(), pd(d)
|
||||
{}
|
||||
|
||||
virtual ~QPdfPagedPaintDevicePrivate()
|
||||
~QPdfPagedPaintDevicePrivate()
|
||||
{}
|
||||
|
||||
bool setPageLayout(const QPageLayout &newPageLayout) override
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ public:
|
|||
contentStream = device;
|
||||
}
|
||||
|
||||
virtual ~QXmlStreamStrategy()
|
||||
~QXmlStreamStrategy()
|
||||
{
|
||||
if (contentStream)
|
||||
contentStream->close();
|
||||
|
|
|
|||
Loading…
Reference in New Issue