From aac3a4c032d3aa96c8c25402bbc72c78348401d0 Mon Sep 17 00:00:00 2001 From: Alexander Volkov Date: Wed, 30 Nov 2016 12:47:22 +0300 Subject: winrt: Replace Q_DECL_OVERRIDE by override We can use 'override' keyword directly since Qt 5.7. Change-Id: I31127478a0a96798a4e018d9996842204e307552 Reviewed-by: Maurice Kalinowski --- src/plugins/platforms/winrt/qwinrtbackingstore.h | 2 +- src/plugins/platforms/winrt/qwinrtclipboard.h | 6 ++-- src/plugins/platforms/winrt/qwinrtdrag.h | 10 +++---- src/plugins/platforms/winrt/qwinrteglcontext.h | 12 ++++---- .../platforms/winrt/qwinrtfiledialoghelper.h | 20 ++++++------- src/plugins/platforms/winrt/qwinrtfileengine.h | 34 +++++++++++----------- src/plugins/platforms/winrt/qwinrtintegration.h | 34 +++++++++++----------- src/plugins/platforms/winrt/qwinrtscreen.h | 20 ++++++------- src/plugins/platforms/winrt/qwinrttheme.h | 2 +- src/plugins/platforms/winrt/qwinrtwindow.h | 6 ++-- 10 files changed, 73 insertions(+), 73 deletions(-) (limited to 'src/plugins/platforms') diff --git a/src/plugins/platforms/winrt/qwinrtbackingstore.h b/src/plugins/platforms/winrt/qwinrtbackingstore.h index 41b27debcc..bfd0e34b9b 100644 --- a/src/plugins/platforms/winrt/qwinrtbackingstore.h +++ b/src/plugins/platforms/winrt/qwinrtbackingstore.h @@ -63,7 +63,7 @@ public: void endPaint(); void flush(QWindow *window, const QRegion ®ion, const QPoint &offset); void resize(const QSize &size, const QRegion &staticContents); - QImage toImage() const Q_DECL_OVERRIDE; + QImage toImage() const override; private: bool initialize(); diff --git a/src/plugins/platforms/winrt/qwinrtclipboard.h b/src/plugins/platforms/winrt/qwinrtclipboard.h index 3e6ee109fd..2e3e2b834d 100644 --- a/src/plugins/platforms/winrt/qwinrtclipboard.h +++ b/src/plugins/platforms/winrt/qwinrtclipboard.h @@ -64,9 +64,9 @@ class QWinRTClipboard: public QPlatformClipboard public: QWinRTClipboard(); - QMimeData *mimeData(QClipboard::Mode mode = QClipboard::Clipboard) Q_DECL_OVERRIDE; - void setMimeData(QMimeData *data, QClipboard::Mode mode = QClipboard::Clipboard) Q_DECL_OVERRIDE; - bool supportsMode(QClipboard::Mode mode) const Q_DECL_OVERRIDE; + QMimeData *mimeData(QClipboard::Mode mode = QClipboard::Clipboard) override; + void setMimeData(QMimeData *data, QClipboard::Mode mode = QClipboard::Clipboard) override; + bool supportsMode(QClipboard::Mode mode) const override; HRESULT onContentChanged(IInspectable *, IInspectable *); private: diff --git a/src/plugins/platforms/winrt/qwinrtdrag.h b/src/plugins/platforms/winrt/qwinrtdrag.h index 97079d831b..dad3e9892d 100644 --- a/src/plugins/platforms/winrt/qwinrtdrag.h +++ b/src/plugins/platforms/winrt/qwinrtdrag.h @@ -75,9 +75,9 @@ public: QWinRTInternalMimeData(); virtual ~QWinRTInternalMimeData(); - bool hasFormat_sys(const QString &mimetype) const Q_DECL_OVERRIDE; - QStringList formats_sys() const Q_DECL_OVERRIDE; - QVariant retrieveData_sys(const QString &mimetype, QVariant::Type preferredType) const Q_DECL_OVERRIDE; + bool hasFormat_sys(const QString &mimetype) const override; + QStringList formats_sys() const override; + QVariant retrieveData_sys(const QString &mimetype, QVariant::Type preferredType) const override; void setDataView(const Microsoft::WRL::ComPtr &d); private: @@ -91,8 +91,8 @@ public: virtual ~QWinRTDrag(); static QWinRTDrag *instance(); - QMimeData *platformDropData(void) Q_DECL_OVERRIDE; - Qt::DropAction drag(QDrag *) Q_DECL_OVERRIDE; + QMimeData *platformDropData(void) override; + Qt::DropAction drag(QDrag *) override; void setDropTarget(QWindow *target); diff --git a/src/plugins/platforms/winrt/qwinrteglcontext.h b/src/plugins/platforms/winrt/qwinrteglcontext.h index 12b6238cb1..5c75aa90d0 100644 --- a/src/plugins/platforms/winrt/qwinrteglcontext.h +++ b/src/plugins/platforms/winrt/qwinrteglcontext.h @@ -52,14 +52,14 @@ public: explicit QWinRTEGLContext(QOpenGLContext *context); ~QWinRTEGLContext(); - void initialize() Q_DECL_OVERRIDE; + void initialize() override; - bool makeCurrent(QPlatformSurface *windowSurface) Q_DECL_OVERRIDE; - void doneCurrent() Q_DECL_OVERRIDE; - void swapBuffers(QPlatformSurface *windowSurface) Q_DECL_OVERRIDE; + bool makeCurrent(QPlatformSurface *windowSurface) override; + void doneCurrent() override; + void swapBuffers(QPlatformSurface *windowSurface) override; - QSurfaceFormat format() const Q_DECL_OVERRIDE; - QFunctionPointer getProcAddress(const char *procName) Q_DECL_OVERRIDE; + QSurfaceFormat format() const override; + QFunctionPointer getProcAddress(const char *procName) override; static EGLDisplay display(); private: diff --git a/src/plugins/platforms/winrt/qwinrtfiledialoghelper.h b/src/plugins/platforms/winrt/qwinrtfiledialoghelper.h index f88bed76ae..1ff2249bcb 100644 --- a/src/plugins/platforms/winrt/qwinrtfiledialoghelper.h +++ b/src/plugins/platforms/winrt/qwinrtfiledialoghelper.h @@ -72,20 +72,20 @@ public: explicit QWinRTFileDialogHelper(); ~QWinRTFileDialogHelper(); - void exec() Q_DECL_OVERRIDE; - bool show(Qt::WindowFlags, Qt::WindowModality, QWindow *) Q_DECL_OVERRIDE; - void hide() Q_DECL_OVERRIDE; + void exec() override; + bool show(Qt::WindowFlags, Qt::WindowModality, QWindow *) override; + void hide() override; #ifdef Q_OS_WINPHONE - bool eventFilter(QObject *o, QEvent *e) Q_DECL_OVERRIDE; + bool eventFilter(QObject *o, QEvent *e) override; #endif - bool defaultNameFilterDisables() const Q_DECL_OVERRIDE { return false; } - void setDirectory(const QUrl &directory) Q_DECL_OVERRIDE; - QUrl directory() const Q_DECL_OVERRIDE; + bool defaultNameFilterDisables() const override { return false; } + void setDirectory(const QUrl &directory) override; + QUrl directory() const override; void selectFile(const QUrl &saveFileName); - QList selectedFiles() const Q_DECL_OVERRIDE; - void setFilter() Q_DECL_OVERRIDE { } - void selectNameFilter(const QString &selectedNameFilter) Q_DECL_OVERRIDE; + QList selectedFiles() const override; + void setFilter() override { } + void selectNameFilter(const QString &selectedNameFilter) override; QString selectedNameFilter() const; #ifndef Q_OS_WINPHONE diff --git a/src/plugins/platforms/winrt/qwinrtfileengine.h b/src/plugins/platforms/winrt/qwinrtfileengine.h index 70d5aea30d..73ff54b0c8 100644 --- a/src/plugins/platforms/winrt/qwinrtfileengine.h +++ b/src/plugins/platforms/winrt/qwinrtfileengine.h @@ -58,7 +58,7 @@ class QWinRTFileEngineHandler : public QAbstractFileEngineHandler public: QWinRTFileEngineHandler(); ~QWinRTFileEngineHandler(); - QAbstractFileEngine *create(const QString &fileName) const Q_DECL_OVERRIDE; + QAbstractFileEngine *create(const QString &fileName) const override; static void registerFile(const QString &fileName, ABI::Windows::Storage::IStorageItem *file); static ABI::Windows::Storage::IStorageItem *registeredFile(const QString &fileName); @@ -75,23 +75,23 @@ public: QWinRTFileEngine(const QString &fileName, ABI::Windows::Storage::IStorageItem *file); ~QWinRTFileEngine(); - bool open(QIODevice::OpenMode openMode) Q_DECL_OVERRIDE; - bool close() Q_DECL_OVERRIDE; - bool flush() Q_DECL_OVERRIDE; - qint64 size() const Q_DECL_OVERRIDE; - qint64 pos() const Q_DECL_OVERRIDE; - bool seek(qint64 pos) Q_DECL_OVERRIDE; - bool remove() Q_DECL_OVERRIDE; - bool copy(const QString &newName) Q_DECL_OVERRIDE; - bool rename(const QString &newName) Q_DECL_OVERRIDE; - bool renameOverwrite(const QString &newName) Q_DECL_OVERRIDE; - FileFlags fileFlags(FileFlags type=FileInfoAll) const Q_DECL_OVERRIDE; - bool setPermissions(uint perms) Q_DECL_OVERRIDE; - QString fileName(FileName type=DefaultName) const Q_DECL_OVERRIDE; - QDateTime fileTime(FileTime type) const Q_DECL_OVERRIDE; + bool open(QIODevice::OpenMode openMode) override; + bool close() override; + bool flush() override; + qint64 size() const override; + qint64 pos() const override; + bool seek(qint64 pos) override; + bool remove() override; + bool copy(const QString &newName) override; + bool rename(const QString &newName) override; + bool renameOverwrite(const QString &newName) override; + FileFlags fileFlags(FileFlags type=FileInfoAll) const override; + bool setPermissions(uint perms) override; + QString fileName(FileName type=DefaultName) const override; + QDateTime fileTime(FileTime type) const override; - qint64 read(char *data, qint64 maxlen) Q_DECL_OVERRIDE; - qint64 write(const char *data, qint64 len) Q_DECL_OVERRIDE; + qint64 read(char *data, qint64 maxlen) override; + qint64 write(const char *data, qint64 len) override; private: QScopedPointer d_ptr; diff --git a/src/plugins/platforms/winrt/qwinrtintegration.h b/src/plugins/platforms/winrt/qwinrtintegration.h index 7b4d5531fc..e22532a266 100644 --- a/src/plugins/platforms/winrt/qwinrtintegration.h +++ b/src/plugins/platforms/winrt/qwinrtintegration.h @@ -85,28 +85,28 @@ public: bool succeeded() const; - bool hasCapability(QPlatformIntegration::Capability cap) const Q_DECL_OVERRIDE; - QVariant styleHint(StyleHint hint) const Q_DECL_OVERRIDE; - - QPlatformWindow *createPlatformWindow(QWindow *window) const Q_DECL_OVERRIDE; - QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const Q_DECL_OVERRIDE; - QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const Q_DECL_OVERRIDE; - QAbstractEventDispatcher *createEventDispatcher() const Q_DECL_OVERRIDE; - void initialize() Q_DECL_OVERRIDE; - QPlatformFontDatabase *fontDatabase() const Q_DECL_OVERRIDE; - QPlatformInputContext *inputContext() const Q_DECL_OVERRIDE; - QPlatformServices *services() const Q_DECL_OVERRIDE; - QPlatformClipboard *clipboard() const Q_DECL_OVERRIDE; + bool hasCapability(QPlatformIntegration::Capability cap) const override; + QVariant styleHint(StyleHint hint) const override; + + QPlatformWindow *createPlatformWindow(QWindow *window) const override; + QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const override; + QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const override; + QAbstractEventDispatcher *createEventDispatcher() const override; + void initialize() override; + QPlatformFontDatabase *fontDatabase() const override; + QPlatformInputContext *inputContext() const override; + QPlatformServices *services() const override; + QPlatformClipboard *clipboard() const override; #ifndef QT_NO_DRAGANDDROP - QPlatformDrag *drag() const Q_DECL_OVERRIDE; + QPlatformDrag *drag() const override; #endif - Qt::KeyboardModifiers queryKeyboardModifiers() const Q_DECL_OVERRIDE; + Qt::KeyboardModifiers queryKeyboardModifiers() const override; - QStringList themeNames() const Q_DECL_OVERRIDE; - QPlatformTheme *createPlatformTheme(const QString &name) const Q_DECL_OVERRIDE; + QStringList themeNames() const override; + QPlatformTheme *createPlatformTheme(const QString &name) const override; - QPlatformOffscreenSurface *createPlatformOffscreenSurface(QOffscreenSurface *surface) const Q_DECL_OVERRIDE; + QPlatformOffscreenSurface *createPlatformOffscreenSurface(QOffscreenSurface *surface) const override; private: #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_PHONE_APP) HRESULT onBackButtonPressed(IInspectable *, ABI::Windows::Phone::UI::Input::IBackPressedEventArgs *args); diff --git a/src/plugins/platforms/winrt/qwinrtscreen.h b/src/plugins/platforms/winrt/qwinrtscreen.h index e489e208d5..2f1112472c 100644 --- a/src/plugins/platforms/winrt/qwinrtscreen.h +++ b/src/plugins/platforms/winrt/qwinrtscreen.h @@ -89,19 +89,19 @@ public: explicit QWinRTScreen(); ~QWinRTScreen(); - QRect geometry() const Q_DECL_OVERRIDE; - QRect availableGeometry() const Q_DECL_OVERRIDE; - int depth() const Q_DECL_OVERRIDE; - QImage::Format format() const Q_DECL_OVERRIDE; - QSizeF physicalSize() const Q_DECL_OVERRIDE; - QDpi logicalDpi() const Q_DECL_OVERRIDE; - qreal pixelDensity() const Q_DECL_OVERRIDE; + QRect geometry() const override; + QRect availableGeometry() const override; + int depth() const override; + QImage::Format format() const override; + QSizeF physicalSize() const override; + QDpi logicalDpi() const override; + qreal pixelDensity() const override; qreal scaleFactor() const; - QPlatformCursor *cursor() const Q_DECL_OVERRIDE; + QPlatformCursor *cursor() const override; Qt::KeyboardModifiers keyboardModifiers() const; - Qt::ScreenOrientation nativeOrientation() const Q_DECL_OVERRIDE; - Qt::ScreenOrientation orientation() const Q_DECL_OVERRIDE; + Qt::ScreenOrientation nativeOrientation() const override; + Qt::ScreenOrientation orientation() const override; QWindow *topWindow() const; QWindow *windowAt(const QPoint &pos); diff --git a/src/plugins/platforms/winrt/qwinrttheme.h b/src/plugins/platforms/winrt/qwinrttheme.h index bd244f9fdb..6ad22a4188 100644 --- a/src/plugins/platforms/winrt/qwinrttheme.h +++ b/src/plugins/platforms/winrt/qwinrttheme.h @@ -57,7 +57,7 @@ public: bool usePlatformNativeDialog(DialogType type) const; QPlatformDialogHelper *createPlatformDialogHelper(DialogType type) const; - const QPalette *palette(Palette type = SystemPalette) const Q_DECL_OVERRIDE; + const QPalette *palette(Palette type = SystemPalette) const override; static QVariant styleHint(QPlatformIntegration::StyleHint hint); QVariant themeHint(ThemeHint hint) const override; diff --git a/src/plugins/platforms/winrt/qwinrtwindow.h b/src/plugins/platforms/winrt/qwinrtwindow.h index 48e092d455..95caf66c3d 100644 --- a/src/plugins/platforms/winrt/qwinrtwindow.h +++ b/src/plugins/platforms/winrt/qwinrtwindow.h @@ -65,10 +65,10 @@ public: void raise(); void lower(); - WId winId() const Q_DECL_OVERRIDE; + WId winId() const override; - qreal devicePixelRatio() const Q_DECL_OVERRIDE; - void setWindowState(Qt::WindowState state) Q_DECL_OVERRIDE; + qreal devicePixelRatio() const override; + void setWindowState(Qt::WindowState state) override; EGLSurface eglSurface() const; void createEglSurface(EGLDisplay display, EGLConfig config); -- cgit v1.2.3