1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build with mingw gcc 9 and -Wsuggest-override

Browse Source 
Change-Id: I780b0761a7f6b19022116b738efa7aca1378b715
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
This commit is contained in:
Kai Koehne 2020-07-23 08:19:45 +02:00
parent 7c861a36f9
commit 177f040c6c
12 changed files with 86 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/corelib/io/qfilesystemengine_win.cpp
View File

@ -413,11 +413,8 @@ public:
{} {}
virtual ~FileOperationProgressSink() {} virtual ~FileOperationProgressSink() {}
ULONG STDMETHODCALLTYPE AddRef() ULONG STDMETHODCALLTYPE AddRef() override { return ++ref; }
{ ULONG STDMETHODCALLTYPE Release() override
return ++ref;
}
ULONG STDMETHODCALLTYPE Release()
{ {
if (--ref == 0) { if (--ref == 0) {
delete this; delete this;
@ -425,7 +422,7 @@ public:
} }
return ref; return ref;
} }
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void **ppvObject) HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void **ppvObject) override
{ {
if (!ppvObject) if (!ppvObject)
return E_POINTER; return E_POINTER;
@ -446,31 +443,30 @@ public:
return E_NOINTERFACE; return E_NOINTERFACE;
} }
HRESULT STDMETHODCALLTYPE StartOperations() HRESULT STDMETHODCALLTYPE StartOperations() override { return S_OK; }
HRESULT STDMETHODCALLTYPE FinishOperations(HRESULT) override { return S_OK; }
HRESULT STDMETHODCALLTYPE PreRenameItem(DWORD, IShellItem *, LPCWSTR) override { return S_OK; }
HRESULT STDMETHODCALLTYPE PostRenameItem(DWORD, IShellItem *, LPCWSTR, HRESULT,
IShellItem *) override
{ return S_OK; } { return S_OK; }
HRESULT STDMETHODCALLTYPE FinishOperations(HRESULT) HRESULT STDMETHODCALLTYPE PreMoveItem(DWORD, IShellItem *, IShellItem *, LPCWSTR) override
{ return S_OK; }
HRESULT STDMETHODCALLTYPE PreRenameItem(DWORD, IShellItem *, LPCWSTR)
{ return S_OK; }
HRESULT STDMETHODCALLTYPE PostRenameItem(DWORD, IShellItem *, LPCWSTR, HRESULT, IShellItem *)
{ return S_OK; }
HRESULT STDMETHODCALLTYPE PreMoveItem(DWORD, IShellItem *, IShellItem *, LPCWSTR)
{ return S_OK; } { return S_OK; }
HRESULT STDMETHODCALLTYPE PostMoveItem(DWORD, IShellItem *, IShellItem *, LPCWSTR, HRESULT, HRESULT STDMETHODCALLTYPE PostMoveItem(DWORD, IShellItem *, IShellItem *, LPCWSTR, HRESULT,
IShellItem *) IShellItem *) override
{ return S_OK; } { return S_OK; }
HRESULT STDMETHODCALLTYPE PreCopyItem(DWORD, IShellItem *, IShellItem *, LPCWSTR ) HRESULT STDMETHODCALLTYPE PreCopyItem(DWORD, IShellItem *, IShellItem *, LPCWSTR) override
{ return S_OK; } { return S_OK; }
HRESULT STDMETHODCALLTYPE PostCopyItem(DWORD, IShellItem *, IShellItem *, LPCWSTR, HRESULT, HRESULT STDMETHODCALLTYPE PostCopyItem(DWORD, IShellItem *, IShellItem *, LPCWSTR, HRESULT,
IShellItem *) IShellItem *) override
{ return S_OK; } { return S_OK; }
HRESULT STDMETHODCALLTYPE PreDeleteItem(DWORD dwFlags, IShellItem *) HRESULT STDMETHODCALLTYPE PreDeleteItem(DWORD dwFlags, IShellItem *) override
{ {
// stop the operation if the file will be deleted rather than trashed // stop the operation if the file will be deleted rather than trashed
return (dwFlags & TSF_DELETE_RECYCLE_IF_POSSIBLE) ? S_OK : E_FAIL; return (dwFlags & TSF_DELETE_RECYCLE_IF_POSSIBLE) ? S_OK : E_FAIL;
} }
HRESULT STDMETHODCALLTYPE PostDeleteItem(DWORD /* dwFlags */, IShellItem * /* psiItem */, HRESULT STDMETHODCALLTYPE PostDeleteItem(DWORD /* dwFlags */, IShellItem * /* psiItem */,
HRESULT /* hrDelete */, IShellItem *psiNewlyCreated) HRESULT /* hrDelete */,
IShellItem *psiNewlyCreated) override
{ {
if (psiNewlyCreated) { if (psiNewlyCreated) {
wchar_t *pszName = nullptr; wchar_t *pszName = nullptr;
@ -482,19 +478,14 @@ public:
} }
return S_OK; return S_OK;
} }
HRESULT STDMETHODCALLTYPE PreNewItem(DWORD, IShellItem *, LPCWSTR) HRESULT STDMETHODCALLTYPE PreNewItem(DWORD, IShellItem *, LPCWSTR) override { return S_OK; }
{ return S_OK; }
HRESULT STDMETHODCALLTYPE PostNewItem(DWORD, IShellItem *, LPCWSTR, LPCWSTR, DWORD, HRESULT, HRESULT STDMETHODCALLTYPE PostNewItem(DWORD, IShellItem *, LPCWSTR, LPCWSTR, DWORD, HRESULT,
IShellItem *) IShellItem *) override
{ return S_OK; }
HRESULT STDMETHODCALLTYPE UpdateProgress(UINT,UINT)
{ return S_OK; }
HRESULT STDMETHODCALLTYPE ResetTimer()
{ return S_OK; }
HRESULT STDMETHODCALLTYPE PauseTimer()
{ return S_OK; }
HRESULT STDMETHODCALLTYPE ResumeTimer()
{ return S_OK; } { return S_OK; }
HRESULT STDMETHODCALLTYPE UpdateProgress(UINT, UINT) override { return S_OK; }
HRESULT STDMETHODCALLTYPE ResetTimer() override { return S_OK; }
HRESULT STDMETHODCALLTYPE PauseTimer() override { return S_OK; }
HRESULT STDMETHODCALLTYPE ResumeTimer() override { return S_OK; }
QString targetPath; QString targetPath;
private: private:

