Windows QPA: Fix clang-tidy-warnings about class definitions

- Use ' = default' for trivial constructors/destructors
- Remove unneeded destructors
- replace virtual by override or add override where applicable
- Add Q_DISABLE_COPY

Change-Id: Ic7a61579dbc845769beada4fc79bb5dd310e5e52
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

src/plugins/platforms/windows/qwindowsbackingstore.h

@@ -55,7 +55,7 @@ class QWindowsBackingStore : public QPlatformBackingStore
     Q_DISABLE_COPY(QWindowsBackingStore)
 public:
     QWindowsBackingStore(QWindow *window);
-    ~QWindowsBackingStore();
+    ~QWindowsBackingStore() override;
 
     QPaintDevice *paintDevice() override;
     void flush(QWindow *window, const QRegion &region, const QPoint &offset) override;

src/plugins/platforms/windows/qwindowsclipboard.h

@@ -58,9 +58,10 @@ protected:
 
 class QWindowsClipboard : public QPlatformClipboard
 {
+    Q_DISABLE_COPY(QWindowsClipboard)
 public:
     QWindowsClipboard();
-    ~QWindowsClipboard();
+    ~QWindowsClipboard() override;
     void registerViewer(); // Call in initialization, when context is up.
     void cleanup();
 

src/plugins/platforms/windows/qwindowscombase.h

@@ -83,7 +83,7 @@ template <class ComInterface> class QWindowsComBase : public ComInterface
     Q_DISABLE_COPY(QWindowsComBase)
 public:
     explicit QWindowsComBase(ULONG initialRefCount = 1) : m_ref(initialRefCount) {}
-    virtual ~QWindowsComBase() {}
+    virtual ~QWindowsComBase() = default;
 
     HRESULT STDMETHODCALLTYPE QueryInterface(REFIID id, LPVOID *iface)
     {

src/plugins/platforms/windows/qwindowsdialoghelpers.cpp

@@ -507,6 +507,7 @@ class QWindowsNativeFileDialogBase;
 
 class QWindowsNativeFileDialogEventHandler : public QWindowsComBase<IFileDialogEvents>
 {
+    Q_DISABLE_COPY(QWindowsNativeFileDialogEventHandler)
 public:
     static IFileDialogEvents *create(QWindowsNativeFileDialogBase *nativeFileDialog);
 
@@ -522,7 +523,6 @@ public:
 
     QWindowsNativeFileDialogEventHandler(QWindowsNativeFileDialogBase *nativeFileDialog) :
         m_nativeFileDialog(nativeFileDialog) {}
-    virtual ~QWindowsNativeFileDialogEventHandler() {}
 
 private:
     QWindowsNativeFileDialogBase *m_nativeFileDialog;
@@ -786,7 +786,7 @@ class QWindowsNativeFileDialogBase : public QWindowsNativeDialogBase
     Q_OBJECT
     Q_PROPERTY(bool hideFiltersDetails READ hideFiltersDetails WRITE setHideFiltersDetails)
 public:
-    ~QWindowsNativeFileDialogBase();
+    ~QWindowsNativeFileDialogBase() override;
 
     inline static QWindowsNativeFileDialogBase *create(QFileDialogOptions::AcceptMode am, const QWindowsFileDialogSharedData &data);
 
@@ -1873,7 +1873,7 @@ QList<QUrl> QWindowsXpNativeFileDialog::execFileNames(HWND owner, int *selectedF
 class QWindowsXpFileDialogHelper : public QWindowsDialogHelperBase<QPlatformFileDialogHelper>
 {
 public:
-    QWindowsXpFileDialogHelper() {}
+    QWindowsXpFileDialogHelper() = default;
     bool supportsNonModalDialog(const QWindow * /* parent */ = 0) const override { return false; }
     bool defaultNameFilterDisables() const override
         { return true; }

src/plugins/platforms/windows/qwindowsdialoghelpers.h

@@ -78,7 +78,7 @@ public:
     virtual bool supportsNonModalDialog(const QWindow * /* parent */ = 0) const { return true; }
 
 protected:
-    QWindowsDialogHelperBase() {}
+    QWindowsDialogHelperBase() = default;
     QWindowsNativeDialogBase *nativeDialog() const;
     inline bool hasNativeDialog() const { return m_nativeDialog; }
     void timerEvent(QTimerEvent *) override;

src/plugins/platforms/windows/qwindowsdrag.cpp

@@ -225,7 +225,7 @@ public:
     };
 
     explicit QWindowsOleDropSource(QWindowsDrag *drag);
-    virtual ~QWindowsOleDropSource();
+    ~QWindowsOleDropSource() override;
 
     void createCursors();
 

src/plugins/platforms/windows/qwindowsdrag.h

@@ -55,7 +55,7 @@ class QPlatformScreen;
 
 class QWindowsDropMimeData : public QWindowsInternalMimeData {
 public:
-    QWindowsDropMimeData() {}
+    QWindowsDropMimeData() = default;
     IDataObject *retrieveDataObject() const override;
 };
 
@@ -63,7 +63,7 @@ class QWindowsOleDropTarget : public QWindowsComBase<IDropTarget>
 {
 public:
     explicit QWindowsOleDropTarget(QWindow *w);
-    virtual ~QWindowsOleDropTarget();
+    ~QWindowsOleDropTarget() override;
 
     // IDropTarget methods
     STDMETHOD(DragEnter)(LPDATAOBJECT pDataObj, DWORD grfKeyState, POINTL pt, LPDWORD pdwEffect);

src/plugins/platforms/windows/qwindowsdropdataobject.cpp

@@ -60,9 +60,7 @@ QWindowsDropDataObject::QWindowsDropDataObject(QMimeData *mimeData) :
 {
 }
 
-QWindowsDropDataObject::~QWindowsDropDataObject()
-{
-}
+QWindowsDropDataObject::~QWindowsDropDataObject() = default;
 
 STDMETHODIMP
 QWindowsDropDataObject::GetData(LPFORMATETC pformatetc, LPSTGMEDIUM pmedium)

src/plugins/platforms/windows/qwindowsdropdataobject.h

@@ -48,7 +48,7 @@ class QWindowsDropDataObject : public QWindowsOleDataObject
 {
 public:
     explicit QWindowsDropDataObject(QMimeData *mimeData);
-    virtual ~QWindowsDropDataObject();
+    ~QWindowsDropDataObject() override;
 
     // overridden IDataObject methods
     STDMETHOD(GetData)(LPFORMATETC pformatetcIn, LPSTGMEDIUM pmedium);

src/plugins/platforms/windows/qwindowseglcontext.h

@@ -113,7 +113,7 @@ class QWindowsEGLStaticContext : public QWindowsStaticOpenGLContext
 
 public:
     static QWindowsEGLStaticContext *create(QWindowsOpenGLTester::Renderers preferredType);
-    ~QWindowsEGLStaticContext();
+    ~QWindowsEGLStaticContext() override;
 
     EGLDisplay display() const { return m_display; }
 
@@ -143,7 +143,7 @@ public:
     QWindowsEGLContext(QWindowsEGLStaticContext *staticContext,
                        const QSurfaceFormat &format,
                        QPlatformOpenGLContext *share);
-    ~QWindowsEGLContext();
+    ~QWindowsEGLContext() override;
 
     bool makeCurrent(QPlatformSurface *surface) override;
     void doneCurrent() override;

src/plugins/platforms/windows/qwindowsgdiintegration.h

@@ -49,7 +49,7 @@ class QWindowsGdiIntegration : public QWindowsIntegration
 {
 public:
     explicit QWindowsGdiIntegration(const QStringList &paramList);
-    virtual ~QWindowsGdiIntegration();
+    ~QWindowsGdiIntegration() override;
 
     QPlatformNativeInterface *nativeInterface() const override;
     QPlatformPixmap *createPlatformPixmap(QPlatformPixmap::PixelType type) const override;

src/plugins/platforms/windows/qwindowsglcontext.h

@@ -170,13 +170,15 @@ public:
     static QOpenGLStaticContext *create(bool softwareRendering = false);
     static QByteArray getGlString(unsigned int which);
 
-    QWindowsOpenGLContext *createContext(QOpenGLContext *context);
-    void *moduleHandle() const { return opengl32.moduleHandle(); }
-    QOpenGLContext::OpenGLModuleType moduleType() const { return QOpenGLContext::LibGL; }
+    QWindowsOpenGLContext *createContext(QOpenGLContext *context) override;
+    void *moduleHandle() const override { return opengl32.moduleHandle(); }
+    QOpenGLContext::OpenGLModuleType moduleType() const override
+    { return QOpenGLContext::LibGL; }
 
     // For a regular opengl32.dll report the ThreadedOpenGL capability.
     // For others, which are likely to be software-only, don't.
-    bool supportsThreadedOpenGL() const { return !opengl32.moduleIsNotOpengl32(); }
+    bool supportsThreadedOpenGL() const override
+    { return !opengl32.moduleIsNotOpengl32(); }
 
     const QByteArray vendor;
     const QByteArray renderer;
@@ -198,7 +200,7 @@ class QWindowsGLContext : public QWindowsOpenGLContext
 {
 public:
     explicit QWindowsGLContext(QOpenGLStaticContext *staticContext, QOpenGLContext *context);
-    ~QWindowsGLContext();
+    ~QWindowsGLContext() override;
     bool isSharing() const override { return m_context->shareHandle(); }
     bool isValid() const override { return m_renderingContext && !m_lost; }
     QSurfaceFormat format() const override { return m_obtainedFormat; }

src/plugins/platforms/windows/qwindowsinputcontext.h

@@ -53,6 +53,7 @@ class QWindowsWindow;
 
 class QWindowsInputContext : public QPlatformInputContext
 {
+    Q_DISABLE_COPY(QWindowsInputContext)
     Q_OBJECT
 
     struct CompositionContext
@@ -65,7 +66,7 @@ class QWindowsInputContext : public QPlatformInputContext
     };
 public:
     explicit QWindowsInputContext();
-    ~QWindowsInputContext();
+    ~QWindowsInputContext() override;
 
     static void setWindowsImeEnabled(QWindowsWindow *platformWindow, bool enabled);
 

src/plugins/platforms/windows/qwindowsintegration.cpp

@@ -133,6 +133,7 @@ QT_BEGIN_NAMESPACE
 
 struct QWindowsIntegrationPrivate
 {
+    Q_DISABLE_COPY(QWindowsIntegrationPrivate)
     explicit QWindowsIntegrationPrivate(const QStringList &paramList);
     ~QWindowsIntegrationPrivate();
 

src/plugins/platforms/windows/qwindowsintegration.h

@@ -54,6 +54,7 @@ class QWindowsStaticOpenGLContext;
 
 class QWindowsIntegration : public QPlatformIntegration
 {
+    Q_DISABLE_COPY(QWindowsIntegration)
 public:
     enum Options { // Options to be passed on command line.
         FontDatabaseFreeType = 0x1,
@@ -71,7 +72,7 @@ public:
     };
 
     explicit QWindowsIntegration(const QStringList &paramList);
-    virtual ~QWindowsIntegration();
+    ~QWindowsIntegration() override;
 
     bool hasCapability(QPlatformIntegration::Capability cap) const override;
 

src/plugins/platforms/windows/qwindowskeymapper.cpp

@@ -106,9 +106,7 @@ QWindowsKeyMapper::QWindowsKeyMapper()
     changeKeyboard();
 }
 
-QWindowsKeyMapper::~QWindowsKeyMapper()
-{
-}
+QWindowsKeyMapper::~QWindowsKeyMapper()= default;
 
 #ifndef LANG_PASHTO
 #define LANG_PASHTO 0x63

src/plugins/platforms/windows/qwindowsmenu.h

@@ -60,7 +60,7 @@ class QWindowsMenuItem : public QPlatformMenuItem
     Q_OBJECT
 public:
     explicit QWindowsMenuItem(QWindowsMenu *parentMenu = nullptr);
-    ~QWindowsMenuItem();
+    ~QWindowsMenuItem() override;
 
     void setText(const QString &text) override;
     void setIcon(const QIcon &icon) override;
@@ -199,7 +199,7 @@ public:
     typedef QVector<QWindowsMenu *> Menus;
 
     QWindowsMenuBar();
-    ~QWindowsMenuBar();
+    ~QWindowsMenuBar() override;
 
     void insertMenu(QPlatformMenu *menu, QPlatformMenu *before) override;
     void removeMenu(QPlatformMenu *menu) override;

src/plugins/platforms/windows/qwindowsmime.cpp

@@ -488,17 +488,13 @@ QDebug operator<<(QDebug d, IDataObject *dataObj)
 Constructs a new conversion object, adding it to the globally accessed
 list of available converters.
 */
-QWindowsMime::QWindowsMime()
-{
-}
+QWindowsMime::QWindowsMime() = default;
 
 /*!
 Destroys a conversion object, removing it from the global
 list of available converters.
 */
-QWindowsMime::~QWindowsMime()
-{
-}
+QWindowsMime::~QWindowsMime() = default;
 
 /*!
     Registers the MIME type \a mime, and returns an ID number
@@ -574,12 +570,12 @@ int QWindowsMime::registerMimeType(const QString &mime)
 class QWindowsMimeText : public QWindowsMime
 {
 public:
-    bool canConvertToMime(const QString &mimeType, IDataObject *pDataObj) const;
-    QVariant convertToMime(const QString &mime, LPDATAOBJECT pDataObj, QVariant::Type preferredType) const;
-    QString mimeForFormat(const FORMATETC &formatetc) const;
-    bool canConvertFromMime(const FORMATETC &formatetc, const QMimeData *mimeData) const;
-    bool convertFromMime(const FORMATETC &formatetc, const QMimeData *mimeData, STGMEDIUM *pmedium) const;
-    QVector<FORMATETC> formatsForMime(const QString &mimeType, const QMimeData *mimeData) const;
+    bool canConvertToMime(const QString &mimeType, IDataObject *pDataObj) const override;
+    QVariant convertToMime(const QString &mime, LPDATAOBJECT pDataObj, QVariant::Type preferredType) const override;
+    QString mimeForFormat(const FORMATETC &formatetc) const override;
+    bool canConvertFromMime(const FORMATETC &formatetc, const QMimeData *mimeData) const override;
+    bool convertFromMime(const FORMATETC &formatetc, const QMimeData *mimeData, STGMEDIUM *pmedium) const override;
+    QVector<FORMATETC> formatsForMime(const QString &mimeType, const QMimeData *mimeData) const override;
 };
 
 bool QWindowsMimeText::canConvertFromMime(const FORMATETC &formatetc, const QMimeData *mimeData) const
@@ -731,12 +727,12 @@ class QWindowsMimeURI : public QWindowsMime
 {
 public:
     QWindowsMimeURI();
-    bool canConvertToMime(const QString &mimeType, IDataObject *pDataObj) const;
-    QVariant convertToMime(const QString &mime, LPDATAOBJECT pDataObj, QVariant::Type preferredType) const;
-    QString mimeForFormat(const FORMATETC &formatetc) const;
-    bool canConvertFromMime(const FORMATETC &formatetc, const QMimeData *mimeData) const;
-    bool convertFromMime(const FORMATETC &formatetc, const QMimeData *mimeData, STGMEDIUM *pmedium) const;
-    QVector<FORMATETC> formatsForMime(const QString &mimeType, const QMimeData *mimeData) const;
+    bool canConvertToMime(const QString &mimeType, IDataObject *pDataObj) const override;
+    QVariant convertToMime(const QString &mime, LPDATAOBJECT pDataObj, QVariant::Type preferredType) const override;
+    QString mimeForFormat(const FORMATETC &formatetc) const override;
+    bool canConvertFromMime(const FORMATETC &formatetc, const QMimeData *mimeData) const override;
+    bool convertFromMime(const FORMATETC &formatetc, const QMimeData *mimeData, STGMEDIUM *pmedium) const override;
+    QVector<FORMATETC> formatsForMime(const QString &mimeType, const QMimeData *mimeData) const override;
 private:
     int CF_INETURL_W; // wide char version
     int CF_INETURL;

src/plugins/platforms/windows/qwindowsole.cpp

@@ -80,9 +80,7 @@ QWindowsOleDataObject::QWindowsOleDataObject(QMimeData *mimeData) :
     qCDebug(lcQpaMime) << __FUNCTION__ << mimeData->formats();
 }
 
-QWindowsOleDataObject::~QWindowsOleDataObject()
-{
-}
+QWindowsOleDataObject::~QWindowsOleDataObject() = default;
 
 void QWindowsOleDataObject::releaseQt()
 {

src/plugins/platforms/windows/qwindowsole.h

@@ -58,7 +58,7 @@ class QWindowsOleDataObject : public QWindowsComBase<IDataObject>
 {
 public:
     explicit QWindowsOleDataObject(QMimeData *mimeData);
-    virtual ~QWindowsOleDataObject();
+    ~QWindowsOleDataObject() override;
 
     void releaseQt();
     QMimeData *mimeData() const;
@@ -88,7 +88,7 @@ class QWindowsOleEnumFmtEtc : public QWindowsComBase<IEnumFORMATETC>
 public:
     explicit QWindowsOleEnumFmtEtc(const QVector<FORMATETC> &fmtetcs);
     explicit QWindowsOleEnumFmtEtc(const QVector<LPFORMATETC> &lpfmtetcs);
-    virtual ~QWindowsOleEnumFmtEtc();
+    ~QWindowsOleEnumFmtEtc() override;
 
     bool isNull() const;
 

src/plugins/platforms/windows/qwindowsopenglcontext.h

@@ -51,9 +51,10 @@ class QWindowsOpenGLContext;
 
 class QWindowsStaticOpenGLContext
 {
+    Q_DISABLE_COPY(QWindowsStaticOpenGLContext)
 public:
     static QWindowsStaticOpenGLContext *create();
-    virtual ~QWindowsStaticOpenGLContext() { }
+    virtual ~QWindowsStaticOpenGLContext() = default;
 
     virtual QWindowsOpenGLContext *createContext(QOpenGLContext *context) = 0;
     virtual void *moduleHandle() const = 0;
@@ -65,15 +66,17 @@ public:
     virtual void *createWindowSurface(void * /*nativeWindow*/, void * /*nativeConfig*/, int * /*err*/) { return 0; }
     virtual void destroyWindowSurface(void * /*nativeSurface*/) { }
 
+protected:
+    QWindowsStaticOpenGLContext() = default;
+
 private:
     static QWindowsStaticOpenGLContext *doCreate();
 };
 
 class QWindowsOpenGLContext : public QPlatformOpenGLContext
 {
+    Q_DISABLE_COPY(QWindowsOpenGLContext)
 public:
-    virtual ~QWindowsOpenGLContext() { }
-
     // Returns the native context handle (e.g. HGLRC for WGL, EGLContext for EGL).
     virtual void *nativeContext() const = 0;
 
@@ -81,6 +84,9 @@ public:
     // For others, like WGL, they are not relevant.
     virtual void *nativeDisplay() const { return 0; }
     virtual void *nativeConfig() const { return 0; }
+
+protected:
+    QWindowsOpenGLContext() = default;
 };
 
 #endif // QT_NO_OPENGL

src/plugins/platforms/windows/qwindowsservices.h

@@ -47,8 +47,8 @@ QT_BEGIN_NAMESPACE
 class QWindowsServices : public QPlatformServices
 {
 public:
-    bool openUrl(const QUrl &url);
-    bool openDocument(const QUrl &url);
+    bool openUrl(const QUrl &url) override;
+    bool openDocument(const QUrl &url) override;
 };
 
 QT_END_NAMESPACE

src/plugins/platforms/windows/qwindowssystemtrayicon.h

@@ -57,7 +57,7 @@ class QWindowsSystemTrayIcon : public QPlatformSystemTrayIcon
 {
 public:
     QWindowsSystemTrayIcon();
-    ~QWindowsSystemTrayIcon();
+    ~QWindowsSystemTrayIcon() override;
 
     void init() override;
     void cleanup() override;

src/plugins/platforms/windows/qwindowstheme.h

@@ -51,9 +51,10 @@ class QWindow;
 
 class QWindowsTheme : public QPlatformTheme
 {
+    Q_DISABLE_COPY(QWindowsTheme)
 public:
     QWindowsTheme();
-    ~QWindowsTheme();
+    ~QWindowsTheme() override;
 
     static QWindowsTheme *instance() { return m_instance; }
 

src/plugins/platforms/windows/qwindowsvulkaninstance.cpp

@@ -62,10 +62,6 @@ void QWindowsVulkanInstance::createOrAdoptInstance()
         qWarning("Failed to find vkGetPhysicalDeviceWin32PresentationSupportKHR");
 }
 
-QWindowsVulkanInstance::~QWindowsVulkanInstance()
-{
-}
-
 bool QWindowsVulkanInstance::supportsPresent(VkPhysicalDevice physicalDevice,
                                              uint32_t queueFamilyIndex,
                                              QWindow *window)

src/plugins/platforms/windows/qwindowsvulkaninstance.h

@@ -53,9 +53,9 @@ QT_BEGIN_NAMESPACE
 
 class QWindowsVulkanInstance : public QBasicPlatformVulkanInstance
 {
+    Q_DISABLE_COPY(QWindowsVulkanInstance)
 public:
     QWindowsVulkanInstance(QVulkanInstance *instance);
-    ~QWindowsVulkanInstance();
 
     void createOrAdoptInstance() override;
     bool supportsPresent(VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, QWindow *window) override;

src/plugins/platforms/windows/qwindowswindow.h

@@ -59,7 +59,7 @@ class QDebug;
 
 struct QWindowsGeometryHint
 {
-    QWindowsGeometryHint() {}
+    QWindowsGeometryHint() = default;
     explicit QWindowsGeometryHint(const QWindow *w, const QMargins &customMargins);
     static QMargins frame(DWORD style, DWORD exStyle);
     static bool handleCalculateSize(const QMargins &customMargins, const MSG &msg, LRESULT *result);
@@ -120,6 +120,7 @@ struct QWindowsWindowData
 
 class QWindowsBaseWindow : public QPlatformWindow
 {
+    Q_DISABLE_COPY(QWindowsBaseWindow)
 public:
     explicit QWindowsBaseWindow(QWindow *window) : QPlatformWindow(window) {}
 
@@ -223,7 +224,7 @@ public:
     };
 
     QWindowsWindow(QWindow *window, const QWindowsWindowData &data);
-    ~QWindowsWindow();
+    ~QWindowsWindow() override;
 
     void initialize() override;