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() {}
ULONG STDMETHODCALLTYPE AddRef()
{
return ++ref;
}
ULONG STDMETHODCALLTYPE Release()
ULONG STDMETHODCALLTYPE AddRef() override { return ++ref; }
ULONG STDMETHODCALLTYPE Release() override
{
if (--ref == 0) {
delete this;
@ -425,7 +422,7 @@ public:
}
return ref;
}
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void **ppvObject)
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void **ppvObject) override
{
if (!ppvObject)
return E_POINTER;
@ -446,31 +443,30 @@ public:
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; }
HRESULT STDMETHODCALLTYPE FinishOperations(HRESULT)
{ 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)
HRESULT STDMETHODCALLTYPE PreMoveItem(DWORD, IShellItem *, IShellItem *, LPCWSTR) override
{ return S_OK; }
HRESULT STDMETHODCALLTYPE PostMoveItem(DWORD, IShellItem *, IShellItem *, LPCWSTR, HRESULT,
IShellItem *)
IShellItem *) override
{ return S_OK; }
HRESULT STDMETHODCALLTYPE PreCopyItem(DWORD, IShellItem *, IShellItem *, LPCWSTR )
HRESULT STDMETHODCALLTYPE PreCopyItem(DWORD, IShellItem *, IShellItem *, LPCWSTR) override
{ return S_OK; }
HRESULT STDMETHODCALLTYPE PostCopyItem(DWORD, IShellItem *, IShellItem *, LPCWSTR, HRESULT,
IShellItem *)
IShellItem *) override
{ 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
return (dwFlags & TSF_DELETE_RECYCLE_IF_POSSIBLE) ? S_OK : E_FAIL;
}
HRESULT STDMETHODCALLTYPE PostDeleteItem(DWORD /* dwFlags */, IShellItem * /* psiItem */,
HRESULT /* hrDelete */, IShellItem *psiNewlyCreated)
HRESULT /* hrDelete */,
IShellItem *psiNewlyCreated) override
{
if (psiNewlyCreated) {
wchar_t *pszName = nullptr;
@ -482,19 +478,14 @@ public:
}
return S_OK;
}
HRESULT STDMETHODCALLTYPE PreNewItem(DWORD, IShellItem *, LPCWSTR)
{ return S_OK; }
HRESULT STDMETHODCALLTYPE PreNewItem(DWORD, IShellItem *, LPCWSTR) override { return S_OK; }
HRESULT STDMETHODCALLTYPE PostNewItem(DWORD, IShellItem *, LPCWSTR, LPCWSTR, DWORD, HRESULT,
IShellItem *)
{ 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()
IShellItem *) override
{ 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;
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);
return QWindowSystemInterface::sendWindowSystemEvents(flags) || didSendEvents;
}
bool hasPendingEvents()
bool hasPendingEvents() override
{
return BaseEventDispatcher::hasPendingEvents()
|| QWindowSystemInterface::windowSystemEventsQueued();
}
void flush()
void flush() override
{
if (qApp)
qApp->sendPostedEvents();

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

@ -101,7 +101,7 @@ class QWindowsIntegrationPlugin : public QPlatformIntegrationPlugin
Q_OBJECT
Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "windows.json")
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 **)

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

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

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

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

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

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

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

@ -66,10 +66,12 @@ public:
~QWindowsOleDropTarget() override;
// IDropTarget methods
STDMETHOD(DragEnter)(LPDATAOBJECT pDataObj, DWORD grfKeyState, POINTL pt, LPDWORD pdwEffect);
STDMETHOD(DragOver)(DWORD grfKeyState, POINTL pt, LPDWORD pdwEffect);
STDMETHOD(DragLeave)();
STDMETHOD(Drop)(LPDATAOBJECT pDataObj, DWORD grfKeyState, POINTL pt, LPDWORD pdwEffect);
STDMETHOD(DragEnter)
(LPDATAOBJECT pDataObj, DWORD grfKeyState, POINTL pt, LPDWORD pdwEffect) override;
STDMETHOD(DragOver)(DWORD grfKeyState, POINTL pt, LPDWORD pdwEffect) override;
STDMETHOD(DragLeave)() override;
STDMETHOD(Drop)
(LPDATAOBJECT pDataObj, DWORD grfKeyState, POINTL pt, LPDWORD pdwEffect) override;
private:
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;
// overridden IDataObject methods
STDMETHOD(GetData)(LPFORMATETC pformatetcIn, LPSTGMEDIUM pmedium);
STDMETHOD(QueryGetData)(LPFORMATETC pformatetc);
STDMETHOD(GetData)(LPFORMATETC pformatetcIn, LPSTGMEDIUM pmedium) override;
STDMETHOD(QueryGetData)(LPFORMATETC pformatetc) override;
private:
bool shouldIgnore(LPFORMATETC pformatetc) const;

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

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

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