6
src/plugins/platforms/offscreen/qoffscreenintegration.cpp
View File

@ -80,20 +80,20 @@ public:
{ {
} }
bool processEvents(QEventLoop::ProcessEventsFlags flags) bool processEvents(QEventLoop::ProcessEventsFlags flags) override
{ {
bool didSendEvents = BaseEventDispatcher::processEvents(flags); bool didSendEvents = BaseEventDispatcher::processEvents(flags);
return QWindowSystemInterface::sendWindowSystemEvents(flags) || didSendEvents; return QWindowSystemInterface::sendWindowSystemEvents(flags) || didSendEvents;
} }
bool hasPendingEvents() bool hasPendingEvents() override
{ {
return BaseEventDispatcher::hasPendingEvents() return BaseEventDispatcher::hasPendingEvents()
|| QWindowSystemInterface::windowSystemEventsQueued(); || QWindowSystemInterface::windowSystemEventsQueued();
} }
void flush() void flush() override
{ {
if (qApp) if (qApp)
qApp->sendPostedEvents(); qApp->sendPostedEvents();

2
src/plugins/platforms/windows/main.cpp
View File

@ -101,7 +101,7 @@ class QWindowsIntegrationPlugin : public QPlatformIntegrationPlugin
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "windows.json") Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "windows.json")
public: public:
QPlatformIntegration *create(const QString&, const QStringList&, int &, char **); QPlatformIntegration *create(const QString &, const QStringList &, int &, char **) override;
}; };
QPlatformIntegration *QWindowsIntegrationPlugin::create(const QString& system, const QStringList& paramList, int &, char **) QPlatformIntegration *QWindowsIntegrationPlugin::create(const QString& system, const QStringList& paramList, int &, char **)

6
src/plugins/platforms/windows/qwindowscombase.h
View File

