From eacd78950282bb835e9b8b4e955b4f93f3c5167f Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 6 Aug 2018 10:45:53 +0200 Subject: 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 --- .../platforms/windows/qwindowsbackingstore.h | 2 +- src/plugins/platforms/windows/qwindowsclipboard.h | 3 +- src/plugins/platforms/windows/qwindowscombase.h | 2 +- .../platforms/windows/qwindowsdialoghelpers.cpp | 6 ++-- .../platforms/windows/qwindowsdialoghelpers.h | 2 +- src/plugins/platforms/windows/qwindowsdrag.cpp | 2 +- src/plugins/platforms/windows/qwindowsdrag.h | 4 +-- .../platforms/windows/qwindowsdropdataobject.cpp | 4 +-- .../platforms/windows/qwindowsdropdataobject.h | 2 +- src/plugins/platforms/windows/qwindowseglcontext.h | 4 +-- .../platforms/windows/qwindowsgdiintegration.h | 2 +- src/plugins/platforms/windows/qwindowsglcontext.h | 12 ++++---- .../platforms/windows/qwindowsinputcontext.h | 3 +- .../platforms/windows/qwindowsintegration.cpp | 1 + .../platforms/windows/qwindowsintegration.h | 3 +- .../platforms/windows/qwindowskeymapper.cpp | 4 +-- src/plugins/platforms/windows/qwindowsmenu.h | 4 +-- src/plugins/platforms/windows/qwindowsmime.cpp | 32 ++++++++++------------ src/plugins/platforms/windows/qwindowsole.cpp | 4 +-- src/plugins/platforms/windows/qwindowsole.h | 4 +-- .../platforms/windows/qwindowsopenglcontext.h | 12 ++++++-- src/plugins/platforms/windows/qwindowsservices.h | 4 +-- .../platforms/windows/qwindowssystemtrayicon.h | 2 +- src/plugins/platforms/windows/qwindowstheme.h | 3 +- .../platforms/windows/qwindowsvulkaninstance.cpp | 4 --- .../platforms/windows/qwindowsvulkaninstance.h | 2 +- src/plugins/platforms/windows/qwindowswindow.h | 5 ++-- 27 files changed, 66 insertions(+), 66 deletions(-) (limited to 'src/plugins/platforms/windows') diff --git a/src/plugins/platforms/windows/qwindowsbackingstore.h b/src/plugins/platforms/windows/qwindowsbackingstore.h index 5692c08b1e..088ab3b257 100644 --- a/src/plugins/platforms/windows/qwindowsbackingstore.h +++ b/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 ®ion, const QPoint &offset) override; diff --git a/src/plugins/platforms/windows/qwindowsclipboard.h b/src/plugins/platforms/windows/qwindowsclipboard.h index 4f3e7437f6..469d638b89 100644 --- a/src/plugins/platforms/windows/qwindowsclipboard.h +++ b/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(); diff --git a/src/plugins/platforms/windows/qwindowscombase.h b/src/plugins/platforms/windows/qwindowscombase.h index 937a2e69ce..6b25d665dc 100644 --- a/src/plugins/platforms/windows/qwindowscombase.h +++ b/src/plugins/platforms/windows/qwindowscombase.h @@ -83,7 +83,7 @@ template 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) { diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp index 635033b43f..681b35eb7c 100644 --- a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp +++ b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp @@ -507,6 +507,7 @@ class QWindowsNativeFileDialogBase; class QWindowsNativeFileDialogEventHandler : public QWindowsComBase { + 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 QWindowsXpNativeFileDialog::execFileNames(HWND owner, int *selectedF class QWindowsXpFileDialogHelper : public QWindowsDialogHelperBase { public: - QWindowsXpFileDialogHelper() {} + QWindowsXpFileDialogHelper() = default; bool supportsNonModalDialog(const QWindow * /* parent */ = 0) const override { return false; } bool defaultNameFilterDisables() const override { return true; } diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.h b/src/plugins/platforms/windows/qwindowsdialoghelpers.h index 1cf0982bad..6099ea9ac6 100644 --- a/src/plugins/platforms/windows/qwindowsdialoghelpers.h +++ b/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; diff --git a/src/plugins/platforms/windows/qwindowsdrag.cpp b/src/plugins/platforms/windows/qwindowsdrag.cpp index 79aef99552..8d4e4dc611 100644 --- a/src/plugins/platforms/windows/qwindowsdrag.cpp +++ b/src/plugins/platforms/windows/qwindowsdrag.cpp @@ -225,7 +225,7 @@ public: }; explicit QWindowsOleDropSource(QWindowsDrag *drag); - virtual ~QWindowsOleDropSource(); + ~QWindowsOleDropSource() override; void createCursors(); diff --git a/src/plugins/platforms/windows/qwindowsdrag.h b/src/plugins/platforms/windows/qwindowsdrag.h index 94f6e682da..f116e50cbf 100644 --- a/src/plugins/platforms/windows/qwindowsdrag.h +++ b/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 { public: explicit QWindowsOleDropTarget(QWindow *w); - virtual ~QWindowsOleDropTarget(); + ~QWindowsOleDropTarget() override; // IDropTarget methods STDMETHOD(DragEnter)(LPDATAOBJECT pDataObj, DWORD grfKeyState, POINTL pt, LPDWORD pdwEffect); diff --git a/src/plugins/platforms/windows/qwindowsdropdataobject.cpp b/src/plugins/platforms/windows/qwindowsdropdataobject.cpp index 26d5c04844..229ff92894 100644 --- a/src/plugins/platforms/windows/qwindowsdropdataobject.cpp +++ b/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) diff --git a/src/plugins/platforms/windows/qwindowsdropdataobject.h b/src/plugins/platforms/windows/qwindowsdropdataobject.h index 5ef72c9336..16ba7b036a 100644 --- a/src/plugins/platforms/windows/qwindowsdropdataobject.h +++ b/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); diff --git a/src/plugins/platforms/windows/qwindowseglcontext.h b/src/plugins/platforms/windows/qwindowseglcontext.h index 3e5f2c81d5..8a1e1ddae8 100644 --- a/src/plugins/platforms/windows/qwindowseglcontext.h +++ b/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; diff --git a/src/plugins/platforms/windows/qwindowsgdiintegration.h b/src/plugins/platforms/windows/qwindowsgdiintegration.h index ec67a99bc9..74ce3ffd49 100644 --- a/src/plugins/platforms/windows/qwindowsgdiintegration.h +++ b/src/plugins/platforms/windows/qwindowsgdiintegration.h @@ -49,7 +49,7 @@ class QWindowsGdiIntegration : public QWindowsIntegration { public: explicit QWindowsGdiIntegration(const QStringList ¶mList); - virtual ~QWindowsGdiIntegration(); + ~QWindowsGdiIntegration() override; QPlatformNativeInterface *nativeInterface() const override; QPlatformPixmap *createPlatformPixmap(QPlatformPixmap::PixelType type) const override; diff --git a/src/plugins/platforms/windows/qwindowsglcontext.h b/src/plugins/platforms/windows/qwindowsglcontext.h index 8c96a8dd0c..199f8112e3 100644 --- a/src/plugins/platforms/windows/qwindowsglcontext.h +++ b/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; } diff --git a/src/plugins/platforms/windows/qwindowsinputcontext.h b/src/plugins/platforms/windows/qwindowsinputcontext.h index 8668efbb15..a47585c29e 100644 --- a/src/plugins/platforms/windows/qwindowsinputcontext.h +++ b/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); diff --git a/src/plugins/platforms/windows/qwindowsintegration.cpp b/src/plugins/platforms/windows/qwindowsintegration.cpp index 4c31808c2d..1a1d51cae1 100644 --- a/src/plugins/platforms/windows/qwindowsintegration.cpp +++ b/src/plugins/platforms/windows/qwindowsintegration.cpp @@ -133,6 +133,7 @@ QT_BEGIN_NAMESPACE struct QWindowsIntegrationPrivate { + Q_DISABLE_COPY(QWindowsIntegrationPrivate) explicit QWindowsIntegrationPrivate(const QStringList ¶mList); ~QWindowsIntegrationPrivate(); diff --git a/src/plugins/platforms/windows/qwindowsintegration.h b/src/plugins/platforms/windows/qwindowsintegration.h index ef074e309e..25f485679d 100644 --- a/src/plugins/platforms/windows/qwindowsintegration.h +++ b/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 ¶mList); - virtual ~QWindowsIntegration(); + ~QWindowsIntegration() override; bool hasCapability(QPlatformIntegration::Capability cap) const override; diff --git a/src/plugins/platforms/windows/qwindowskeymapper.cpp b/src/plugins/platforms/windows/qwindowskeymapper.cpp index a2b5573f78..e7efd6e057 100644 --- a/src/plugins/platforms/windows/qwindowskeymapper.cpp +++ b/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 diff --git a/src/plugins/platforms/windows/qwindowsmenu.h b/src/plugins/platforms/windows/qwindowsmenu.h index 6ed8315417..6de1553f35 100644 --- a/src/plugins/platforms/windows/qwindowsmenu.h +++ b/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 Menus; QWindowsMenuBar(); - ~QWindowsMenuBar(); + ~QWindowsMenuBar() override; void insertMenu(QPlatformMenu *menu, QPlatformMenu *before) override; void removeMenu(QPlatformMenu *menu) override; diff --git a/src/plugins/platforms/windows/qwindowsmime.cpp b/src/plugins/platforms/windows/qwindowsmime.cpp index 98fccb118d..ff0dccb0d9 100644 --- a/src/plugins/platforms/windows/qwindowsmime.cpp +++ b/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 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 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 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 formatsForMime(const QString &mimeType, const QMimeData *mimeData) const override; private: int CF_INETURL_W; // wide char version int CF_INETURL; diff --git a/src/plugins/platforms/windows/qwindowsole.cpp b/src/plugins/platforms/windows/qwindowsole.cpp index 5ecdf46cea..ad0442c8bd 100644 --- a/src/plugins/platforms/windows/qwindowsole.cpp +++ b/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() { diff --git a/src/plugins/platforms/windows/qwindowsole.h b/src/plugins/platforms/windows/qwindowsole.h index cc971b6464..6940657e88 100644 --- a/src/plugins/platforms/windows/qwindowsole.h +++ b/src/plugins/platforms/windows/qwindowsole.h @@ -58,7 +58,7 @@ class QWindowsOleDataObject : public QWindowsComBase { public: explicit QWindowsOleDataObject(QMimeData *mimeData); - virtual ~QWindowsOleDataObject(); + ~QWindowsOleDataObject() override; void releaseQt(); QMimeData *mimeData() const; @@ -88,7 +88,7 @@ class QWindowsOleEnumFmtEtc : public QWindowsComBase public: explicit QWindowsOleEnumFmtEtc(const QVector &fmtetcs); explicit QWindowsOleEnumFmtEtc(const QVector &lpfmtetcs); - virtual ~QWindowsOleEnumFmtEtc(); + ~QWindowsOleEnumFmtEtc() override; bool isNull() const; diff --git a/src/plugins/platforms/windows/qwindowsopenglcontext.h b/src/plugins/platforms/windows/qwindowsopenglcontext.h index d162acdde3..cc6d93d35e 100644 --- a/src/plugins/platforms/windows/qwindowsopenglcontext.h +++ b/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 diff --git a/src/plugins/platforms/windows/qwindowsservices.h b/src/plugins/platforms/windows/qwindowsservices.h index 7518a52755..5feb7c8490 100644 --- a/src/plugins/platforms/windows/qwindowsservices.h +++ b/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 diff --git a/src/plugins/platforms/windows/qwindowssystemtrayicon.h b/src/plugins/platforms/windows/qwindowssystemtrayicon.h index 1f696180cd..a8adb9641f 100644 --- a/src/plugins/platforms/windows/qwindowssystemtrayicon.h +++ b/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; diff --git a/src/plugins/platforms/windows/qwindowstheme.h b/src/plugins/platforms/windows/qwindowstheme.h index f6e60a268b..c132f20167 100644 --- a/src/plugins/platforms/windows/qwindowstheme.h +++ b/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; } diff --git a/src/plugins/platforms/windows/qwindowsvulkaninstance.cpp b/src/plugins/platforms/windows/qwindowsvulkaninstance.cpp index 5ffb4375ce..7a01483abd 100644 --- a/src/plugins/platforms/windows/qwindowsvulkaninstance.cpp +++ b/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) diff --git a/src/plugins/platforms/windows/qwindowsvulkaninstance.h b/src/plugins/platforms/windows/qwindowsvulkaninstance.h index 40442c63d0..3292137c39 100644 --- a/src/plugins/platforms/windows/qwindowsvulkaninstance.h +++ b/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; diff --git a/src/plugins/platforms/windows/qwindowswindow.h b/src/plugins/platforms/windows/qwindowswindow.h index 8f030f1917..e8c30bd44b 100644 --- a/src/plugins/platforms/windows/qwindowswindow.h +++ b/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; -- cgit v1.2.3