@ -65,17 +65,17 @@ public:
DWORD reportedPerformedEffect() const;
// IDataObject methods
STDMETHOD(GetData)(LPFORMATETC pformatetcIn, LPSTGMEDIUM pmedium);
STDMETHOD(GetDataHere)(LPFORMATETC pformatetc, LPSTGMEDIUM pmedium);
STDMETHOD(QueryGetData)(LPFORMATETC pformatetc);
STDMETHOD(GetCanonicalFormatEtc)(LPFORMATETC pformatetc, LPFORMATETC pformatetcOut);
STDMETHOD(SetData)(LPFORMATETC pformatetc, STGMEDIUM FAR * pmedium,
BOOL fRelease);
STDMETHOD(EnumFormatEtc)(DWORD dwDirection, LPENUMFORMATETC FAR* ppenumFormatEtc);
STDMETHOD(DAdvise)(FORMATETC FAR* pFormatetc, DWORD advf,
LPADVISESINK pAdvSink, DWORD FAR* pdwConnection);
STDMETHOD(DUnadvise)(DWORD dwConnection);
STDMETHOD(EnumDAdvise)(LPENUMSTATDATA FAR* ppenumAdvise);
STDMETHOD(GetData)(LPFORMATETC pformatetcIn, LPSTGMEDIUM pmedium) override;
STDMETHOD(GetDataHere)(LPFORMATETC pformatetc, LPSTGMEDIUM pmedium) override;
STDMETHOD(QueryGetData)(LPFORMATETC pformatetc) override;
STDMETHOD(GetCanonicalFormatEtc)(LPFORMATETC pformatetc, LPFORMATETC pformatetcOut) override;
STDMETHOD(SetData)(LPFORMATETC pformatetc, STGMEDIUM FAR *pmedium, BOOL fRelease) override;
STDMETHOD(EnumFormatEtc)(DWORD dwDirection, LPENUMFORMATETC FAR *ppenumFormatEtc) override;
STDMETHOD(DAdvise)
(FORMATETC FAR *pFormatetc, DWORD advf, LPADVISESINK pAdvSink,
DWORD FAR *pdwConnection) override;
STDMETHOD(DUnadvise)(DWORD dwConnection) override;
STDMETHOD(EnumDAdvise)(LPENUMSTATDATA FAR *ppenumAdvise) override;
private:
QPointer<QMimeData> data;
@ -93,10 +93,10 @@ public:
bool isNull() const;
// IEnumFORMATETC methods
STDMETHOD(Next)(ULONG celt, LPFORMATETC rgelt, ULONG FAR* pceltFetched);
STDMETHOD(Skip)(ULONG celt);
STDMETHOD(Reset)(void);
STDMETHOD(Clone)(LPENUMFORMATETC FAR* newEnum);
STDMETHOD(Next)(ULONG celt, LPFORMATETC rgelt, ULONG FAR *pceltFetched) override;
STDMETHOD(Skip)(ULONG celt) override;
STDMETHOD(Reset)(void) override;
STDMETHOD(Clone)(LPENUMFORMATETC FAR *newEnum) override;
private:
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);
// override QWin32PaintEngine
bool begin(QPaintDevice *dev);
bool end();
bool begin(QPaintDevice *dev) override;
bool end() override;
void updateState(const QPaintEngineState &state);
void updateState(const QPaintEngineState &state) override;
void updateMatrix(const QTransform &matrix);
void updateClipPath(const QPainterPath &clip, Qt::ClipOperation op);
void drawPath(const QPainterPath &path);
void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode);
void drawTextItem(const QPointF &p, const QTextItem &textItem);
void drawPath(const QPainterPath &path) override;
void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode) override;
void drawTextItem(const QPointF &p, const QTextItem &textItem) override;
void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr);
void drawTiledPixmap(const QRectF &r, const QPixmap &pm, const QPointF &p);
void setProperty(PrintEnginePropertyKey key, const QVariant &value);
QVariant property(PrintEnginePropertyKey key) const;
void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) override;
void drawTiledPixmap(const QRectF &r, const QPixmap &pm, const QPointF &p) override;
void setProperty(PrintEnginePropertyKey key, const QVariant &value) override;
QVariant property(PrintEnginePropertyKey key) const override;
bool newPage();
bool abort();
int metric(QPaintDevice::PaintDeviceMetric) const;
bool newPage() override;
bool abort() override;
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;
void releaseDC(HDC) const;

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

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