@ -85,16 +85,16 @@ public:
explicit QWindowsComBase(ULONG initialRefCount = 1) : m_ref(initialRefCount) {} explicit QWindowsComBase(ULONG initialRefCount = 1) : m_ref(initialRefCount) {}
virtual ~QWindowsComBase() = default; virtual ~QWindowsComBase() = default;
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID id, LPVOID *iface) HRESULT STDMETHODCALLTYPE QueryInterface(REFIID id, LPVOID *iface) override
{ {
*iface = nullptr; *iface = nullptr;
return qWindowsComQueryInterface<IUnknown>(this, id, iface) || qWindowsComQueryInterface<ComInterface>(this, id, iface) return qWindowsComQueryInterface<IUnknown>(this, id, iface) || qWindowsComQueryInterface<ComInterface>(this, id, iface)
? S_OK : E_NOINTERFACE; ? S_OK : E_NOINTERFACE;
} }
ULONG STDMETHODCALLTYPE AddRef() { return ++m_ref; } ULONG STDMETHODCALLTYPE AddRef() override { return ++m_ref; }
ULONG STDMETHODCALLTYPE Release() ULONG STDMETHODCALLTYPE Release() override
{ {
if (!--m_ref) { if (!--m_ref) {
delete this; delete this;

23
src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
View File

@ -273,7 +273,7 @@ public:
explicit QWindowsDialogThread(const QWindowsNativeDialogBasePtr &d, HWND owner) explicit QWindowsDialogThread(const QWindowsNativeDialogBasePtr &d, HWND owner)
: m_dialog(d), m_owner(owner) {} : m_dialog(d), m_owner(owner) {}
void run(); void run() override;
private: private:
const QWindowsNativeDialogBasePtr m_dialog; const QWindowsNativeDialogBasePtr m_dialog;
@ -508,14 +508,21 @@ public:
static IFileDialogEvents *create(QWindowsNativeFileDialogBase *nativeFileDialog); static IFileDialogEvents *create(QWindowsNativeFileDialogBase *nativeFileDialog);
// IFileDialogEvents methods // IFileDialogEvents methods
IFACEMETHODIMP OnFileOk(IFileDialog *); IFACEMETHODIMP OnFileOk(IFileDialog *) override;
IFACEMETHODIMP OnFolderChange(IFileDialog *) { return S_OK; } IFACEMETHODIMP OnFolderChange(IFileDialog *) override { return S_OK; }
IFACEMETHODIMP OnFolderChanging(IFileDialog *, IShellItem *); IFACEMETHODIMP OnFolderChanging(IFileDialog *, IShellItem *) override;
IFACEMETHODIMP OnHelp(IFileDialog *) { return S_OK; } IFACEMETHODIMP OnHelp(IFileDialog *) { return S_OK; }
IFACEMETHODIMP OnSelectionChange(IFileDialog *); IFACEMETHODIMP OnSelectionChange(IFileDialog *) override;
IFACEMETHODIMP OnShareViolation(IFileDialog *, IShellItem *, FDE_SHAREVIOLATION_RESPONSE *) { return S_OK; } IFACEMETHODIMP OnShareViolation(IFileDialog *, IShellItem *,
IFACEMETHODIMP OnTypeChange(IFileDialog *); FDE_SHAREVIOLATION_RESPONSE *) override
IFACEMETHODIMP OnOverwrite(IFileDialog *, IShellItem *, FDE_OVERWRITE_RESPONSE *) { return S_OK; } {
return S_OK;
}
IFACEMETHODIMP OnTypeChange(IFileDialog *) override;
IFACEMETHODIMP OnOverwrite(IFileDialog *, IShellItem *, FDE_OVERWRITE_RESPONSE *) override
{
return S_OK;
}
QWindowsNativeFileDialogEventHandler(QWindowsNativeFileDialogBase *nativeFileDialog) : QWindowsNativeFileDialogEventHandler(QWindowsNativeFileDialogBase *nativeFileDialog) :
m_nativeFileDialog(nativeFileDialog) {} m_nativeFileDialog(nativeFileDialog) {}

4
src/plugins/platforms/windows/qwindowsdrag.cpp
View File

@ -231,8 +231,8 @@ public:
void createCursors(); void createCursors();
// IDropSource methods // IDropSource methods
STDMETHOD(QueryContinueDrag)(BOOL fEscapePressed, DWORD grfKeyState); STDMETHOD(QueryContinueDrag)(BOOL fEscapePressed, DWORD grfKeyState) override;
STDMETHOD(GiveFeedback)(DWORD dwEffect); STDMETHOD(GiveFeedback)(DWORD dwEffect) override;
private: private:
struct CursorEntry { struct CursorEntry {

10
src/plugins/platforms/windows/qwindowsdrag.h
View File

@ -66,10 +66,12 @@ public:
~QWindowsOleDropTarget() override; ~QWindowsOleDropTarget() override;
// IDropTarget methods // IDropTarget methods
STDMETHOD(DragEnter)(LPDATAOBJECT pDataObj, DWORD grfKeyState, POINTL pt, LPDWORD pdwEffect); STDMETHOD(DragEnter)
STDMETHOD(DragOver)(DWORD grfKeyState, POINTL pt, LPDWORD pdwEffect); (LPDATAOBJECT pDataObj, DWORD grfKeyState, POINTL pt, LPDWORD pdwEffect) override;
STDMETHOD(DragLeave)(); STDMETHOD(DragOver)(DWORD grfKeyState, POINTL pt, LPDWORD pdwEffect) override;
STDMETHOD(Drop)(LPDATAOBJECT pDataObj, DWORD grfKeyState, POINTL pt, LPDWORD pdwEffect); STDMETHOD(DragLeave)() override;
STDMETHOD(Drop)
(LPDATAOBJECT pDataObj, DWORD grfKeyState, POINTL pt, LPDWORD pdwEffect) override;
private: private:
void handleDrag(QWindow *window, DWORD grfKeyState, const QPoint &, LPDWORD pdwEffect); void handleDrag(QWindow *window, DWORD grfKeyState, const QPoint &, LPDWORD pdwEffect);

4
src/plugins/platforms/windows/qwindowsdropdataobject.h
View File

@ -51,8 +51,8 @@ public:
~QWindowsDropDataObject() override; ~QWindowsDropDataObject() override;
// overridden IDataObject methods // overridden IDataObject methods
STDMETHOD(GetData)(LPFORMATETC pformatetcIn, LPSTGMEDIUM pmedium); STDMETHOD(GetData)(LPFORMATETC pformatetcIn, LPSTGMEDIUM pmedium) override;
STDMETHOD(QueryGetData)(LPFORMATETC pformatetc); STDMETHOD(QueryGetData)(LPFORMATETC pformatetc) override;
private: private:
bool shouldIgnore(LPFORMATETC pformatetc) const; bool shouldIgnore(LPFORMATETC pformatetc) const;

3
src/plugins/platforms/windows/qwindowsintegration.h
View File

@ -95,7 +95,8 @@ public:
static QWindowsStaticOpenGLContext *staticOpenGLContext(); static QWindowsStaticOpenGLContext *staticOpenGLContext();
HMODULE openGLModuleHandle() const override; HMODULE openGLModuleHandle() const override;
QOpenGLContext *createOpenGLContext(HGLRC context, HWND window, QOpenGLContext *shareContext) const; QOpenGLContext *createOpenGLContext(HGLRC context, HWND window,
QOpenGLContext *shareContext) const override;
#endif #endif
QAbstractEventDispatcher *createEventDispatcher() const override; QAbstractEventDispatcher *createEventDispatcher() const override;
void initialize() override; void initialize() override;

30
src/plugins/platforms/windows/qwindowsole.h
View File

@ -65,17 +65,17 @@ public:
DWORD reportedPerformedEffect() const; DWORD reportedPerformedEffect() const;
// IDataObject methods // IDataObject methods
STDMETHOD(GetData)(LPFORMATETC pformatetcIn, LPSTGMEDIUM pmedium); STDMETHOD(GetData)(LPFORMATETC pformatetcIn, LPSTGMEDIUM pmedium) override;
STDMETHOD(GetDataHere)(LPFORMATETC pformatetc, LPSTGMEDIUM pmedium); STDMETHOD(GetDataHere)(LPFORMATETC pformatetc, LPSTGMEDIUM pmedium) override;
STDMETHOD(QueryGetData)(LPFORMATETC pformatetc); STDMETHOD(QueryGetData)(LPFORMATETC pformatetc) override;
STDMETHOD(GetCanonicalFormatEtc)(LPFORMATETC pformatetc, LPFORMATETC pformatetcOut); STDMETHOD(GetCanonicalFormatEtc)(LPFORMATETC pformatetc, LPFORMATETC pformatetcOut) override;
STDMETHOD(SetData)(LPFORMATETC pformatetc, STGMEDIUM FAR * pmedium, STDMETHOD(SetData)(LPFORMATETC pformatetc, STGMEDIUM FAR *pmedium, BOOL fRelease) override;
BOOL fRelease); STDMETHOD(EnumFormatEtc)(DWORD dwDirection, LPENUMFORMATETC FAR *ppenumFormatEtc) override;
STDMETHOD(EnumFormatEtc)(DWORD dwDirection, LPENUMFORMATETC FAR* ppenumFormatEtc); STDMETHOD(DAdvise)
STDMETHOD(DAdvise)(FORMATETC FAR* pFormatetc, DWORD advf, (FORMATETC FAR *pFormatetc, DWORD advf, LPADVISESINK pAdvSink,
LPADVISESINK pAdvSink, DWORD FAR* pdwConnection); DWORD FAR *pdwConnection) override;
STDMETHOD(DUnadvise)(DWORD dwConnection); STDMETHOD(DUnadvise)(DWORD dwConnection) override;
STDMETHOD(EnumDAdvise)(LPENUMSTATDATA FAR* ppenumAdvise); STDMETHOD(EnumDAdvise)(LPENUMSTATDATA FAR *ppenumAdvise) override;
private: private:
QPointer<QMimeData> data; QPointer<QMimeData> data;
@ -93,10 +93,10 @@ public:
bool isNull() const; bool isNull() const;
// IEnumFORMATETC methods // IEnumFORMATETC methods
STDMETHOD(Next)(ULONG celt, LPFORMATETC rgelt, ULONG FAR* pceltFetched); STDMETHOD(Next)(ULONG celt, LPFORMATETC rgelt, ULONG FAR *pceltFetched) override;
STDMETHOD(Skip)(ULONG celt); STDMETHOD(Skip)(ULONG celt) override;
STDMETHOD(Reset)(void); STDMETHOD(Reset)(void) override;
STDMETHOD(Clone)(LPENUMFORMATETC FAR* newEnum); STDMETHOD(Clone)(LPENUMFORMATETC FAR *newEnum) override;
private: private:
bool copyFormatEtc(LPFORMATETC dest, const FORMATETC *src) const; bool copyFormatEtc(LPFORMATETC dest, const FORMATETC *src) const;

30
src/printsupport/kernel/qprintengine_win_p.h
View File

@ -76,30 +76,30 @@ public:
QWin32PrintEngine(QPrinter::PrinterMode mode, const QString &deviceId); QWin32PrintEngine(QPrinter::PrinterMode mode, const QString &deviceId);
// override QWin32PaintEngine // override QWin32PaintEngine
bool begin(QPaintDevice *dev); bool begin(QPaintDevice *dev) override;
bool end(); bool end() override;
void updateState(const QPaintEngineState &state); void updateState(const QPaintEngineState &state) override;
void updateMatrix(const QTransform &matrix); void updateMatrix(const QTransform &matrix);
void updateClipPath(const QPainterPath &clip, Qt::ClipOperation op); void updateClipPath(const QPainterPath &clip, Qt::ClipOperation op);
void drawPath(const QPainterPath &path); void drawPath(const QPainterPath &path) override;
void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode); void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode) override;
void drawTextItem(const QPointF &p, const QTextItem &textItem); void drawTextItem(const QPointF &p, const QTextItem &textItem) override;
void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr); void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) override;
void drawTiledPixmap(const QRectF &r, const QPixmap &pm, const QPointF &p); void drawTiledPixmap(const QRectF &r, const QPixmap &pm, const QPointF &p) override;
void setProperty(PrintEnginePropertyKey key, const QVariant &value); void setProperty(PrintEnginePropertyKey key, const QVariant &value) override;
QVariant property(PrintEnginePropertyKey key) const; QVariant property(PrintEnginePropertyKey key) const override;
bool newPage(); bool newPage() override;
bool abort(); bool abort() override;
int metric(QPaintDevice::PaintDeviceMetric) const; int metric(QPaintDevice::PaintDeviceMetric) const override;
QPrinter::PrinterState printerState() const; QPrinter::PrinterState printerState() const override;
QPaintEngine::Type type() const { return Windows; } QPaintEngine::Type type() const override { return Windows; }
HDC getDC() const; HDC getDC() const;
void releaseDC(HDC) const; void releaseDC(HDC) const;

2
src/widgets/dialogs/qwizard.cpp
View File

@ -529,7 +529,7 @@ public:
: QWidget(wizard) : QWidget(wizard)
, wizardPrivate(wizardPrivate) {} , wizardPrivate(wizardPrivate) {}
protected: protected:
void paintEvent(QPaintEvent *); void paintEvent(QPaintEvent *) override;
#else #else
QWizardAntiFlickerWidget(QWizard *wizard, QWizardPrivate *) QWizardAntiFlickerWidget(QWizard *wizard, QWizardPrivate *)
: QWidget(wizard) : QWidget(wizard)